fix expected warnings/errors for 16/17

olamy · olamy · commit 1ee03aea71c0 · 2020-12-30T14:35:32.000+10:00
Signed-off-by: olivier lamy &lt;olamy@apache.org&gt;
diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
@@ -61,7 +61,8 @@ protected String getRoleHint()
     protected int expectedErrors()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||javaVersion.contains("15")){
+        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
+            javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")){
             // lots of new warnings about obsoletions for future releases
             return 5;
         }
@@ -79,7 +80,8 @@ protected int expectedErrors()
     protected int expectedWarnings()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||javaVersion.contains("15")){
+        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
+            javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")){
             return 1;
         }
         if (javaVersion.contains("9.0")){

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ protected String getRoleHint()`
`61`	`61`	`protected int expectedErrors()`
`62`	`62`	`{`
`63`	`63`	`String javaVersion = getJavaVersion();`
`64`		`- if (javaVersion.contains("9.0")\|\|javaVersion.contains("11")\|\|javaVersion.contains("14")\|\|javaVersion.contains("15")){`
	`64`	`+ if (javaVersion.contains("9.0")\|\|javaVersion.contains("11")\|\|javaVersion.contains("14")\|\|`
	`65`	`+ javaVersion.contains("15")\|\|javaVersion.contains("16")\|\|javaVersion.contains("17")){`
`65`	`66`	`// lots of new warnings about obsoletions for future releases`
`66`	`67`	`return 5;`
`67`	`68`	`}`
`@@ -79,7 +80,8 @@ protected int expectedErrors()`
`79`	`80`	`protected int expectedWarnings()`
`80`	`81`	`{`
`81`	`82`	`String javaVersion = getJavaVersion();`
`82`		`- if (javaVersion.contains("9.0")\|\|javaVersion.contains("11")\|\|javaVersion.contains("14")\|\|javaVersion.contains("15")){`
	`83`	`+ if (javaVersion.contains("9.0")\|\|javaVersion.contains("11")\|\|javaVersion.contains("14")\|\|`
	`84`	`+ javaVersion.contains("15")\|\|javaVersion.contains("16")\|\|javaVersion.contains("17")){`
`83`	`85`	`return 1;`
`84`	`86`	`}`
`85`	`87`	`if (javaVersion.contains("9.0")){`