jdk-sandbox: comparison langtools/test/jdk/jshell/ToolReloadTest.java

equal deleted inserted replaced

-:c84d0cce090e
+:9c137b83a8b8
 */
 /*
 * @test
 * @key intermittent
-* @bug 8081845 8147898
+* @bug 8081845 8147898 8143955
 * @summary Tests for /reload in JShell tool
 * @modules jdk.compiler/com.sun.tools.javac.api
 *          jdk.compiler/com.sun.tools.javac.main
 *          jdk.jdeps/com.sun.tools.javap
 *          jdk.jshell/jdk.internal.jshell.tool
 Path outDir = Paths.get("testClasspathDirectory");
 compiler.compile(outDir, prog.apply("A"));
 Path classpath = compiler.getPath(outDir);
 test(
 (a) -> assertCommand(a, "/classpath " + classpath,
-String.format("|  Path '%s' added to classpath\n", classpath)),
+String.format("|  Path '%s' added to classpath", classpath)),
 (a) -> assertMethod(a, "String foo() { return (new pkg.A()).toString(); }",
 "()String", "foo"),
 (a) -> assertVariable(a, "String", "v", "foo()", "\"A\""),
 (a) -> {
 if (!a) compiler.compile(outDir, prog.apply("Aprime"));
 "|  Restarting and restoring state.\n" +
 "-: /classpath " + classpath + "\n" +
 "-: String foo() { return (new pkg.A()).toString(); }\n" +
 "-: String v = foo();\n");
 },
-(a) -> assertCommand(a, "v", "|  Variable v of type String has value \"Aprime\"\n"),
+(a) -> assertCommand(a, "v", "v ==> \"Aprime\""),
 (a) -> evaluateExpression(a, "String", "foo()", "\"Aprime\""),
-(a) -> evaluateExpression(a, "pkg.A", "new pkg.A();", "\"Aprime\"")
+(a) -> evaluateExpression(a, "pkg.A", "new pkg.A();", "Aprime")
 );
 }
 public void testReloadDrop() {
 test(false, new String[]{"-nostartup"},
 a -> assertVariable(a, "int", "a"),
-a -> dropVariable(a, "/dr 1", "int a = 0", "|  Dropped variable a\n"),
+a -> dropVariable(a, "/dr 1", "int a = 0", "|  dropped variable a"),
 a -> assertMethod(a, "int b() { return 0; }", "()I", "b"),
-a -> dropMethod(a, "/drop b", "b ()I", "|  Dropped method b()\n"),
+a -> dropMethod(a, "/drop b", "b ()I", "|  dropped method b()"),
 a -> assertClass(a, "class A {}", "class", "A"),
-a -> dropClass(a, "/dr A", "class A", "|  Dropped class A\n"),
+a -> dropClass(a, "/dr A", "class A", "|  dropped class A"),
 a -> assertCommand(a, "/reload",
 "|  Restarting and restoring state.\n" +
 "-: int a;\n" +
 "-: /drop 1\n" +
 "-: int b() { return 0; }\n" +
 }
 public void testReloadQuiet() {
 test(false, new String[]{"-nostartup"},
 a -> assertVariable(a, "int", "a"),
-a -> dropVariable(a, "/dr 1", "int a = 0", "|  Dropped variable a\n"),
+a -> dropVariable(a, "/dr 1", "int a = 0", "|  dropped variable a"),
 a -> assertMethod(a, "int b() { return 0; }", "()I", "b"),
-a -> dropMethod(a, "/drop b", "b ()I", "|  Dropped method b()\n"),
+a -> dropMethod(a, "/drop b", "b ()I", "|  dropped method b()"),
 a -> assertClass(a, "class A {}", "class", "A"),
-a -> dropClass(a, "/dr A", "class A", "|  Dropped class A\n"),
+a -> dropClass(a, "/dr A", "class A", "|  dropped class A"),
 a -> assertCommand(a, "/reload quiet",
-"|  Restarting and restoring state.\n"),
+"|  Restarting and restoring state."),
 a -> assertCommandCheckOutput(a, "/vars", assertVariables()),
 a -> assertCommandCheckOutput(a, "/methods", assertMethods()),
 a -> assertCommandCheckOutput(a, "/classes", assertClasses()),
 a -> assertCommandCheckOutput(a, "/imports", assertImports())
 );
 "-: ++c\n" +
 "-: ++c\n" +
 "-: ++c\n" +
 "-: ++c\n"
 ),
-(a) -> assertCommand(a, "c", "|  Variable c of type int has value 11\n"),
+(a) -> assertCommand(a, "c", "c ==> 11"),
-(a) -> assertCommand(a, "$4", "|  Variable $4 of type int has value 10\n")
+(a) -> assertCommand(a, "$4", "$4 ==> 10")
 );
 }
 public void testReloadIgnore() {
 test(false, new String[]{"-nostartup"},
 (a) -> assertCommand(a, "/history", null),
 (a) -> assertCommand(a, "/help", null),
 (a) -> assertCommand(a, "/vars", null),
 (a) -> assertCommand(a, "/save abcd", null),
 (a) -> assertCommand(a, "/reload",
-"|  Restarting and restoring state.\n")
+"|  Restarting and restoring state.")
 );
 }
 public void testReloadResetRestore() {
 test(
 (a) -> assertVariable(a, "int", "x", "5", "5"),
 (a) -> assertMethod(a, "int m(int z) { return z * z; }",
 "(int)int", "m"),
 (a) -> evaluateExpression(a, "int", "m(x)", "25"),
-(a) -> assertCommand(a, "/reset", "|  Resetting state.\n"),
+(a) -> assertCommand(a, "/reset", "|  Resetting state."),
 (a) -> assertCommand(a, "/reload restore",
 "|  Restarting and restoring from previous state.\n" +
 "-: int x = 5;\n" +
 "-: int m(int z) { return z * z; }\n" +
 "-: m(x)\n"),
 (a) -> assertMethod(a, "int m(int z) { return z * z; }",
 "(int)int", "m"),
 (a) -> evaluateExpression(a, "int", "m(x)", "25"),
 (a) -> assertCommand(a, "System.exit(1);",
 "|  State engine terminated.\n" +
-"|  Restore definitions with: /reload restore\n"),
+"|  Restore definitions with: /reload restore"),
 (a) -> assertCommand(a, "/reload restore",
 "|  Restarting and restoring from previous state.\n" +
 "-: int x = 5;\n" +
 "-: int m(int z) { return z * z; }\n" +
 "-: m(x)\n"),

changeset 37389	9c137b83a8b8
parent 36990	ec0b843a7af5
child 38514	f7df9ab653b0