CheckstyleBear: Load google and sun rules from jar

The google and sun ruleset have been provided in the
checkstyle jar since version 6.2.

Load the rulesets from the linter jar so the rules
are known to be compatible with the linter version.

Fixes #1017
Fixes #1034

Author: jayvdb

bears/java/CheckstyleBear.py

@@ -2,13 +2,14 @@
 from coalib.settings.Setting import path
 
 
-known_checkstyles = {
-    "google": "https://raw.githubusercontent.com/checkstyle/checkstyle/master/src/main/resources/google_checks.xml",
-    "sun": 'https://raw.githubusercontent.com/checkstyle/checkstyle/master/src/main/resources/sun_checks.xml',
+_online_styles = {
     "android-check-easy": "https://raw.githubusercontent.com/noveogroup/android-check/master/android-check-plugin/src/main/resources/checkstyle/checkstyle-easy.xml",
     "android-check-hard": "https://raw.githubusercontent.com/noveogroup/android-check/master/android-check-plugin/src/main/resources/checkstyle/checkstyle-hard.xml",
     "geosoft": "http://geosoft.no/development/geosoft_checks.xml"}
 
+# To be deprecated
+known_checkstyles = dict(_online_styles, **{'google': None, 'sun': None})
+
 
 def check_invalid_configuration(checkstyle_configs, use_spaces, indent_size):
     if (checkstyle_configs is 'google' and
@@ -75,9 +76,13 @@ def create_arguments(
         check_invalid_configuration(
             checkstyle_configs, use_spaces, indent_size)
 
-        if checkstyle_configs in known_checkstyles:
+        if checkstyle_configs in ('google', 'sun'):
+            # Checkstyle included these two rulesets since version 6.2
+            # Locate the file as an absolute resource into the checkstyle jar
+            checkstyle_configs = '/%s_checks.xml' % checkstyle_configs
+        elif checkstyle_configs in _online_styles:
             checkstyle_configs = self.download_cached_file(
-                known_checkstyles[checkstyle_configs],
+                _online_styles[checkstyle_configs],
                 checkstyle_configs + ".xml")
 
         return ('-jar', self.checkstyle_jar_file, '-c',

tests/java/CheckstyleBearTest.py

@@ -26,10 +26,25 @@ def test_run(self):
         self.check_validity(self.uut, [], self.good_file)
         self.check_validity(self.uut, [], self.bad_file, valid=False)
 
-    def test_known_configs(self):
+    def test_style_google(self):
         self.section["checkstyle_configs"] = "google"
         self.check_validity(self.uut, [], self.good_file)
 
+    def test_style_sun(self):
+        self.section["checkstyle_configs"] = "sun"
+        self.check_validity(self.uut, [], self.good_file)
+
+    def test_style_android(self):
+        self.section["checkstyle_configs"] = "android-check-easy"
+        self.check_validity(self.uut, [], self.good_file)
+
+        self.section["checkstyle_configs"] = "android-check-hard"
+        self.check_validity(self.uut, [], self.good_file)
+
+    def test_style_geosoft(self):
+        self.section["checkstyle_configs"] = "geosoft"
+        self.check_validity(self.uut, [], self.good_file)
+
     def test_config_failure_use_spaces(self):
         self.section["checkstyle_configs"] = "google"
         self.section.append(Setting('use_spaces', False))