Merge branch 'master' into kotlin_default_arguments_issue_1546

jacoco · Dec 14, 2023 · 07630a0 · 07630a0
2 parents fbad259 + b127971
commit 07630a0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -40,11 +40,11 @@ jobs:
         JDK_VERSION: 19
       JDK 20:
         JDK_VERSION: 20
-      JDK 20 with ECJ:
-        JDK_VERSION: 20
-        ECJ: true
       JDK 21:
         JDK_VERSION: 21
+      JDK 21 with ECJ:
+        JDK_VERSION: 21
+        ECJ: true
       JDK 22:
         JDK_VERSION: 22
       JDK 23:

diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
@@ -963,7 +963,7 @@
               <dependency>
                 <groupId>org.eclipse.jdt</groupId>
                 <artifactId>ecj</artifactId>
-                <version>3.35.0</version>
+                <version>3.36.0</version>
               </dependency>
               <dependency>
                 <groupId>org.codehaus.plexus</groupId>

diff --git a/...test.validation.java21/src/org/jacoco/core/test/validation/java21/RecordPatternsTest.java b/...test.validation.java21/src/org/jacoco/core/test/validation/java21/RecordPatternsTest.java
@@ -26,4 +26,13 @@ public RecordPatternsTest() {
 		super(RecordPatternsTarget.class);
 	}
 
+	public void assertSwitchStatementLastCase(final Line line) {
+		if (isJDKCompiler) {
+			assertFullyCovered(line);
+		} else {
+			// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/773
+			assertPartlyCovered(line);
+		}
+	}
+
 }
diff --git a/...ation.java21/src/org/jacoco/core/test/validation/java21/targets/RecordPatternsTarget.java b/...ation.java21/src/org/jacoco/core/test/validation/java21/targets/RecordPatternsTarget.java
@@ -31,7 +31,7 @@ private static void instanceofOperator(Object o) {
 
 	private static void switchStatement(Object p) {
 		switch (p) { // assertFullyCovered(0, 2)
-		case Point(int x, int y) -> nop(x + y); // assertFullyCovered()
+		case Point(int x, int y) -> nop(x + y); // assertSwitchStatementLastCase()
 		default -> nop(); // assertFullyCovered()
 		} // assertEmpty()
 	}

diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
@@ -329,8 +329,8 @@ <h2>Compilation and testing with different JDKs</h2>
   <li><code>mvn clean verify -Djdk.version=18 -Dbytecode.version=18</code></li>
   <li><code>mvn clean verify -Djdk.version=19 -Dbytecode.version=19</code></li>
   <li><code>mvn clean verify -Djdk.version=20 -Dbytecode.version=20</code></li>
-  <li><code>mvn clean verify -Djdk.version=20 -Dbytecode.version=20 -Decj</code></li>
   <li><code>mvn clean verify -Djdk.version=21 -Dbytecode.version=21</code></li>
+  <li><code>mvn clean verify -Djdk.version=20 -Dbytecode.version=21 -Decj</code></li>
 </ul>