diff --git a/org.jacoco.core.test.validation.java14/pom.xml b/org.jacoco.core.test.validation.java14/pom.xml
index 6ab698ea14..69ccfbc7a3 100644
--- a/org.jacoco.core.test.validation.java14/pom.xml
+++ b/org.jacoco.core.test.validation.java14/pom.xml
@@ -36,24 +36,4 @@
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- --enable-preview
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- --enable-preview
-
-
-
-
diff --git a/org.jacoco.core.test.validation.java16/.classpath b/org.jacoco.core.test.validation.java16/.classpath
new file mode 100644
index 0000000000..a91bd22121
--- /dev/null
+++ b/org.jacoco.core.test.validation.java16/.classpath
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.jacoco.core.test.validation.java16/.project b/org.jacoco.core.test.validation.java16/.project
new file mode 100644
index 0000000000..9a11aebf29
--- /dev/null
+++ b/org.jacoco.core.test.validation.java16/.project
@@ -0,0 +1,30 @@
+
+
+ org.jacoco.core.test.validation.java16
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.m2e.core.maven2Nature
+ org.eclipse.jdt.core.javanature
+
+
+
+ .settings
+ 2
+ PARENT-1-PROJECT_LOC/org.jacoco.core.test/.settings
+
+
+
diff --git a/org.jacoco.core.test.validation.java16/pom.xml b/org.jacoco.core.test.validation.java16/pom.xml
new file mode 100644
index 0000000000..025abc8cbb
--- /dev/null
+++ b/org.jacoco.core.test.validation.java16/pom.xml
@@ -0,0 +1,39 @@
+
+
+
+ 4.0.0
+
+
+ org.jacoco
+ org.jacoco.core.test.validation
+ 0.8.8-SNAPSHOT
+ ../org.jacoco.core.test.validation
+
+
+ org.jacoco.core.test.validation.java16
+
+ JaCoCo :: Test :: Core :: Validation Java 16
+
+
+ 16
+
+
+
+
+ ${project.groupId}
+ org.jacoco.core.test
+ ${project.version}
+
+
+
+
diff --git a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/InstanceofTest.java b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/InstanceofTest.java
similarity index 65%
rename from org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/InstanceofTest.java
rename to org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/InstanceofTest.java
index 09a7db34da..d7d2ad7b41 100644
--- a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/InstanceofTest.java
+++ b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/InstanceofTest.java
@@ -10,11 +10,10 @@
* Evgeny Mandrikov - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.core.test.validation.java14;
+package org.jacoco.core.test.validation.java16;
-import org.jacoco.core.test.validation.Source.Line;
import org.jacoco.core.test.validation.ValidationTestBase;
-import org.jacoco.core.test.validation.java14.targets.InstanceofTarget;
+import org.jacoco.core.test.validation.java16.targets.InstanceofTarget;
/**
* Test of code coverage in {@link InstanceofTarget}.
@@ -25,13 +24,4 @@ public InstanceofTest() {
super(InstanceofTarget.class);
}
- public void assertInstanceof(final Line line) {
- if (isJDKCompiler && JAVA_VERSION.isBefore("15")) {
- // https://bugs.openjdk.java.net/browse/JDK-8237528
- assertFullyCovered(line, 1, 3);
- } else {
- assertFullyCovered(line, 0, 2);
- }
- }
-
}
diff --git a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/RecordsTest.java b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/RecordsTest.java
similarity index 87%
rename from org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/RecordsTest.java
rename to org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/RecordsTest.java
index 7e93f50d19..c11731eec1 100644
--- a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/RecordsTest.java
+++ b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/RecordsTest.java
@@ -10,10 +10,10 @@
* Evgeny Mandrikov - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.core.test.validation.java14;
+package org.jacoco.core.test.validation.java16;
import org.jacoco.core.test.validation.ValidationTestBase;
-import org.jacoco.core.test.validation.java14.targets.RecordsTarget;
+import org.jacoco.core.test.validation.java16.targets.RecordsTarget;
/**
* Test of code coverage for records.
diff --git a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/InstanceofTarget.java b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/InstanceofTarget.java
similarity index 77%
rename from org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/InstanceofTarget.java
rename to org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/InstanceofTarget.java
index 3058295dce..1b44c3a46d 100644
--- a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/InstanceofTarget.java
+++ b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/InstanceofTarget.java
@@ -10,17 +10,18 @@
* Evgeny Mandrikov - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.core.test.validation.java14.targets;
+package org.jacoco.core.test.validation.java16.targets;
import static org.jacoco.core.test.validation.targets.Stubs.nop;
/**
- * This target exercises pattern matching for instanceof (JEP 305).
+ * This target exercises pattern matching for instanceof
+ * (JEP 394).
*/
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);
}
}
diff --git a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/RecordsTarget.java b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/RecordsTarget.java
similarity index 88%
rename from org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/RecordsTarget.java
rename to org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/RecordsTarget.java
index 4667c5bb0d..37e60ecf6f 100644
--- a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/RecordsTarget.java
+++ b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/RecordsTarget.java
@@ -10,10 +10,11 @@
* Evgeny Mandrikov - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.core.test.validation.java14.targets;
+package org.jacoco.core.test.validation.java16.targets;
/**
- * This target exercises records.
+ * This target exercises records
+ * (JEP 395).
*/
public class RecordsTarget {
diff --git a/org.jacoco.core.test.validation/pom.xml b/org.jacoco.core.test.validation/pom.xml
index 72ba3a23bb..f79d75e3e3 100644
--- a/org.jacoco.core.test.validation/pom.xml
+++ b/org.jacoco.core.test.validation/pom.xml
@@ -307,6 +307,7 @@
../org.jacoco.core.test.validation.java7
../org.jacoco.core.test.validation.java8
../org.jacoco.core.test.validation.java14
+ ../org.jacoco.core.test.validation.java16
../org.jacoco.core.test.validation.groovy
../org.jacoco.core.test.validation.scala
diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index 5cd0aef3f8..f51d3823ba 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -96,6 +96,21 @@
Compilation and testing with different JDKs
+
+ org.jacoco.core.test.validation.java16 |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ 16 |
+
org.jacoco.core.test.validation.java14 |
|