Fix test compile errors in eclipse

Author: adangel

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

@@ -17,6 +17,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.regex.Pattern;
 
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
@@ -25,6 +26,7 @@
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IClasspathEntry;
@@ -352,4 +354,22 @@ public static IFile createTestSourceFile(IProject testProject, String fileName,
         return sourceFile;
     }
 
+    /**
+     * Creates a folder structure recursively.
+     *
+     * @param testProject
+     * @param fullpath
+     * @throws CoreException
+     */
+    public static void createFolders(IProject testProject, String fullpath) throws CoreException {
+        IPath path = new Path(fullpath);
+        IContainer current = testProject;
+        for (String segment : path.segments()) {
+            IFolder folder = current.getFolder(new Path(segment));
+            if (!folder.exists()) {
+                folder.create(true, false, null);
+            }
+            current = folder;
+        }
+    }
 }

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

@@ -32,6 +32,7 @@
  */
 public class MultipleRulesetsTest {
     private IProject testProject;
+    private static final String BASE_PATH = "/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/";
 
     @Before
     public void setUp() throws Exception {
@@ -54,17 +55,17 @@ public void setUp() throws Exception {
                 null);
 
         // 3. Create test sources
-        folder.getFolder("first").create(true, true, null);
-        EclipseUtils.createTestSourceFile(testProject, "/src/main/java/first/First.java",
-                IOUtils.toString(MultipleRulesetsTest.class.getResourceAsStream("multiplerulesets/First.java"),
+        EclipseUtils.createFolders(testProject, BASE_PATH + "first");
+        EclipseUtils.createTestSourceFile(testProject, BASE_PATH + "first/First.java",
+                IOUtils.toString(MultipleRulesetsTest.class.getResourceAsStream("multiplerulesets/first/First.java"),
                         StandardCharsets.UTF_8.name()));
-        folder.getFolder("second").create(true, true, null);
-        EclipseUtils.createTestSourceFile(testProject, "/src/main/java/second/Second.java",
-                IOUtils.toString(MultipleRulesetsTest.class.getResourceAsStream("multiplerulesets/Second.java"),
+        EclipseUtils.createFolders(testProject, BASE_PATH + "second");
+        EclipseUtils.createTestSourceFile(testProject, BASE_PATH + "second/Second.java",
+                IOUtils.toString(MultipleRulesetsTest.class.getResourceAsStream("multiplerulesets/second/Second.java"),
                         StandardCharsets.UTF_8.name()));
-        folder.getFolder("third").create(true, true, null);
-        EclipseUtils.createTestSourceFile(testProject, "/src/main/java/third/Third.java",
-                IOUtils.toString(MultipleRulesetsTest.class.getResourceAsStream("multiplerulesets/Third.java"),
+        EclipseUtils.createFolders(testProject, BASE_PATH + "third");
+        EclipseUtils.createTestSourceFile(testProject, BASE_PATH + "third/Third.java",
+                IOUtils.toString(MultipleRulesetsTest.class.getResourceAsStream("multiplerulesets/third/Third.java"),
                         StandardCharsets.UTF_8.name()));
 
         // 4. Copy rulesets
@@ -110,18 +111,18 @@ public void testReviewCmdBasic() throws CoreException {
         cmd.performExecute();
         cmd.join();
 
-        IMarker[] markersFirst = this.testProject.getFile("src/main/java/first/First.java")
+        IMarker[] markersFirst = this.testProject.getFile(BASE_PATH + "first/First.java")
                 .findMarkers(PMDRuntimeConstants.PMD_MARKER_1, false, 1);
         Assert.assertEquals(2, markersFirst.length);
         assertHasRuleViolation(markersFirst, "ClassNamingConventions");
         assertHasRuleViolation(markersFirst, "UseUtilityClass");
 
-        IMarker[] markersSecond = this.testProject.getFile("src/main/java/second/Second.java")
+        IMarker[] markersSecond = this.testProject.getFile(BASE_PATH + "second/Second.java")
                 .findMarkers(PMDRuntimeConstants.PMD_MARKER_1, false, 1);
         Assert.assertEquals(1, markersSecond.length);
         assertHasRuleViolation(markersSecond, "ClassNamingConventions");
 
-        IMarker[] markersThird = this.testProject.getFile("src/main/java/third/Third.java")
+        IMarker[] markersThird = this.testProject.getFile(BASE_PATH + "third/Third.java")
                 .findMarkers(PMDRuntimeConstants.PMD_MARKER_1, false, 1);
         Assert.assertEquals(1, markersThird.length);
         assertHasRuleViolation(markersThird, "UseUtilityClass");

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

@@ -51,6 +51,7 @@ public void checkCodeForNonJavaProject() throws Exception {
         is = EclipseUtils.getResourceStream(testProject, "/src/somefile.js");
         Assert.assertNotNull("Cannot find the test source file", is);
         is.close();
+        testProject.refreshLocal(IResource.DEPTH_INFINITE, null);
 
         // 3. Enable PMD for the test project
         IProjectProperties properties = PMDPlugin.getDefault().getPropertiesManager().loadProjectProperties(testProject);

…/runtime/cmd/multiplerulesets/First.java …me/cmd/multiplerulesets/first/First.javanet.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/First.java renamed to net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/first/First.java net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/First.java renamed to net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/first/First.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package first;
+package net.sourceforge.pmd.eclipse.runtime.cmd.multiplerulesets.first;
 
 public class First {
 

net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/ruleset1.xml

@@ -8,7 +8,7 @@
 
     <description>Rules</description>
 
-    <exclude-pattern>.*/src/main/java/third/.*</exclude-pattern>
+    <exclude-pattern>.*/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/third/.*</exclude-pattern>
 
     <rule ref="category/java/codestyle.xml/ClassNamingConventions">
         <priority>1</priority>

net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/ruleset2.xml

@@ -8,7 +8,7 @@
 
     <description>Custom rule</description>
 
-    <exclude-pattern>.*/src/main/java/second/.*</exclude-pattern>
+    <exclude-pattern>.*/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/second/.*</exclude-pattern>
 
     <rule ref="category/java/design.xml/UseUtilityClass">
         <priority>1</priority>

…runtime/cmd/multiplerulesets/Second.java …/cmd/multiplerulesets/second/Second.javanet.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/Second.java renamed to net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/second/Second.java net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/Second.java renamed to net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/second/Second.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package second;
+package net.sourceforge.pmd.eclipse.runtime.cmd.multiplerulesets.second;
 
 public class Second {
 

…/runtime/cmd/multiplerulesets/Third.java …me/cmd/multiplerulesets/third/Third.javanet.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/Third.java renamed to net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/third/Third.java net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/Third.java renamed to net.sourceforge.pmd.eclipse.plugin.test/src/main/resources/net/sourceforge/pmd/eclipse/runtime/cmd/multiplerulesets/third/Third.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package third;
+package net.sourceforge.pmd.eclipse.runtime.cmd.multiplerulesets.third;
 
 public class Third {