Merge branch 'pr-97'

Author: adangel

ReleaseNotes.md

@@ -13,6 +13,7 @@ This is a bugfix release.
 
 ### Fixed Issues
 
+*   [#96](https://github.com/pmd/pmd-eclipse-plugin/issues/96): Wrong auxclasspath if project is stored outside of workspace
 
 ## 31-March-2019: 4.2.0.v20190331-1136
 

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

@@ -213,7 +213,7 @@ public static boolean removePMDNature(final IProject project) throws CoreExcepti
      * @param project
      * @throws CoreException
      */
-    private static void addJavaNature(final IProject project) throws CoreException {
+    public static void addJavaNature(final IProject project) throws CoreException {
         if (!project.hasNature(JavaCore.NATURE_ID)) {
             final IProjectDescription description = project.getDescription();
             final String[] prevNatures = description.getNatureIds();

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

@@ -5,6 +5,8 @@
 package net.sourceforge.pmd.eclipse.runtime.cmd;
 
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -14,8 +16,11 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.junit.After;
 import org.junit.Assert;
@@ -155,6 +160,70 @@ public void testProjectBuildPath() throws Exception {
         }
     }
 
+    /**
+     * https://github.com/pmd/pmd-eclipse-plugin/issues/96
+     */
+    @Test
+    public void testProjectBuildPathOutsideWorkspace() throws Exception {
+        String projectName = "PMDTestProject2";
+        Path tempDir = Files.createTempDirectory(projectName);
+        boolean oldSetting = PMDPlugin.getDefault().getPreferencesManager().loadPreferences()
+                .isProjectBuildPathEnabled();
+        final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+        final IProject newProject = root.getProject(projectName);
+
+        try {
+            final IProjectDescription description = newProject.getWorkspace().newProjectDescription(projectName);
+            if (!newProject.exists()) {
+                description.setLocationURI(tempDir.toUri());
+                newProject.create(description, null);
+            }
+
+            if (!newProject.isOpen()) {
+                newProject.open(null);
+            }
+            EclipseUtils.addJavaNature(newProject);
+
+            IProjectProperties properties = PMDPlugin.getDefault().getPropertiesManager()
+                    .loadProjectProperties(newProject);
+            properties.setPmdEnabled(true);
+            Rule compareObjectsWithEquals = properties.getProjectRuleSet().getRuleByName("CompareObjectsWithEquals");
+            RuleSet projectRuleSet = RuleSetUtil.newSingle(compareObjectsWithEquals);
+            properties.setProjectRuleSet(projectRuleSet);
+
+            PMDPlugin.getDefault().getPreferencesManager().loadPreferences().setProjectBuildPathEnabled(true);
+            EclipseUtils.createTestSourceFile(newProject, "/src/MyEnum.java", "public enum MyEnum { A, B }");
+            IFile sourceFile = EclipseUtils.createTestSourceFile(newProject, "/src/Foo.java",
+                    "class Foo {\n" + "  boolean bar(MyEnum a, MyEnum b) {\n" + "    return a == b;\n" + // line 3
+                            "  }\n" + "}");
+            newProject.build(IncrementalProjectBuilder.FULL_BUILD, null);
+            newProject.refreshLocal(IResource.DEPTH_INFINITE, null);
+
+            ReviewCodeCmd cmd = new ReviewCodeCmd();
+            cmd.addResource(newProject);
+            cmd.performExecute();
+            cmd.join();
+            Map<IFile, Set<MarkerInfo2>> markers = cmd.getMarkers();
+            // with type resolution, this comparison is ok, as MyEnum is a enum
+            Assert.assertTrue("Type Resolution didn't work", markers.get(sourceFile).isEmpty());
+
+            // without type resolution, there is a violation
+            PMDPlugin.getDefault().getPreferencesManager().loadPreferences().setProjectBuildPathEnabled(false);
+            cmd = new ReviewCodeCmd();
+            cmd.addResource(newProject);
+            cmd.performExecute();
+            cmd.join();
+            markers = cmd.getMarkers();
+            // there is a violation expected without type resolution
+            Assert.assertFalse(markers.get(sourceFile).isEmpty());
+
+        } finally {
+            PMDPlugin.getDefault().getPreferencesManager().loadPreferences().setProjectBuildPathEnabled(oldSetting);
+
+            newProject.delete(true, true, null);
+        }
+    }
+
     /**
      * The ReviewCodeCmd must also work on a ResourceDelta
      */

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

@@ -12,7 +12,6 @@
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IClasspathEntry;
@@ -27,7 +26,6 @@ public class JavaProjectClassLoader extends URLClassLoader {
     private static final Logger LOG = Logger.getLogger(JavaProjectClassLoader.class);
 
     private Set<IJavaProject> javaProjects = new HashSet<IJavaProject>();
-    private IWorkspaceRoot workspaceRoot;
 
     public JavaProjectClassLoader(ClassLoader parent, IProject project) {
         super(new URL[0], parent);
@@ -38,14 +36,12 @@ public JavaProjectClassLoader(ClassLoader parent, IProject project) {
         } catch (CoreException e) {
             throw new IllegalArgumentException("The project " + project + " is not a java project", e);
         }
-        workspaceRoot = project.getProject().getWorkspace().getRoot();
 
         IJavaProject javaProject = JavaCore.create(project);
         addURLs(javaProject, false);
 
         // No longer need these things, drop references
         javaProjects = null;
-        workspaceRoot = null;
     }
 
     private static IProject projectFor(IJavaProject javaProject, IClasspathEntry classpathEntry) {
@@ -62,7 +58,8 @@ private void addURLs(IJavaProject javaProject, boolean exportsOnly) {
 
         try {
             // Add default output location
-            addURL(javaProject.getOutputLocation());
+            IPath projectLocation = javaProject.getProject().getLocation();
+            addURL(projectLocation.append(javaProject.getOutputLocation().removeFirstSegments(1)));
 
             // Add each classpath entry
             IClasspathEntry[] classpathEntries = javaProject.getResolvedClasspath(true);
@@ -89,7 +86,7 @@ private void addURLs(IJavaProject javaProject, boolean exportsOnly) {
                     case IClasspathEntry.CPE_SOURCE:
                         IPath outputLocation = classpathEntry.getOutputLocation();
                         if (outputLocation != null) {
-                            addURL(outputLocation);
+                            addURL(projectLocation.append(outputLocation.removeFirstSegments(1)));
                         }
                         break;
 
@@ -113,11 +110,6 @@ private void addURL(IClasspathEntry classpathEntry) {
 
     private void addURL(IPath path) {
         try {
-            if (workspaceRoot.exists(path)) {
-                // path = workspaceRoot.getFileForLocation(path).getFullPath();
-                // path = workspaceRoot.getFile(path).getFullPath();
-                path = workspaceRoot.getLocation().append(path);
-            }
             URL url = path.toFile().getAbsoluteFile().toURI().toURL();
             addURL(url);
         } catch (MalformedURLException e) {