Test expectation via wrong parameter

+ fix test that caused NPE with -Drun.javac ...
+ also add more JDK versions to test infra for -Drun.javac

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

@@ -320,6 +320,10 @@ static String versionFromRawVersion(String rawVersion, String javacPathName) {
 			return JavaCore.VERSION_19;
 		} else if(rawVersion.startsWith("20")) {
 			return JavaCore.VERSION_20;
+		} else if(rawVersion.startsWith("21")) {
+			return JavaCore.VERSION_21;
+		} else if(rawVersion.startsWith("22")) {
+			return JavaCore.VERSION_22;
 		} else {
 			throw new RuntimeException("unknown javac version: " + rawVersion);
 		}
@@ -559,6 +563,11 @@ static int minorFromRawVersion (String version, String rawVersion) {
 				return 0200;
 			}
 		}
+		if (version == JavaCore.VERSION_22) {
+			if ("22".equals(rawVersion)) {
+				return 0000;
+			}
+		}
 		throw new RuntimeException("unknown raw javac version: " + rawVersion);
 	}
 	// returns 0L if everything went fine; else the lower word contains the

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

@@ -199,7 +199,7 @@ public void testConflictWithUnnamedModule() {
 				"	}\n" +
 				"}"
 			};
-	runner.expectedErrorString =
+	runner.expectedCompilerLog =
 			"----------\n" +
 			"1. ERROR in X.java (at line 3)\n" +
 			"	String s = org.xml.sax.helpers.NamespaceSupport.XMLNS;\n" +