Fix validation test for Java 21 (#1422)

Godin · web-flow · commit c561c13f07a5 · 2023-03-31T17:31:30.000+02:00
diff --git a/org.jacoco.core.test.validation.java20/src/org/jacoco/core/test/validation/java20/RecordPatternsTest.java b/org.jacoco.core.test.validation.java20/src/org/jacoco/core/test/validation/java20/RecordPatternsTest.java
@@ -12,6 +12,8 @@
  *******************************************************************************/
 package org.jacoco.core.test.validation.java20;
 
+import org.jacoco.core.test.validation.JavaVersion;
+import org.jacoco.core.test.validation.Source.Line;
 import org.jacoco.core.test.validation.ValidationTestBase;
 import org.jacoco.core.test.validation.java20.targets.RecordPatternsTarget;
 
@@ -24,4 +26,22 @@ public RecordPatternsTest() {
 		super(RecordPatternsTarget.class);
 	}
 
+	public void assertSwitchStatementCase(Line line) {
+		if (JavaVersion.current().isBefore("21")) {
+			assertFullyCovered(line);
+		} else {
+			// https://github.com/openjdk/jdk/commit/138cdc9283ae8f3367e51f0fe7e27833118dd7cb
+			assertPartlyCovered(line);
+		}
+	}
+
+	public void assertSwitchStatementDefault(Line line) {
+		if (JavaVersion.current().isBefore("21")) {
+			assertPartlyCovered(line);
+		} else {
+			// https://github.com/openjdk/jdk/commit/138cdc9283ae8f3367e51f0fe7e27833118dd7cb
+			assertFullyCovered(line);
+		}
+	}
+
 }
diff --git a/org.jacoco.core.test.validation.java20/src/org/jacoco/core/test/validation/java20/targets/RecordPatternsTarget.java b/org.jacoco.core.test.validation.java20/src/org/jacoco/core/test/validation/java20/targets/RecordPatternsTarget.java
@@ -31,8 +31,8 @@ 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()
-		default -> nop(); // assertPartlyCovered()
+		case Point(int x, int y) -> nop(x + y); // assertSwitchStatementCase()
+		default -> nop(); // assertSwitchStatementDefault()
 		} // assertEmpty()
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ private static void instanceofOperator(Object o) {`
`31`	`31`
`32`	`32`	`private static void switchStatement(Object p) {`
`33`	`33`	`switch (p) { // assertFullyCovered(0, 2)`
`34`		`- case Point(int x, int y) -> nop(x + y); // assertFullyCovered()`
`35`		`- default -> nop(); // assertPartlyCovered()`
	`34`	`+ case Point(int x, int y) -> nop(x + y); // assertSwitchStatementCase()`
	`35`	`+ default -> nop(); // assertSwitchStatementDefault()`
`36`	`36`	`} // assertEmpty()`
`37`	`37`	`}`
`38`	`38`