8365776: Convert JShell tests to use JUnit instead of TestNG

Reviewed-by: mdoerr
Backport-of: b0ca9bf

Author: GoeLin

test/langtools/jdk/jshell/AbstractStopExecutionTest.java

@@ -26,7 +26,7 @@
 
 import jdk.jshell.JShell;
 
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class AbstractStopExecutionTest extends KullaTesting {
 

test/langtools/jdk/jshell/AnalysisTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,14 @@
  * @test
  * @summary Test SourceCodeAnalysis
  * @build KullaTesting TestingInputStream
- * @run testng AnalysisTest
+ * @run junit AnalysisTest
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-@Test
 public class AnalysisTest extends KullaTesting {
 
+    @Test
     public void testSource() {
         assertAnalyze("int x=3//test", "int x=3;//test", "", true);
         assertAnalyze("int x=3 ;//test", "int x=3 ;//test", "", true);
@@ -41,6 +41,7 @@ public void testSource() {
         assertAnalyze("int ff; int v // hi", "int ff;", " int v // hi", true);
     }
 
+    @Test
     public void testSourceSlashStar() {
         assertAnalyze("/*zoo*/int x=3 /*test*/", "/*zoo*/int x=3; /*test*/", "", true);
         assertAnalyze("/*zoo*/int x=3 ;/*test*/", "/*zoo*/int x=3 ;/*test*/", "", true);
@@ -49,11 +50,13 @@ public void testSourceSlashStar() {
         assertAnalyze("int ff; int v /*hgjghj*/", "int ff;", " int v /*hgjghj*/", true);
     }
 
+    @Test
     public void testIncomplete() {
         assertAnalyze("void m() { //erer", null, "void m() { //erer\n", false);
         assertAnalyze("int m=//", null, "int m=//\n", false);
     }
 
+    @Test
     public void testExpression() {
         assertAnalyze("45//test", "45//test", "", true);
         assertAnalyze("45;//test", "45;//test", "", true);

test/langtools/jdk/jshell/AnalyzeSnippetTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8182270 8341176
  * @summary test non-eval Snippet analysis
  * @build KullaTesting TestingInputStream
- * @run testng AnalyzeSnippetTest
+ * @run junit AnalyzeSnippetTest
  */
 
 import java.io.ByteArrayOutputStream;
@@ -36,15 +36,12 @@
 import jdk.jshell.Snippet;
 import jdk.jshell.DeclarationSnippet;
 import jdk.jshell.Diag;
-import org.testng.annotations.Test;
 
 import jdk.jshell.JShell;
 import jdk.jshell.MethodSnippet;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertEquals;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import jdk.jshell.ErroneousSnippet;
 import jdk.jshell.ExpressionSnippet;
 import jdk.jshell.ImportSnippet;
@@ -55,14 +52,16 @@
 import jdk.jshell.VarSnippet;
 import static jdk.jshell.Snippet.SubKind.*;
 import jdk.jshell.SourceCodeAnalysis.SnippetWrapper;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-@Test
 public class AnalyzeSnippetTest {
 
     JShell state;
     SourceCodeAnalysis sca;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         state = JShell.builder()
                 .out(new PrintStream(new ByteArrayOutputStream()))
@@ -72,7 +71,7 @@ public void setUp() {
         sca = state.sourceCodeAnalysis();
     }
 
-    @AfterMethod
+    @AfterEach
     public void tearDown() {
         if (state != null) {
             state.close();
@@ -81,69 +80,77 @@ public void tearDown() {
         sca = null;
     }
 
+    @Test
     public void testImport() {
         ImportSnippet sn = (ImportSnippet) assertSnippet("import java.util.List;",
                 SubKind.SINGLE_TYPE_IMPORT_SUBKIND);
-        assertEquals(sn.name(), "List");
+        assertEquals("List", sn.name());
         sn = (ImportSnippet) assertSnippet("import static java.nio.file.StandardOpenOption.CREATE;",
                 SubKind.SINGLE_STATIC_IMPORT_SUBKIND);
         assertTrue(sn.isStatic());
     }
 
+    @Test
     public void testClass() {
         TypeDeclSnippet sn = (TypeDeclSnippet) assertSnippet("class C {}",
                 SubKind.CLASS_SUBKIND);
-        assertEquals(sn.name(), "C");
+        assertEquals("C", sn.name());
         sn = (TypeDeclSnippet) assertSnippet("enum EE {A, B , C}",
                 SubKind.ENUM_SUBKIND);
     }
 
+    @Test
     public void testMethod() {
         MethodSnippet sn = (MethodSnippet) assertSnippet("int m(int x) { return x + x; }",
                 SubKind.METHOD_SUBKIND);
-        assertEquals(sn.name(), "m");
-        assertEquals(sn.signature(), "(int)int");
+        assertEquals("m", sn.name());
+        assertEquals("(int)int", sn.signature());
     }
 
+    @Test
     public void testVar() {
         VarSnippet sn = (VarSnippet) assertSnippet("int i;",
                 SubKind.VAR_DECLARATION_SUBKIND);
-        assertEquals(sn.name(), "i");
-        assertEquals(sn.typeName(), "int");
+        assertEquals("i", sn.name());
+        assertEquals("int", sn.typeName());
         sn = (VarSnippet) assertSnippet("int jj = 6;",
                 SubKind.VAR_DECLARATION_WITH_INITIALIZER_SUBKIND);
         sn = (VarSnippet) assertSnippet("2 + 2",
                 SubKind.TEMP_VAR_EXPRESSION_SUBKIND);
     }
 
+    @Test
     public void testExpression() {
         state.eval("int aa = 10;");
         ExpressionSnippet sn = (ExpressionSnippet) assertSnippet("aa",
                 SubKind.VAR_VALUE_SUBKIND);
-        assertEquals(sn.name(), "aa");
-        assertEquals(sn.typeName(), "int");
+        assertEquals("aa", sn.name());
+        assertEquals("int", sn.typeName());
         sn = (ExpressionSnippet) assertSnippet("aa;",
                 SubKind.VAR_VALUE_SUBKIND);
-        assertEquals(sn.name(), "aa");
-        assertEquals(sn.typeName(), "int");
+        assertEquals("aa", sn.name());
+        assertEquals("int", sn.typeName());
         sn = (ExpressionSnippet) assertSnippet("aa = 99",
                 SubKind.ASSIGNMENT_SUBKIND);
     }
 
+    @Test
     public void testStatement() {
         StatementSnippet sn = (StatementSnippet) assertSnippet("System.out.println(33)",
                 SubKind.STATEMENT_SUBKIND);
         sn = (StatementSnippet) assertSnippet("if (true) System.out.println(33);",
                 SubKind.STATEMENT_SUBKIND);
     }
 
+    @Test
     public void testErroneous() {
         ErroneousSnippet sn = (ErroneousSnippet) assertSnippet("+++",
                 SubKind.UNKNOWN_SUBKIND);
         sn = (ErroneousSnippet) assertSnippet("abc",
                 SubKind.UNKNOWN_SUBKIND);
     }
 
+    @Test
     public void testDiagnosticsForSourceSnippet() {
         Snippet sn;
         sn = assertSnippet("unknown()", UNKNOWN_SUBKIND);
@@ -164,45 +171,47 @@ public void testDiagnosticsForSourceSnippet() {
         assertDiagnostics(sn, "7-22:compiler.err.doesnt.exist");
     }
 
+    @Test
     public void testSnippetWrapper() {
         SourceCodeAnalysis analysis = state.sourceCodeAnalysis();
         Snippet sn;
         String code = "unknown()";
         sn = assertSnippet(code, UNKNOWN_SUBKIND);
         SnippetWrapper wrapper = analysis.wrapper(sn);
         String wrapped = wrapper.wrapped();
-        assertEquals(wrapped, """
-                              package REPL;
-
-                              class $JShell$DOESNOTMATTER {
-                                  public static java.lang.Object do_it$() throws java.lang.Throwable {
-                                      return unknown();
-                                  }
-                              }
-                              """);
+        assertEquals("""
+                     package REPL;
+
+                     class $JShell$DOESNOTMATTER {
+                         public static java.lang.Object do_it$() throws java.lang.Throwable {
+                             return unknown();
+                         }
+                     }
+                     """, wrapped);
         for (int pos = 0; pos < code.length(); pos++) {
             int wrappedPos = wrapper.sourceToWrappedPosition(pos);
-            assertEquals(wrapped.charAt(wrappedPos), code.charAt(pos));
-            assertEquals(wrapper.wrappedToSourcePosition(wrappedPos), pos);
+            assertEquals(code.charAt(pos), wrapped.charAt(wrappedPos));
+            assertEquals(pos, wrapper.wrappedToSourcePosition(wrappedPos));
         }
     }
 
+    @Test
     public void testNoStateChange() {
         assertSnippet("int a = 5;", SubKind.VAR_DECLARATION_WITH_INITIALIZER_SUBKIND);
         assertSnippet("a", SubKind.UNKNOWN_SUBKIND);
         VarSnippet vsn = (VarSnippet) state.eval("int aa = 10;").get(0).snippet();
         assertSnippet("++aa;", SubKind.TEMP_VAR_EXPRESSION_SUBKIND);
-        assertEquals(state.varValue(vsn), "10");
+        assertEquals("10", state.varValue(vsn));
         assertSnippet("class CC {}", SubKind.CLASS_SUBKIND);
         assertSnippet("new CC();", SubKind.UNKNOWN_SUBKIND);
     }
 
     private Snippet assertSnippet(String input, SubKind sk) {
         List<Snippet> sns = sca.sourceToSnippets(input);
-        assertEquals(sns.size(), 1, "snippet count");
+        assertEquals(1, sns.size(), "snippet count");
         Snippet sn = sns.get(0);
-        assertEquals(sn.id(), "*UNASSOCIATED*");
-        assertEquals(sn.subKind(), sk);
+        assertEquals("*UNASSOCIATED*", sn.id());
+        assertEquals(sk, sn.subKind());
         return sn;
     }
 
@@ -213,6 +222,6 @@ private String diagToString(Diag d) {
     private void assertDiagnostics(Snippet s, String... expectedDiags) {
         List<String> actual = state.diagnostics(s).map(this::diagToString).toList();
         List<String> expected = List.of(expectedDiags);
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 }

test/langtools/jdk/jshell/BadExecutionControlSpecTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.javap
  *          jdk.jshell/jdk.internal.jshell.tool
- * @run testng BadExecutionControlSpecTest
+ * @run junit BadExecutionControlSpecTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -38,12 +38,11 @@
 import java.io.PrintStream;
 import java.util.Collections;
 import java.util.List;
-import org.testng.annotations.Test;
 import jdk.jshell.spi.ExecutionControl;
 import jdk.jshell.spi.ExecutionEnv;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
-@Test
 public class BadExecutionControlSpecTest {
     private static void assertIllegal(String spec) throws Throwable {
         try {
@@ -80,13 +79,15 @@ public void closeDown() {
         }
     }
 
+    @Test
     public void syntaxTest() throws Throwable {
         assertIllegal(":launch(true)");
         assertIllegal("jdi:launch(true");
         assertIllegal("jdi:launch(true)$");
         assertIllegal("jdi:,");
     }
 
+    @Test
     public void notFoundTest() throws Throwable {
         assertIllegal("fruitbats");
         assertIllegal("jdi:baz(true)");