Adjust validation test in accordance with changes for JEP 455 in JDK …

…23 (#1580)
jacoco · Feb 19, 2024 · 25594b2 · 25594b2
1 parent 8067986
commit 25594b2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
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,12 +26,24 @@ public RecordPatternsTest() {
 		super(RecordPatternsTarget.class);
 	}
 
-	public void assertSwitchStatementLastCase(final Line line) {
-		if (isJDKCompiler) {
-			assertFullyCovered(line);
+	public void assertInstanceof(final Line line) {
+		if (JavaVersion.current().isBefore("23")) {
+			assertFullyCovered(line, 0, 2);
 		} else {
+			// TODO https://bugs.openjdk.org/browse/JDK-8303374
+			assertFullyCovered(line, 2, 4);
+		}
+	}
+
+	public void assertSwitchStatementLastCase(final Line line) {
+		if (!isJDKCompiler) {
 			// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/773
 			assertPartlyCovered(line);
+		} else if (JavaVersion.current().isBefore("23")) {
+			assertFullyCovered(line);
+		} else {
+			// TODO https://bugs.openjdk.org/browse/JDK-8303374
+			assertPartlyCovered(line, 2, 2);
 		}
 	}
 

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
@@ -24,7 +24,7 @@ private record Point(int x, int y) {
 	}
 
 	private static void instanceofOperator(Object o) {
-		if (o instanceof Point(int x, int y)) { // assertFullyCovered(0, 2)
+		if (o instanceof Point(int x, int y)) { // assertInstanceof()
 			nop(x + y); // assertFullyCovered()
 		} // assertEmpty()
 	}