Merge branch 'issue-43'

Author: adangel

.gitignore

@@ -0,0 +1,3 @@
+.project
+.settings/
+.classpath

ReleaseNotes.md

@@ -18,6 +18,7 @@ Eclipse Update Site:
 
 *   [#20](https://github.com/pmd/pmd-eclipse-plugin/issues/20): category.xml maybe broken
 *   [#32](https://github.com/pmd/pmd-eclipse-plugin/issues/32): Upgrade PMD to 6.2.0
+*   [#43](https://github.com/pmd/pmd-eclipse-plugin/issues/43): Update unit tests to use new ruleset categories
 
 ### External Contributions
 

net.sourceforge.pmd.eclipse.p2updatesite/.gitignore

@@ -0,0 +1 @@
+/target/

net.sourceforge.pmd.eclipse.plugin.test.fragment/.gitignore

@@ -0,0 +1 @@
+/target/

net.sourceforge.pmd.eclipse.plugin.test.fragment/src/main/resources/rulesets/extra1.xml

@@ -6,7 +6,7 @@
 The Basic Ruleset contains a collection of good practices which everyone should follow.
   </description>
 
-    <rule name="EmptyCatchBlock"
+    <rule name="ExtraEmptyCatchBlock"
           language="java"
           message="Avoid empty catch blocks"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -40,7 +40,7 @@ The Basic Ruleset contains a collection of good practices which everyone should
       </example>
     </rule>
 
-    <rule name="EmptyIfStmt"
+    <rule name="ExtraEmptyIfStmt"
           language="java"
           message="Avoid empty 'if' statements"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -63,7 +63,7 @@ The Basic Ruleset contains a collection of good practices which everyone should
     </rule>
 
 
-    <rule name="EmptyWhileStmt"
+    <rule name="ExtraEmptyWhileStmt"
           language="java"
           message="Avoid empty 'while' statements"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -90,7 +90,7 @@ The Basic Ruleset contains a collection of good practices which everyone should
     </rule>
 
 
-    <rule name="EmptyTryBlock"
+    <rule name="ExtraEmptyTryBlock"
           language="java"
           message="Avoid empty try blocks"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -117,7 +117,7 @@ Avoid empty try blocks, they serve no purpose.
       </example>
     </rule>
 
-    <rule name="EmptyFinallyBlock"
+    <rule name="ExtraEmptyFinallyBlock"
           language="java"
           message="Avoid empty finally blocks"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -147,7 +147,7 @@ Avoid empty finally blocks, these can be deleted.
     </rule>
 
 
-    <rule name="EmptySwitchStatements"
+    <rule name="ExtraEmptySwitchStatements"
           language="java"
           message="Avoid empty switch statements"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -177,7 +177,7 @@ Avoid empty switch statements.
       </rule>
 
 
-    <rule name="JumbledIncrementer"
+    <rule name="ExtraJumbledIncrementer"
           language="java"
          message="Avoid modifying an outer loop incrementer in an inner loop for update expression"
          class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -212,7 +212,7 @@ Avoid jumbled loop incrementers as these are usually a mistake and can make code
      </rule>
 
 
-    <rule name="ForLoopShouldBeWhileLoop"
+    <rule name="ExtraForLoopShouldBeWhileLoop"
           language="java"
           message="This for loop could be simplified to a while loop"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -243,7 +243,7 @@ Some for loops can be simplified to while loops - this makes them more concise.
     </rule>
 
 
-    <rule name="UnnecessaryConversionTemporary"
+    <rule name="ExtraUnnecessaryConversionTemporary"
           message="Avoid unnecessary temporaries when converting primitives to Strings"
           class="net.sourceforge.pmd.lang.java.rule.errorprone.UnnecessaryConversionTemporaryRule">
       <description>
@@ -260,7 +260,7 @@ Avoid unnecessary temporaries when converting primitives to Strings
       </example>
     </rule>
 
-    <rule name="OverrideBothEqualsAndHashcode"
+    <rule name="ExtraOverrideBothEqualsAndHashcode"
           language="java"
           message="Ensure you override both equals() and hashCode()"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -316,7 +316,7 @@ not
       </example>
     </rule>
 
-    <rule name="DoubleCheckedLocking"
+    <rule name="ExtraDoubleCheckedLocking"
           message="Double checked locking is not thread safe in Java."
           class="net.sourceforge.pmd.lang.java.rule.multithreading.DoubleCheckedLockingRule">
       <description>
@@ -342,7 +342,7 @@ For more details see http://www.javaworld.com/javaworld/jw-02-2001/jw-0209-doubl
       </example>
     </rule>
 
-    <rule name="ReturnFromFinallyBlock"
+    <rule name="ExtraReturnFromFinallyBlock"
           language="java"
           message="Avoid returning from a finally block"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -375,7 +375,7 @@ For more details see http://www.javaworld.com/javaworld/jw-02-2001/jw-0209-doubl
       </example>
     </rule>
 
-    <rule name="EmptySynchronizedBlock"
+    <rule name="ExtraEmptySynchronizedBlock"
           language="java"
           message="Avoid empty synchronized blocks"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -399,7 +399,7 @@ Avoid empty synchronized blocks as they do nothing.
       </example>
     </rule>
 
-    <rule name="UnnecessaryReturn"
+    <rule name="ExtraUnnecessaryReturn"
           language="java"
           message="Avoid unnecessary return statements"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -432,7 +432,7 @@ Avoid unnecessary return statements.
     </rule>
 
 
-    <rule name="EmptyStaticInitializer"
+    <rule name="ExtraEmptyStaticInitializer"
           language="java"
            message="Empty static initializer was found"
            class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -455,7 +455,7 @@ Avoid unnecessary return statements.
        </example>
      </rule>
 
-    <rule name="UnconditionalIfStatement"
+    <rule name="ExtraUnconditionalIfStatement"
        language="java"
        message="Do not use 'if' statements that are always true or always false"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -483,7 +483,7 @@ Do not use "if" statements that are always true or always false.
       </example>
     </rule>
 
-    <rule name="EmptyStatementNotInLoop"
+    <rule name="ExtraEmptyStatementNotInLoop"
           language="java"
           message="An empty statement (semicolon) not part of a loop"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -523,7 +523,7 @@ could also be a double semicolon, which is useless and should be removed.
        </example>
      </rule>
 
-    <rule name="BooleanInstantiation"
+    <rule name="ExtraBooleanInstantiation"
        language="java"
        message="Avoid instantiating Boolean objects; you can usually invoke Boolean.TRUE instead."
        class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -558,7 +558,7 @@ public class Foo {
    </example>
    </rule>
 
-    <rule name="UnnecessaryFinalModifier"
+    <rule name="ExtraUnnecessaryFinalModifier"
           language="java"
           message="Unnecessary final modifier in final class"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -591,7 +591,7 @@ public final class Foo {
       </example>
     </rule>
 
-    <rule name="CollapsibleIfStatements"
+    <rule name="ExtraCollapsibleIfStatements"
           language="java"
           message="These nested if statements could be combined"
           class="net.sourceforge.pmd.lang.rule.XPathRule">

net.sourceforge.pmd.eclipse.plugin.test.fragment/src/main/resources/rulesets/extra2.xml

@@ -6,7 +6,7 @@
 The Braces Ruleset contains a collection of braces rules.
   </description>
 
-   <rule name="IfStmtsMustUseBraces"
+   <rule name="ExtraIfStmtsMustUseBraces"
          language="java"
          message="Avoid using if statements without curly braces"
          class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -36,7 +36,7 @@ Avoid using if statements without using curly braces
      </example>
      </rule>
 
-    <rule name="WhileLoopsMustUseBraces"
+    <rule name="ExtraWhileLoopsMustUseBraces"
           language="java"
           message="Avoid using 'while' statements without curly braces"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -64,7 +64,7 @@ Avoid using 'while' statements without using curly braces
       </example>
     </rule>
 
-      <rule name="IfElseStmtsMustUseBraces"
+      <rule name="ExtraIfElseStmtsMustUseBraces"
             language="java"
            message="Avoid using 'if...else' statements without curly braces"
            class="net.sourceforge.pmd.lang.rule.XPathRule">
@@ -102,7 +102,7 @@ Avoid using if..else statements without using curly braces
        </example>
      </rule>
 
-     <rule name="ForLoopsMustUseBraces"
+     <rule name="ExtraForLoopsMustUseBraces"
            language="java"
            message="Avoid using 'for' statements without curly braces"
            class="net.sourceforge.pmd.lang.rule.XPathRule">

net.sourceforge.pmd.eclipse.plugin.test/.gitignore

@@ -0,0 +1 @@
+/target/

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/BasicPMDTest.java

@@ -120,8 +120,8 @@ public void testRunPmdJdk13() {
             context.setSourceCodeFilename("foo.java");
             context.setReport(new Report());
 
-            final RuleSet unnecessaryRuleSet = new RuleSetFactory().createRuleSet("rulesets/java/unnecessary.xml");
-            RuleSets rSets = new RuleSets(unnecessaryRuleSet);
+            final RuleSet codeStyleRuleSet = new RuleSetFactory().createRuleSet("category/java/codestyle.xml/UnnecessaryReturn");
+            RuleSets rSets = new RuleSets(codeStyleRuleSet);
             new SourceCodeProcessor(configuration).processSourceCode(new StringDataSource(sourceCode).getInputStream(),
                     rSets, context);
 
@@ -158,8 +158,8 @@ public void testRunPmdJdk14() {
             context.setSourceCodeFilename("foo.java");
             context.setReport(new Report());
 
-            final RuleSet unnecessaryRuleSet = new RuleSetFactory().createRuleSet("rulesets/java/unnecessary.xml");
-            RuleSets rSets = new RuleSets(unnecessaryRuleSet);
+            final RuleSet codeStyleRuleSet = new RuleSetFactory().createRuleSet("category/java/codestyle.xml/UnnecessaryReturn");
+            RuleSets rSets = new RuleSets(codeStyleRuleSet);
             new SourceCodeProcessor(configuration).processSourceCode(new StringDataSource(sourceCode).getInputStream(),
                     rSets, context);
 
@@ -196,8 +196,8 @@ public void testRunPmdJdk15() {
             context.setSourceCodeFilename("foo.java");
             context.setReport(new Report());
 
-            final RuleSet unnecessaryRuleSet = new RuleSetFactory().createRuleSet("rulesets/java/unnecessary.xml");
-            RuleSets rSets = new RuleSets(unnecessaryRuleSet);
+            final RuleSet codeStyleRuleSet = new RuleSetFactory().createRuleSet("category/java/codestyle.xml/UnnecessaryReturn");
+            RuleSets rSets = new RuleSets(codeStyleRuleSet);
             new SourceCodeProcessor(configuration).processSourceCode(new StringDataSource(sourceCode).getInputStream(),
                     rSets, context);
 

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/ProjectPropertiesModelTest.java

@@ -46,6 +46,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import net.sourceforge.pmd.Rule;
@@ -238,55 +239,58 @@ public void testProjectRuleSet1() throws PropertiesException, RuleSetNotFoundExc
 
         final RuleSetFactory factory = new RuleSetFactory();
 
-        // use the basic ruleset because it should be included in the plugin
-        // ruleset.
-        final RuleSet basicRuleSet = factory.createRuleSet("rulesets/java/basic.xml");
+        // use the best practices ruleset because it should be included in the plugin ruleset.
+        final RuleSet bestPracticesRuleSet = factory.createRuleSet("category/java/bestpractices.xml");
 
         // First set the project ruleset
-        model.setProjectRuleSet(basicRuleSet);
+        model.setProjectRuleSet(bestPracticesRuleSet);
         model.sync();
 
         // Test the ruleset we set is equal to the ruleset we queried
         final RuleSet projectRuleSet = model.getProjectRuleSet();
         Assert.assertNotNull("Project ruleset has not been set", projectRuleSet);
         Assert.assertTrue("The project ruleset is not the basic ruleset",
-                EclipseUtils.assertRuleSetEquals(basicRuleSet.getRules(), projectRuleSet.getRules(), System.out));
+                EclipseUtils.assertRuleSetEquals(bestPracticesRuleSet.getRules(), projectRuleSet.getRules(), System.out));
     }
 
     /**
      * When rules are removed from the plugin preferences, these rules should also be removed from the project euh...
      * ben en fait non. annulé.
      */
     @Test
+    @Ignore("implementation is not finished - maybe the behavior would even be wrong")
     public void testProjectRuleSet2() throws PropertiesException, RuleSetNotFoundException, CoreException {
-        /*
-         * // First ensure that the plugin initial ruleset is equal to the project // ruleset IProjectPropertiesManager
-         * mgr = PMDPlugin.getDefault().getPropertiesManager(); IProjectProperties model =
-         * mgr.loadProjectProperties(this.testProject);
-         * 
-         * RuleSet projectRuleSet = model.getProjectRuleSet();
-         * assertEquals("The project ruleset is not equal to the plugin ruleset", this.initialPluginRuleSet.getRules(),
-         * projectRuleSet .getRules());
-         * 
-         * // use the basic ruleset and set it at the only plugin ruleset RuleSetFactory factory = new RuleSetFactory();
-         * RuleSet basicRuleSet = factory.createSingleRuleSet("rulesets/basic.xml");
-         * 
-         * IPreferencesManager pmgr = PMDPlugin.getDefault().getPreferencesManager(); pmgr.setRuleSet(basicRuleSet);
-         * 
-         * projectRuleSet = model.getProjectRuleSet();
-         * 
-         * dumpRuleSet(basicRuleSet); dumpRuleSet(projectRuleSet);
-         * assertEquals("The project ruleset is not equal to the plugin ruleset", basicRuleSet.getRules(),
-         * projectRuleSet.getRules());
-         */
+        // First ensure that the plugin initial ruleset is equal to the project
+        // // ruleset IProjectPropertiesManager
+        final IProjectPropertiesManager mgr = PMDPlugin.getDefault().getPropertiesManager();
+        final IProjectProperties model = mgr.loadProjectProperties(this.testProject);
+
+        RuleSet projectRuleSet = model.getProjectRuleSet();
+        Assert.assertEquals("The project ruleset is not equal to the plugin ruleset",
+                this.initialPluginRuleSet.getRules(), projectRuleSet.getRules());
+
+        final RuleSetFactory factory = new RuleSetFactory();
+
+        // use the best practices ruleset because it should be included in the
+        // plugin ruleset.
+        final RuleSet bestPracticesRuleSet = factory.createRuleSet("category/java/bestpractices.xml");
+
+        IPreferencesManager pmgr = PMDPlugin.getDefault().getPreferencesManager();
+        pmgr.setRuleSet(bestPracticesRuleSet);
+
+        projectRuleSet = model.getProjectRuleSet();
+
+        dumpRuleSet(bestPracticesRuleSet);
+        dumpRuleSet(projectRuleSet);
+        Assert.assertEquals("The project ruleset is not equal to the plugin ruleset", bestPracticesRuleSet.getRules(),
+                projectRuleSet.getRules());
     }
 
     /**
      * When rules are added to the plugin preferences, these rules should also be added to the project
      */
     @Test
     public void testProjectRuleSet3() throws PropertiesException, RuleSetNotFoundException, CoreException {
-
         // First ensure that the plugin initial ruleset is equal to the project
         // ruleset
         final IProjectPropertiesManager mgr = PMDPlugin.getDefault().getPropertiesManager();
@@ -407,11 +411,11 @@ public void testRuleSetStoredInProjectFALSE() throws PropertiesException, RuleSe
         final IProjectProperties model = mgr.loadProjectProperties(this.testProject);
 
         final RuleSetFactory factory = new RuleSetFactory();
-        final RuleSet basicRuleSet = factory.createRuleSet("rulesets/java/basic.xml");
+        final RuleSet bestPracticesRuleSet = factory.createRuleSet("category/java/bestpractices.xml");
         model.setPmdEnabled(true);
         model.setRuleSetStoredInProject(false);
         model.setProjectWorkingSet(null);
-        model.setProjectRuleSet(basicRuleSet);
+        model.setProjectRuleSet(bestPracticesRuleSet);
         model.sync();
 
         model.createDefaultRuleSetFile();
@@ -433,7 +437,7 @@ public void testRuleSetStoredInProjectTRUE() throws PropertiesException, RuleSet
         final IProjectProperties model = mgr.loadProjectProperties(this.testProject);
 
         final RuleSetFactory factory = new RuleSetFactory();
-        final RuleSet basicRuleSet = factory.createRuleSet("rulesets/java/basic.xml");
+        final RuleSet basicRuleSet = factory.createRuleSet("category/java/bestpractices.xml");
         model.setPmdEnabled(true);
         model.setRuleSetStoredInProject(false);
         model.setProjectWorkingSet(null);

net.sourceforge.pmd.eclipse.plugin/.gitignore

@@ -0,0 +1 @@
+/target/