Fix project includes/excludes under Windows

Author: adangel

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/MultipleRulesetsTest.java

@@ -17,7 +17,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
@@ -119,7 +118,7 @@ public void done() {
             }
         });
         latch.await(30, TimeUnit.SECONDS);
-        waitForJobs();
+        EclipseUtils.waitForJobs();
 
         final ReviewCodeCmd cmd = new ReviewCodeCmd();
         cmd.addResource(this.testProject);
@@ -143,13 +142,6 @@ public void done() {
         assertHasRuleViolation(markersThird, "UseUtilityClass");
     }
 
-    private void waitForJobs() throws InterruptedException {
-        long start = System.currentTimeMillis();
-        while (!Job.getJobManager().isIdle() && System.currentTimeMillis() - start < TimeUnit.SECONDS.toMillis(30)) {
-            Thread.sleep(500);
-        }
-    }
-
     private void assertHasRuleViolation(IMarker[] markers, String rulename) throws CoreException {
         boolean found = false;
         for (IMarker marker : markers) {

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

@@ -75,25 +75,26 @@ public void projectWithIncludesExcludes() throws Exception {
                 newClasspath.add(entry);
             }
         }
+        // excludes all *.java files, but includes Test.java
         newClasspath.add(JavaCore.newSourceEntry(new Path("/ProjectPropertiesImplTest/src/main/java"),
-                new Path[] {new Path("**/*.java")},
-                new Path[0], null));
+                new Path[] {new Path("**/Test.java")},
+                new Path[] {new Path("**/*.java")}, null));
         newClasspath.add(JavaCore.newSourceEntry(new Path("/ProjectPropertiesImplTest/src/main/resources"),
                 new Path[0],
                 new Path[] {new Path("**")}, null));
         javaProject.setRawClasspath(newClasspath.toArray(new IClasspathEntry[0]), new NullProgressMonitor());
 
-        String expectedPattern = testProject.getFolder("/src/main/java").getLocation().toPortableString();
-        expectedPattern += "/.*/[^/]*\\.java";
-
         IProjectProperties projectProperties = PMDPlugin.getDefault().getPropertiesManager().loadProjectProperties(testProject);
-        Set<String> includePatterns = projectProperties.getBuildPathIncludePatterns();
-        Collection<Pattern> patterns = InternalRuleSetUtil.convertStringPatterns(includePatterns);
 
+        Set<String> includeStringPatterns = projectProperties.getBuildPathIncludePatterns();
+        Collection<Pattern> includePatterns = InternalRuleSetUtil.convertStringPatterns(includeStringPatterns);
+        Assert.assertEquals(1, includeStringPatterns.size());
         Assert.assertEquals(1, includePatterns.size());
-        Assert.assertEquals(1, patterns.size());
-        Assert.assertEquals(includePatterns.toString(), patterns.toString());
-        Assert.assertEquals("[" + expectedPattern + "]", patterns.toString());
+
+        Set<String> excludeStringPatterns = projectProperties.getBuildPathExcludePatterns();
+        Collection<Pattern> excludePatterns = InternalRuleSetUtil.convertStringPatterns(excludeStringPatterns);
+        Assert.assertEquals(1, excludeStringPatterns.size());
+        Assert.assertEquals(1, excludePatterns.size());
 
         // now run a review
         projectProperties.setPmdEnabled(true);
@@ -111,5 +112,16 @@ public void projectWithIncludesExcludes() throws Exception {
             }
         }
         Assert.assertTrue("EmptyCatchBlock marker is missing", found);
+
+        // patterns should be correct
+        Assert.assertEquals(includeStringPatterns.toString(), includePatterns.toString());
+        String expectedIncludePattern = testProject.getFolder("/src/main/java").getLocation().toPortableString();
+        expectedIncludePattern += "/.*Test\\.java";
+        Assert.assertEquals("[" + expectedIncludePattern + "]", includePatterns.toString());
+
+        String expectedExcludePattern = testProject.getFolder("/src/main/java").getLocation().toPortableString();
+        expectedExcludePattern += "/.*[^/]*\\.java";
+        Assert.assertEquals(excludeStringPatterns.toString(), excludePatterns.toString());
+        Assert.assertEquals("[" + expectedExcludePattern + "]", excludePatterns.toString());
     }
 }

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

@@ -89,26 +89,22 @@ public ProjectPropertiesImpl(final IProject project, IProjectPropertiesManager p
     private void determineBuildPathIncludesExcludes() {
         IClasspathEntry source = PMDPlugin.buildSourceClassPathEntryFor(project);
         if (source != null) {
-            try {
-                String basePath = new File(project.getWorkspace().getRoot()
-                        .getFolder(source.getPath()).getLocation().toOSString()).getCanonicalPath();
-                if (!basePath.endsWith(File.separator)) {
-                    basePath += File.separator;
-                }
-                if (source.getExclusionPatterns() != null) {
-                    for (IPath path : source.getExclusionPatterns()) {
-                        String pathString = path.toOSString();
-                        buildPathExcludePatterns.add(basePath + convertPatternToRegex(pathString));
-                    }
+            String basePath = project.getWorkspace().getRoot()
+                    .getFolder(source.getPath()).getLocation().toPortableString();
+            if (!basePath.endsWith(String.valueOf(IPath.SEPARATOR))) {
+                basePath += IPath.SEPARATOR;
+            }
+            if (source.getExclusionPatterns() != null) {
+                for (IPath path : source.getExclusionPatterns()) {
+                    String pathString = path.toPortableString();
+                    buildPathExcludePatterns.add(basePath + convertPatternToRegex(pathString));
                 }
-                if (source.getInclusionPatterns() != null) {
-                    for (IPath path : source.getInclusionPatterns()) {
-                        String pathString = path.toOSString();
-                        buildPathIncludePatterns.add(basePath + convertPatternToRegex(pathString));
-                    }
+            }
+            if (source.getInclusionPatterns() != null) {
+                for (IPath path : source.getInclusionPatterns()) {
+                    String pathString = path.toPortableString();
+                    buildPathIncludePatterns.add(basePath + convertPatternToRegex(pathString));
                 }
-            } catch (IOException e) {
-                LOG.error("Couldn't determine build class path", e);
             }
         }
     }
@@ -117,9 +113,11 @@ private void determineBuildPathIncludesExcludes() {
      * Simple conversion from the Ant-like pattern to regex pattern.
      */
     private String convertPatternToRegex(String pattern) {
-        String regex = pattern.replaceAll("\\.", "\\\\."); // replace "." with "\\."
+        String regex = pattern;
+        regex = regex.replaceAll("\\.", "\\\\."); // replace "." with "\\."
         regex = regex.replaceAll("\\*\\*", ".*"); // replace "**" with ".*"
-        regex = regex.replaceAll("/\\*", "/[^/]*"); // replace "/*" with "/[^/]"
+        regex = regex.replaceAll("/\\*([^\\*])", "/[^/]*$1"); // replace "/*" with "/[^/]*"
+        regex = regex.replaceAll("\\.\\*/", ".*"); // replace ".*/" with ".*"
         regex = regex.replaceAll("\\?", "."); // replace "?" with "."
         return regex;
     }