Upgrade ECJ to 3.33.0 (#1423)

Godin · web-flow · commit 31f16d834819 · 2023-04-03T09:06:41.000Z
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
@@ -939,7 +939,7 @@
               <dependency>
                 <groupId>org.eclipse.jdt</groupId>
                 <artifactId>ecj</artifactId>
-                <version>3.32.0</version>
+                <version>3.33.0</version>
               </dependency>
               <dependency>
                 <groupId>org.codehaus.plexus</groupId>
diff --git a/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/InstanceofTest.java b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/InstanceofTest.java
@@ -25,15 +25,4 @@ public InstanceofTest() {
 		super(InstanceofTarget.class);
 	}
 
-	public void assertInstanceof(Line line) {
-		if (isJDKCompiler) {
-			assertFullyCovered(line, 0, 2);
-		} else {
-			// Upgrade to ECJ version with
-			// https://github.com/eclipse-jdt/eclipse.jdt.core/commit/3b4c932227240d090904e141a485ba9181a79b67
-			// will lead to the absence of missed branches
-			assertFullyCovered(line, 1, 3);
-		}
-	}
-
 }
diff --git a/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/InstanceofTarget.java b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/InstanceofTarget.java
@@ -21,7 +21,7 @@
 public class InstanceofTarget {
 
 	private static void ifInstanceof(Object e) {
-		if (e instanceof String s) { // assertInstanceof()
+		if (e instanceof String s) { // assertFullyCovered(0, 2)
 			nop(s);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`public class InstanceofTarget {`
`22`	`22`
`23`	`23`	`private static void ifInstanceof(Object e) {`
`24`		`- if (e instanceof String s) { // assertInstanceof()`
	`24`	`+ if (e instanceof String s) { // assertFullyCovered(0, 2)`
`25`	`25`	`nop(s);`
`26`	`26`	`}`
`27`	`27`	`}`