JDK library enhancement captured in issue eclipse-jdt#3877 and issue eclipse-jdt#3878

Author: mpalat

org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java

@@ -58,7 +58,7 @@ public GenericTypeTest(String name) {
 	// Static initializer to specify tests subset using TESTS_* static variables
 	// All specified tests which does not belong to the class are skipped...
 	static {
-//		TESTS_NAMES = new String[] { "test0593" };
+//		TESTS_NAMES = new String[] { "test1083" };
 //		TESTS_NUMBERS = new int[] { 470, 627 };
 //		TESTS_RANGE = new int[] { 1097, -1 };
 	}
@@ -37578,6 +37578,18 @@ public void test1082() {
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=106451 - variation
 public void test1083() {
+	String JDK8344943_msg = isJRE25Plus ?
+			"3. ERROR in X.java (at line 15)\n" +
+			"	java.util.List<Runtime> d = (LinkedList<Runtime>) a; // inconvertible / unchecked ?\n" +
+			"	                            ^^^^^^^^^^^^^^^^^^^^^^^\n" +
+			"Cannot cast from List<capture#3-of ? extends Serializable> to LinkedList<Runtime>\n" +
+			"----------\n"
+			:
+			"3. WARNING in X.java (at line 15)\n" +
+			"	java.util.List<Runtime> d = (LinkedList<Runtime>) a; // inconvertible / unchecked ?\n" +
+			"	                            ^^^^^^^^^^^^^^^^^^^^^^^\n" +
+			"Type safety: Unchecked cast from List<capture#3-of ? extends Serializable> to LinkedList<Runtime>\n" +
+			"----------\n";
 	this.runNegativeTest(
 		new String[] {
 			"X.java", // =================
@@ -37613,11 +37625,7 @@ public void test1083() {
 		"	                            ^^^^^^^^^^^^^^^^^^^^^^^\n" +
 		"Type safety: Unchecked cast from List<capture#2-of ? extends Serializable> to LinkedList<Integer>\n" +
 		"----------\n" +
-		"3. WARNING in X.java (at line 15)\n" +
-		"	java.util.List<Runtime> d = (LinkedList<Runtime>) a; // inconvertible / unchecked ?\n" +
-		"	                            ^^^^^^^^^^^^^^^^^^^^^^^\n" +
-		"Type safety: Unchecked cast from List<capture#3-of ? extends Serializable> to LinkedList<Runtime>\n" +
-		"----------\n" +
+		JDK8344943_msg +
 		"4. ERROR in X.java (at line 18)\n" +
 		"	Zork z;\n" +
 		"	^^^^\n" +

org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ResourceLeakTests.java

@@ -8,6 +8,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *
+ * This is an implementation of an early-draft specification developed under the Java
+ * Community Process (JCP) and is made available for testing and evaluation purposes
+ * only. The code is not compatible with any specification of the JCP.
+ *
  * Contributors:
  *     Stephan Herrmann - initial API and implementation
  *     Nikolay Metchev (nikolaymetchev@gmail.com) - Contributions for
@@ -76,7 +80,7 @@ abstract class BaseStreamEx<T, S extends BaseStream<T, S>, SPLTR extends Spliter
 	""";
 
 static {
-//	TESTS_NAMES = new String[] { "testBug463320" };
+//	TESTS_NAMES = new String[] { "testBug368709b" };
 //	TESTS_NUMBERS = new int[] { 50 };
 //	TESTS_RANGE = new int[] { 11, -1 };
 }
@@ -3087,6 +3091,14 @@ public void test063e() {
 // original test case from jgit
 public void testBug368709a() {
 	if (this.complianceLevel < ClassFileConstants.JDK1_5) return;
+	String JDK8225763_Fix = isJRE25Plus ?
+			"2. ERROR in X.java (at line 17)\n" +
+			"	in = new BufferedInputStream(new InflaterInputStream(in, wc.inflater(), 8192), 8192);\n" +
+			"	                                                         ^^^^^^^^^^^^^\n" +
+			potentialOrDefiniteLeak("<unassigned Closeable value>") +
+			"----------\n" +
+			"3."
+			: "2.";
 	Map options = getCompilerOptions();
 	options.put(CompilerOptions.OPTION_ReportUnclosedCloseable, CompilerOptions.ERROR);
 	options.put(CompilerOptions.OPTION_ReportPotentiallyUnclosedCloseable, CompilerOptions.ERROR);
@@ -3142,7 +3154,8 @@ public void testBug368709a() {
 		"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
 		potentialOrDefiniteLeak("<unassigned Closeable value>") +
 		"----------\n" +
-		"2. ERROR in X.java (at line 18)\n" +
+		JDK8225763_Fix +
+		" ERROR in X.java (at line 18)\n" +
 		"	return new ObjectStream.Filter(type, size, in);\n" +
 		"	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
 		potentialLeakOrCloseNotShownAtExit("in") +
@@ -3153,6 +3166,13 @@ public void testBug368709a() {
 // minimal test case: constructing an indirect self-wrapper
 public void testBug368709b() {
 	if (this.complianceLevel < ClassFileConstants.JDK1_5) return;
+	String JDK8225763_Fix = isJRE25Plus ?
+			"2. ERROR in X.java (at line 6)\n" +
+			"	in = new BufferedInputStream(new InflaterInputStream(in, inflater(), 8192), 8192);\n" +
+			"	                                                         ^^^^^^^^^^\n" +
+			potentialOrDefiniteLeak("<unassigned Closeable value>") +
+			"----------\n"
+			: "";
 	Map options = getCompilerOptions();
 	options.put(CompilerOptions.OPTION_ReportUnclosedCloseable, CompilerOptions.ERROR);
 	options.put(CompilerOptions.OPTION_ReportPotentiallyUnclosedCloseable, CompilerOptions.ERROR);
@@ -3176,7 +3196,8 @@ public void testBug368709b() {
 		"	InputStream in = new FileInputStream(\"somefile\");\n" +
 		"	            ^^\n" +
 		potentialLeakOrCloseNotShown("in") +
-		"----------\n",
+		"----------\n" +
+		JDK8225763_Fix,
 		options);
 }