Test project compilation fixes for Eclipse

CHANGELOG.md

@@ -6,6 +6,9 @@ Currently the versioning policy of this project follows [Semantic Versioning v2.
 
 ## Unreleased - 2020-??-??
 ### Changed
+* Bump jaxen from 1.1.6 to 1.2.0 supporting Java 11 compilation ([#1316](https://github.com/spotbugs/spotbugs/issues/1316))
+* Fixed error dialog on cancelling SpotBugs job in Eclipse ([#1314](https://github.com/spotbugs/spotbugs/issues/1314))
+* Fixed IllegalArgumentException in OpcodeStack.constantToInt ([#893](https://github.com/spotbugs/spotbugs/issues/893))
 * Bump ASM from 8.0.1 to 9.0 supporting JDK16 (sealed classes)
 
 ## 4.1.3 - 2020-09-25

eclipsePlugin/src/de/tobject/findbugs/builder/FindBugsWorker.java

@@ -29,6 +29,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
 import org.dom4j.DocumentException;
@@ -303,27 +304,46 @@ private void collectClassFiles(List<WorkItem> resources, Map<IPath, IPath> outLo
      *            fb engine, which will be <b>disposed</b> after the analysis is
      *            done
      */
-    private void runFindBugs(final FindBugs2 findBugs) {
+    private static void runFindBugs(final FindBugs2 findBugs) {
         if (DEBUG) {
             FindbugsPlugin.log("Running findbugs in thread " + Thread.currentThread().getName());
         }
         System.setProperty("findbugs.progress", "true");
         try {
             // Perform the analysis! (note: This is not thread-safe)
             findBugs.execute();
-        } catch (InterruptedException e) {
-            if (DEBUG) {
-                FindbugsPlugin.getDefault().logException(e, "Worker interrupted");
+        } catch (Exception e) {
+            if (isInterrupted(e)) {
+                if (DEBUG) {
+                    FindbugsPlugin.getDefault().logException(e, "Worker interrupted");
+                }
+            } else {
+                FindbugsPlugin.getDefault().logException(e, "Error performing SpotBugs analysis");
             }
-            Thread.currentThread().interrupt();
-        } catch (IOException e) {
-            FindbugsPlugin.getDefault().logException(e, "Error performing SpotBugs analysis");
         } finally {
             findBugs.dispose();
         }
 
     }
 
+    private static boolean isInterrupted(Exception e) {
+        if (e instanceof InterruptedException) {
+            Thread.currentThread().interrupt();
+            return true;
+        }
+        Throwable cause = e.getCause();
+        if (cause instanceof InterruptedException) {
+            return true;
+        }
+        if (cause instanceof ExecutionException) {
+            ExecutionException ee = (ExecutionException) cause;
+            if (ee.getCause() instanceof InterruptedException) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Update the BugCollection for the project.
      *

spotbugs-tests/src/test/java/edu/umd/cs/findbugs/ba/Issue893Test.java

@@ -0,0 +1,21 @@
+package edu.umd.cs.findbugs.ba;
+
+import static edu.umd.cs.findbugs.test.CountMatcher.containsExactly;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.junit.Test;
+
+import edu.umd.cs.findbugs.AbstractIntegrationTest;
+import edu.umd.cs.findbugs.test.matcher.BugInstanceMatcher;
+import edu.umd.cs.findbugs.test.matcher.BugInstanceMatcherBuilder;
+
+public class Issue893Test extends AbstractIntegrationTest {
+
+    @Test
+    public void test() {
+        performAnalysis("ghIssues/Issue893.class");
+        BugInstanceMatcher bugTypeMatcher = new BugInstanceMatcherBuilder().build();
+        assertThat(getBugCollection(), containsExactly(0, bugTypeMatcher));
+    }
+
+}

spotbugs/build.gradle

@@ -80,7 +80,7 @@ dependencies {
     exclude group: 'pull-parser',      module: 'pull-parser'
     exclude group: 'xpp3',             module: 'xpp3'
   }
-  implementation 'jaxen:jaxen:1.1.6' // only transitive through dom4j:dom4j:1.6.1, which has an *optional* dependency on jaxen:jaxen.
+  implementation 'jaxen:jaxen:1.2.0' // only transitive through dom4j:dom4j:1.6.1, which has an *optional* dependency on jaxen:jaxen.
   api 'org.apache.commons:commons-lang3:3.11'
   api 'org.apache.commons:commons-text:1.9'
   api 'org.slf4j:slf4j-api:1.8.0-beta4'
@@ -104,7 +104,7 @@ dependencies {
   guiTestImplementation sourceSets.gui.runtimeClasspath
   guiTestImplementation 'junit:junit:4.13'
   guiTestCompileOnly project(':spotbugs-annotations')
-  
+
   // for Eclipse compilation only
   appleExtensions 'com.apple:AppleJavaExtensions:1.4'
 }
@@ -361,4 +361,4 @@ spotbugsTest {
 // TODO : validatesamplexmloutput
 
 // XML validation
-// TODO : validate
+// TODO : validate

spotbugs/src/main/java/edu/umd/cs/findbugs/OpcodeStack.java

@@ -2194,6 +2194,10 @@ private int constantToInt(Item it) {
         if (constant instanceof Character) {
             return ((Character) constant).charValue();
         }
+        if (constant instanceof Boolean) {
+            Boolean val = (Boolean) constant;
+            return val.booleanValue() ? 1 : 0;
+        }
         throw new IllegalArgumentException(String.valueOf(constant));
     }
 

spotbugsTestCases/src/java/ghIssues/Issue893.java

@@ -0,0 +1,10 @@
+package ghIssues;
+
+public class Issue893 {
+    public boolean test() throws Exception {
+        Boolean b = Boolean.valueOf(true);
+        // Line below should not throw IllegalArgumentException during analysis
+        b &= Boolean.valueOf(false);
+        return b;
+    }
+}

test-harness-core/build.gradle

@@ -3,7 +3,9 @@ apply from: "$rootDir/gradle/javadoc.gradle"
 apply from: "$rootDir/gradle/maven.gradle"
 
 dependencies {
-  compileOnly project(':spotbugs')
+  api (project(':spotbugs')) {
+    transitive = true
+  }
 }
 
 java {

test-harness/build.gradle

@@ -4,7 +4,7 @@ apply from: "$rootDir/gradle/maven.gradle"
 
 dependencies {
   compileOnly 'junit:junit:4.13'
-  compileOnly project(':spotbugs')
+  testImplementation project(':spotbugs')
   api project(':test-harness-core')
 }