From ffb40e9ab3c3f2bf20e9b295bad46002cac89ae1 Mon Sep 17 00:00:00 2001
From: "Marc R. Hoffmann" <hoffmann@mountainminds.com>
Date: Fri, 11 Dec 2020 20:32:26 +0100
Subject: [PATCH 1/3] Add new project for Java 16 validation tests

Also remove preview features from Java 14 validation tests.
---
 .../pom.xml                                   | 20 ----------
 .../.classpath                                | 20 ++++++++++
 .../.project                                  | 30 ++++++++++++++
 .../pom.xml                                   | 39 +++++++++++++++++++
 .../validation/java16}/InstanceofTest.java    | 14 +------
 .../test/validation/java16}/RecordsTest.java  |  4 +-
 .../java16}/targets/InstanceofTarget.java     |  4 +-
 .../java16}/targets/RecordsTarget.java        |  2 +-
 org.jacoco.core.test.validation/pom.xml       |  1 +
 org.jacoco.doc/docroot/doc/build.html         | 15 +++++++
 10 files changed, 112 insertions(+), 37 deletions(-)
 create mode 100644 org.jacoco.core.test.validation.java16/.classpath
 create mode 100644 org.jacoco.core.test.validation.java16/.project
 create mode 100644 org.jacoco.core.test.validation.java16/pom.xml
 rename {org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14 => org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16}/InstanceofTest.java (65%)
 rename {org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14 => org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16}/RecordsTest.java (87%)
 rename {org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14 => org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16}/targets/InstanceofTarget.java (88%)
 rename {org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14 => org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16}/targets/RecordsTarget.java (95%)

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 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs>
-            <arg>--enable-preview</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>--enable-preview</argLine>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.jacoco.core.test.validation.java16</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>.settings</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/org.jacoco.core.test/.settings</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
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..ab3a3827d8
--- /dev/null
+++ b/org.jacoco.core.test.validation.java16/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+   This program and the accompanying materials are made available under
+   the terms of the Eclipse Public License 2.0 which is available at
+   http://www.eclipse.org/legal/epl-2.0
+
+   SPDX-License-Identifier: EPL-2.0
+
+   Contributors:
+      Marc R. Hoffmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jacoco</groupId>
+    <artifactId>org.jacoco.core.test.validation</artifactId>
+    <version>0.8.7-SNAPSHOT</version>
+    <relativePath>../org.jacoco.core.test.validation</relativePath>
+  </parent>
+
+  <artifactId>org.jacoco.core.test.validation.java16</artifactId>
+
+  <name>JaCoCo :: Test :: Core :: Validation Java 16</name>
+
+  <properties>
+    <bytecode.version>16</bytecode.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>org.jacoco.core.test</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>
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 88%
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..8719068e7e 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,7 +10,7 @@
  *    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;
 
@@ -20,7 +20,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);
 		}
 	}
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 95%
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..18619ebd24 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,7 +10,7 @@
  *    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.
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 @@
         <module>../org.jacoco.core.test.validation.java7</module>
         <module>../org.jacoco.core.test.validation.java8</module>
         <module>../org.jacoco.core.test.validation.java14</module>
+        <module>../org.jacoco.core.test.validation.java16</module>
         <module>../org.jacoco.core.test.validation.groovy</module>
         <module>../org.jacoco.core.test.validation.scala</module>
       </modules>
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 @@ <h2>Compilation and testing with different JDKs</h2>
   </tr>
   </thead>
   <tbody>
+  <tr>
+    <td>org.jacoco.core.test.validation.java16</td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td>16</td>
+  </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java14</td>
     <td></td>

From e805313b37d032ef957a91ac2d07fb40ea0071b3 Mon Sep 17 00:00:00 2001
From: "Marc R. Hoffmann" <hoffmann@mountainminds.com>
Date: Thu, 27 May 2021 22:37:52 +0200
Subject: [PATCH 2/3] Add JEP links

---
 .../core/test/validation/java16/targets/InstanceofTarget.java  | 3 ++-
 .../core/test/validation/java16/targets/RecordsTarget.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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
index 8719068e7e..1b44c3a46d 100644
--- 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
@@ -15,7 +15,8 @@
 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
+ * (<a href="https://openjdk.java.net/jeps/394">JEP 394</a>).
  */
 public class InstanceofTarget {
 
diff --git a/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/RecordsTarget.java b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/RecordsTarget.java
index 18619ebd24..37e60ecf6f 100644
--- a/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/RecordsTarget.java
+++ b/org.jacoco.core.test.validation.java16/src/org/jacoco/core/test/validation/java16/targets/RecordsTarget.java
@@ -13,7 +13,8 @@
 package org.jacoco.core.test.validation.java16.targets;
 
 /**
- * This target exercises records.
+ * This target exercises records
+ * (<a href="https://openjdk.java.net/jeps/395">JEP 395</a>).
  */
 public class RecordsTarget {
 

From 69451f36b06044ac057ef0cd2904dd7bb5be1a7d Mon Sep 17 00:00:00 2001
From: "Marc R. Hoffmann" <hoffmann@mountainminds.com>
Date: Thu, 27 May 2021 22:47:34 +0200
Subject: [PATCH 3/3] Fix parent POM version after rebase

---
 org.jacoco.core.test.validation.java16/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.jacoco.core.test.validation.java16/pom.xml b/org.jacoco.core.test.validation.java16/pom.xml
index ab3a3827d8..025abc8cbb 100644
--- a/org.jacoco.core.test.validation.java16/pom.xml
+++ b/org.jacoco.core.test.validation.java16/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.jacoco</groupId>
     <artifactId>org.jacoco.core.test.validation</artifactId>
-    <version>0.8.7-SNAPSHOT</version>
+    <version>0.8.8-SNAPSHOT</version>
     <relativePath>../org.jacoco.core.test.validation</relativePath>
   </parent>