Fix various tests so that they can run on JDK 17

fix CanProxyToLocalhostTest: Proxy#toString changed slightly fix JavaCompletionTask121FeaturesTest: add Record to test data fix ConvertToRecordPatternTest and ConvertToNestedRecordPatternTest - enforce parsable source level for hint tests - update record patern syntax in tests Stabilize JS Test testIssue215777 by Matthias - split golden files into two NbTestCase method ordering is always using "natural" order - ClassLoader fields can not be accessed via reflection on JDK 12+ - test method ordering options are not used anywhere atm - disable tests Co-authored-by: Matthias Bläsing <mblaesing@doppel-helix.eu>
apache · Feb 9, 2024 · f2079bc · f2079bc
1 parent c0f818c
commit f2079bc
Show file tree

Hide file tree

Showing 18 changed files with 173 additions and 172 deletions.
diff --git a/harness/nbjunit/src/org/netbeans/junit/MethodOrder.java b/harness/nbjunit/src/org/netbeans/junit/MethodOrder.java
@@ -43,6 +43,9 @@ static void initialize() {
         String orderS = findOrder();
         if (!"natural".equals(orderS)) { // NOI18N
             try {
+                // TODO: ClassLoader fields can not be accessed via reflection on JDK 12+
+                // see jdk.internal.reflect.Reflection#fieldFilterMap
+                // this won't work
                 Field classesF = ClassLoader.class.getDeclaredField("classes"); // NOI18N
                 classesF.setAccessible(true);
                 @SuppressWarnings("unchecked")
@@ -53,6 +56,7 @@ static void initialize() {
                     }
                 }
             } catch (Exception x) {
+                System.err.println("WARNING: test method ordering disabled");
                 x.printStackTrace();
             }
         }

diff --git a/harness/nbjunit/test/unit/src/org/netbeans/junit/OrderAZTest.java b/harness/nbjunit/test/unit/src/org/netbeans/junit/OrderAZTest.java
@@ -22,6 +22,7 @@
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /** Check the a-z behaviour.
@@ -33,6 +34,8 @@ public class OrderAZTest {
         System.setProperty("NbTestCase.order", "a-z");
     }
 
+    // method order isn't working, see comment in org.netbeans.junit.MethodOrder
+    @Ignore
     @Test public void shuffleTest() throws ClassNotFoundException {
         Class<?> load = Class.forName("org.netbeans.junit.OrderHid");
         TestSuite ts = new TestSuite(load);

diff --git a/harness/nbjunit/test/unit/src/org/netbeans/junit/OrderTest.java b/harness/nbjunit/test/unit/src/org/netbeans/junit/OrderTest.java
@@ -32,7 +32,7 @@ public class OrderTest {
     static {
         System.setProperty("NbTestCase.order", "1314372086210");
     }
-    
+
     @Test public void shuffleTest() throws ClassNotFoundException {
         Class<?> load = Class.forName("org.netbeans.junit.OrderHid");
         TestSuite ts = new TestSuite(load);

diff --git a/harness/nbjunit/test/unit/src/org/netbeans/junit/OrderZATest.java b/harness/nbjunit/test/unit/src/org/netbeans/junit/OrderZATest.java
@@ -22,6 +22,7 @@
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /** Check the z-a behaviour.
@@ -33,6 +34,8 @@ public class OrderZATest {
         System.setProperty("NbTestCase.order", "z-a");
     }
 
+    // method order isn't working, see comment in org.netbeans.junit.MethodOrder
+    @Ignore
     @Test public void shuffleTest() throws ClassNotFoundException {
         Class<?> load = Class.forName("org.netbeans.junit.OrderHid");
         TestSuite ts = new TestSuite(load);

diff --git a/.../completion/JavaCompletionTaskTest/1.8/AutoCompletion_CaseBody_PatternMatchingSwitch.pass b/.../completion/JavaCompletionTaskTest/1.8/AutoCompletion_CaseBody_PatternMatchingSwitch.pass
@@ -115,6 +115,7 @@ Process
 ProcessBuilder
 ProcessHandle
 Readable
+Record
 ReflectiveOperationException
 Runnable
 Runtime

diff --git a/...a/completion/JavaCompletionTaskTest/1.8/AutoCompletion_Guard_PatternMatchingSwitch_1.pass b/...a/completion/JavaCompletionTaskTest/1.8/AutoCompletion_Guard_PatternMatchingSwitch_1.pass
@@ -96,6 +96,7 @@ Process
 ProcessBuilder
 ProcessHandle
 Readable
+Record
 ReflectiveOperationException
 Runnable
 Runtime

diff --git a/java/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java b/java/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java
diff --git a/...ints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertSwitchToRuleSwitchTest.java b/...ints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertSwitchToRuleSwitchTest.java
@@ -60,7 +60,7 @@ public void testSwitch2RuleSwitch() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -91,7 +91,7 @@ public void testLastNotBreak() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -122,7 +122,7 @@ public void testMultipleCases() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -153,7 +153,7 @@ public void testFallThrough() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .assertWarnings();
     }
@@ -173,7 +173,7 @@ public void testMissingLastBreak() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -204,7 +204,7 @@ public void testDefault() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -244,7 +244,7 @@ public void testVariables1() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -284,7 +284,7 @@ public void testFallThroughDefault1() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .assertWarnings();
     }
@@ -304,7 +304,7 @@ public void testFallThroughDefault2() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .assertWarnings();
     }
@@ -326,7 +326,7 @@ public void testTrailingEmptyCase() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -362,7 +362,7 @@ public void testNeedsPreview() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .assertWarnings();
     }
@@ -381,7 +381,7 @@ public void testBreakInside1() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .assertWarnings();
     }
@@ -402,7 +402,7 @@ public void testBreakInside2() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("4:9-4:15:verifier:Convert switch to rule switch")
                 .applyFix()
@@ -437,7 +437,7 @@ public void testContinueInside1() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .assertWarnings();
     }
@@ -460,7 +460,7 @@ public void testContinueInside2() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("5:13-5:19:verifier:Convert switch to rule switch")
                 .applyFix()
@@ -501,7 +501,7 @@ public void testSwitch2SwitchExpression() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -536,7 +536,7 @@ public void testSwitch2SwitchExpressionMultiCase() throws Exception {
                        "        }\n" +
                        "    }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:8-3:14:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -570,7 +570,7 @@ public void testSwitch2SwitchExpressionMultiCase2() throws Exception {
                        "        }\n" +
                        "    }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:8-3:14:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -601,7 +601,7 @@ public void testSwitch2SwitchExpressionOnlyDefault() throws Exception {
                        "        }\n" +
                        "    }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:8-3:14:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -636,7 +636,7 @@ public void testSwitch2SwitchExpressionNestedInnerSwitchExpression() throws Exce
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("4:9-4:15:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -671,7 +671,7 @@ public void testSwitch2SwitchExpressionReturnValue() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("2:9-2:15:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -701,7 +701,7 @@ public void testSwitch2SwitchExpressionTypeCast() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -731,7 +731,7 @@ public void testSwitch2SwitchExpressionTypeCastReturn() throws Exception {
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("2:9-2:15:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -764,7 +764,7 @@ public void testSwitch2SwitchExpressionNestedSwitchExpression() throws Exception
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -806,7 +806,7 @@ public void testSwitch2SwitchExpressionNestedOuterSwitchStatement() throws Excep
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("4:9-4:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -851,7 +851,7 @@ public void testSwitch2SwitchExpressionNestedInnerSwitchStatement() throws Excep
                        "         }\n" +
                        "     }\n" +
                        "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("6:16-6:22:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()
@@ -893,7 +893,7 @@ public void testSwitchToRuleSwitchFormattingMultiple() throws Exception {
                         "         }\n" +
                         "     }\n" +
                         "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -924,7 +924,7 @@ public void testSwitchToRuleSwitchFormattingSimple() throws Exception {
                         "         }\n" +
                         "     }\n" +
                         "}\n")
-                .sourceLevel(SourceVersion.latest().name())
+                .sourceLevel(SourceVersion.latest().ordinal())
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -959,7 +959,7 @@ public void testSwitchToRuleSwitchBindingPattern() throws Exception {
                         "         }\n" +
                         "     }\n" +
                         "}\n")
-                .sourceLevel("21")
+                .sourceLevel(21)
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -994,7 +994,7 @@ public void testSwitchToRuleSwitchGuardedPattern() throws Exception {
                         "         }\n" +
                         "     }\n" +
                         "}\n")
-                .sourceLevel("21")
+                .sourceLevel(21)
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("3:9-3:15:verifier:" + Bundle.ERR_ConvertSwitchToRuleSwitch())
                 .applyFix()
@@ -1030,7 +1030,7 @@ public void testSwitchExpressionGuardedPattern() throws Exception {
                         + "        }\n"
                         + "    }\n"
                         + "}")
-                .sourceLevel("21")
+                .sourceLevel(21)
                 .run(ConvertSwitchToRuleSwitch.class)
                 .findWarning("2:8-2:14:verifier:" + Bundle.ERR_ConvertSwitchToSwitchExpression())
                 .applyFix()