Consider projects even if pmd is not enabled

Author: adangel

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/ExternalRuleSetFileTest.java

@@ -30,6 +30,8 @@
 public class ExternalRuleSetFileTest {
     private static final Logger LOG = LoggerFactory.getLogger(ExternalRuleSetFileTest.class);
 
+    private static final String PMD_PROPERTIES_FILENAME = ".pmd";
+
     private static final String PROJECT_RULESET_FILENAME = ".pmd-ruleset.xml";
 
     private IProject testProject;
@@ -106,6 +108,48 @@ public void changedExternalRulesetShouldBeReloaded() throws Exception {
         Assert.assertSame(model, model2);
     }
 
+    @Test
+    public void changedExternalRulesetShouldBeReloadedForPmdDisabledProjects() throws Exception {
+        setUpProject("ExternalRulesetTestPmdDisabled");
+
+        // load the project properties - pmd is not enabled, it uses the default ruleset (more than 1 active rule)
+        final IProjectPropertiesManager mgr = PMDPlugin.getDefault().getPropertiesManager();
+        final IProjectProperties model = mgr.loadProjectProperties(this.testProject);
+        RuleSet projectRuleSet = model.getProjectRuleSet();
+        Assert.assertNotEquals(1, projectRuleSet.getRules().size());
+
+        // now let's change the ruleSetFile without eclipse knowing about it ("externally")
+        IFile ruleSetFile = this.testProject.getFile(PROJECT_RULESET_FILENAME);
+        if (ruleSetFile.exists()) {
+            Assert.fail("File " + PROJECT_RULESET_FILENAME + " already exists!");
+        }
+        File ruleSetFileReal = ruleSetFile.getLocation().toFile();
+        ResourceUtil.copyResource(this, "ruleset1.xml", ruleSetFileReal);
+
+        // now create the .pmd project properties without eclipse knowing about it ("externally")
+        IFile projectPropertiesFile = this.testProject.getFile(PMD_PROPERTIES_FILENAME);
+        if (projectPropertiesFile.exists()) {
+            Assert.fail("File .pmd does already exist!");
+        }
+        File projectPropertiesFileReal = projectPropertiesFile.getLocation().toFile();
+        ResourceUtil.copyResource(this, "pmd-properties", projectPropertiesFileReal);
+
+        // the files have been created, but the .pmd file is not reloaded yet, so:
+        Assert.assertFalse(model.isNeedRebuild());
+        // the model is not updated yet...
+        Assert.assertNotEquals(1, model.getProjectRuleSet().getRules().size());
+        // but it will be when requesting the project properties again
+        final IProjectProperties model2 = mgr.loadProjectProperties(testProject);
+        // PMD is still not enabled
+        Assert.assertFalse(model.isPmdEnabled());
+        // but rebuild is needed (because ruleset changed)
+        Assert.assertTrue(model.isNeedRebuild());
+        // and the ruleset is loaded
+        Assert.assertEquals(1, model2.getProjectRuleSet().getRules().size());
+        // the model is still cached, but the rules are updated
+        Assert.assertSame(model, model2);
+    }
+
     @Test
     public void externallyChangedProjectPropertiesShouldBeReloaded() throws Exception {
         setUpProject("ProjectPropertiesChanged");
@@ -146,7 +190,7 @@ public void externallyChangedProjectPropertiesShouldBeReloaded() throws Exceptio
         ResourceUtil.copyResource(this, "ruleset1.xml", ruleSetFileReal);
 
         // now overwrite and change the .pmd project properties without eclipse knowing about it ("externally")
-        IFile projectPropertiesFile = this.testProject.getFile(".pmd");
+        IFile projectPropertiesFile = this.testProject.getFile(PMD_PROPERTIES_FILENAME);
         if (!projectPropertiesFile.exists()) {
             Assert.fail("File .pmd does not exist!");
         }

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesImpl.java

@@ -263,9 +263,7 @@ public void setProjectWorkingSet(final IWorkingSet projectWorkingSet) {
      */
     @Override
     public boolean isNeedRebuild() {
-        LOG.debug("Query if project {} need rebuild : {}", project.getName(), pmdEnabled && needRebuild);
-        LOG.debug("   PMD Enabled = {}", pmdEnabled);
-        LOG.debug("   Project need rebuild =  {}", needRebuild);
+        LOG.debug("Query if project {} need rebuild : {}", project.getName(), needRebuild);
         if (ruleSetStoredInProject) {
             boolean rulesetFilesChanged = false;
             for (File f : getResolvedRuleSetFiles()) {
@@ -275,7 +273,7 @@ public boolean isNeedRebuild() {
             LOG.debug("   ruleset files have changed = {}", rulesetFilesChanged);
             this.setNeedRebuild(needRebuild | rulesetFilesChanged);
         }
-        return pmdEnabled && needRebuild;
+        return needRebuild;
     }
 
     /**