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

equal deleted inserted replaced

-:1e87cd35c980
+:4175f47b2a50
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 * questions.
 */
 /*
 * @test
-* @bug 8143037 8142447 8144095 8140265 8144906 8146138 8147887 8147886
+* @bug 8143037 8142447 8144095 8140265 8144906 8146138 8147887 8147886 8148316 8148317
 * @requires os.family != "solaris"
 * @summary Tests for Basic tests for REPL tool
 * @library /tools/lib
 * @ignore 8139873
 * @build KullaTesting TestingInputStream ToolBox Compiler
 );
 }
 public void elideStartUpFromList() {
 test(
-(a) -> assertCommandCheckOutput(a, "123", (s) ->
+(a) -> assertCommandOutputContains(a, "123", "type int"),
-assertTrue(s.contains("type int"), s)),
 (a) -> assertCommandCheckOutput(a, "/list", (s) -> {
 int cnt;
 try (Scanner scanner = new Scanner(s)) {
 cnt = 0;
 while (scanner.hasNextLine()) {
 public void elideStartUpFromSave() throws IOException {
 Compiler compiler = new Compiler();
 Path path = compiler.getPath("myfile");
 test(
-(a) -> assertCommandCheckOutput(a, "123",
+(a) -> assertCommandOutputContains(a, "123", "type int"),
-(s) -> assertTrue(s.contains("type int"), s)),
 (a) -> assertCommand(a, "/save " + path.toString(), "")
 );
 try (Stream<String> lines = Files.lines(path)) {
 assertEquals(lines.count(), 1, "Expected only one saved line");
 }
 (a) -> assertVariable(a, "int", "a"),
 (a) -> assertVariable(a, "double", "b", "10", "10.0"),
 (a) -> assertMethod(a, "void f() {}", "()V", "f"),
 (a) -> assertImport(a, "import java.util.stream.*;", "", "java.util.stream.*"),
 (a) -> assertCommand(a, "/save " + startUpFile.toString(), null),
-(a) -> assertCommand(a, "/setstart " + startUpFile.toString(), null)
+(a) -> assertCommand(a, "/set start " + startUpFile.toString(), null)
 );
 Path unknown = compiler.getPath("UNKNOWN");
 test(
-(a) -> assertCommand(a, "/setstart " + unknown.toString(),
+(a) -> assertCommand(a, "/set start " + unknown.toString(),
-"|  File '" + unknown + "' for /setstart is not found.\n")
+"|  File '" + unknown + "' for /set start is not found.\n")
 );
 test(false, new String[0],
 (a) -> {
 loadVariable(a, "int", "a");
 loadVariable(a, "double", "b", "10.0", "10.0");
 removeStartup();
 }
 }
 private void removeStartup() {
-Preferences preferences = Preferences.userRoot().node("tool/REPL");
+Preferences preferences = Preferences.userRoot().node("tool/JShell");
 if (preferences != null) {
 preferences.remove("STARTUP");
 }
 }
 public void testEmptyClassPath() {
 test(after -> assertCommand(after, "/classpath", "|  /classpath requires a path argument\n"));
 }
 public void testNoArgument() {
-String[] commands = {"/save", "/open", "/setstart"};
+String[] commands = {"/save", "/open", "/set start"};
 test(Stream.of(commands)
 .map(cmd -> {
 String c = cmd;
 final String finalC = c;
 return (ReplTest) after -> assertCommand(after, cmd,
 public void testRemoteExit() {
 test(
 a -> assertVariable(a, "int", "x"),
 a -> assertCommandCheckOutput(a, "/vars", assertVariables()),
-a -> assertCommandCheckOutput(a, "System.exit(5);",  s ->
+a -> assertCommandOutputContains(a, "System.exit(5);", "terminated"),
-assertTrue(s.contains("terminated"), s)),
 a -> assertCommandCheckOutput(a, "/vars", s ->
 assertTrue(s.trim().isEmpty(), s)),
 a -> assertMethod(a, "void f() { }", "()void", "f"),
 a -> assertCommandCheckOutput(a, "/methods", assertMethods())
 );
 s -> checkLineToList(s, START_UP)),
 a -> assertCommandCheckOutput(a, "/list " + arg,
 s -> assertEquals(s, "|  No definition or id named " + arg +
 " found.  There are no active definitions.\n")),
 a -> assertVariable(a, "int", "aardvark"),
-a -> assertCommandCheckOutput(a, "/list aardvark",
+a -> assertCommandOutputContains(a, "/list aardvark", "aardvark"),
-s -> assertTrue(s.contains("aardvark"))),
 a -> assertCommandCheckOutput(a, "/list start",
 s -> checkLineToList(s, START_UP)),
 a -> assertCommandCheckOutput(a, "/list all",
 s -> checkLineToList(s, startVarList)),
 a -> assertCommandCheckOutput(a, "/list printf",
 " found.  Try /list without arguments.\n"))
 );
 }
 public void testFeedbackNegative() {
-test(a -> assertCommandCheckOutput(a, "/feedback aaaa",
+test(a -> assertCommandCheckOutput(a, "/set feedback aaaa",
-assertStartsWith("|  Follow /feedback with of the following")));
+assertStartsWith("|  Does not match any current feedback mode")));
 }
 public void testFeedbackOff() {
 for (String off : new String[]{"o", "off"}) {
 test(
-a -> assertCommand(a, "/feedback " + off, ""),
+a -> assertCommand(a, "/set feedback " + off, ""),
 a -> assertCommand(a, "int a", ""),
 a -> assertCommand(a, "void f() {}", ""),
 a -> assertCommandCheckOutput(a, "aaaa", assertStartsWith("|  Error:")),
 a -> assertCommandCheckOutput(a, "public void f() {}", assertStartsWith("|  Warning:"))
-);
-}
-}
-public void testFeedbackConcise() {
-Compiler compiler = new Compiler();
-Path testConciseFile = compiler.getPath("testConciseFeedback");
-String[] sources = new String[] {"int a", "void f() {}", "class A {}", "a = 10"};
-compiler.writeToFile(testConciseFile, sources);
-for (String concise : new String[]{"c", "concise"}) {
-test(
-a -> assertCommand(a, "/feedback " + concise, ""),
-a -> assertCommand(a, sources[0], ""),
-a -> assertCommand(a, sources[1], ""),
-a -> assertCommand(a, sources[2], ""),
-a -> assertCommand(a, sources[3], "|  a : 10\n"),
-a -> assertCommand(a, "/o " + testConciseFile.toString(), "|  a : 10\n")
 );
 }
 }
 public void testFeedbackNormal() {
 "|  Added method f()\n",
 "|  Added class A\n",
 "|  Variable a has been assigned the value 10\n"
 };
 compiler.writeToFile(testNormalFile, sources2);
-for (String feedback : new String[]{"/f", "/feedback"}) {
+for (String feedback : new String[]{"/set f", "/set feedback"}) {
-for (String feedbackState : new String[]{"n", "normal", "v", "verbose"}) {
+for (String feedbackState : new String[]{"n", "normal", "o", "off"}) {
-String f = null;
-if (feedbackState.startsWith("n")) {
-f = "normal";
-} else if (feedbackState.startsWith("v")) {
-f = "verbose";
-}
-final String finalF = f;
 test(
-a -> assertCommand(a, feedback + " " + feedbackState, "|  Feedback mode: " + finalF +"\n"),
+a -> assertCommand(a, feedback + " " + feedbackState, "|  Feedback mode: normal\n"),
 a -> assertCommand(a, sources[0], output[0]),
 a -> assertCommand(a, sources[1], output[1]),
 a -> assertCommand(a, sources[2], output[2]),
 a -> assertCommand(a, sources[3], output[3]),
-a -> assertCommand(a, "/o " + testNormalFile.toString(),
+a -> assertCommand(a, "/o " + testNormalFile.toString(), "")
-"|  Modified variable a of type int\n" +
-"|  Modified method f()\n" +
-"|    Update overwrote method f()\n" +
-"|  Modified class A\n" +
-"|    Update overwrote class A\n" +
-"|  Variable a has been assigned the value 10\n")
 );
 }
-}
-}
-public void testFeedbackDefault() {
-Compiler compiler = new Compiler();
-Path testDefaultFile = compiler.getPath("testDefaultFeedback");
-String[] sources = new String[] {"int a", "void f() {}", "class A {}", "a = 10"};
-String[] output = new String[] {
-"|  Added variable a of type int\n",
-"|  Added method f()\n",
-"|  Added class A\n",
-"|  Variable a has been assigned the value 10\n"
-};
-compiler.writeToFile(testDefaultFile, sources);
-for (String defaultFeedback : new String[]{"", "d", "default"}) {
-test(
-a -> assertCommand(a, "/feedback o", ""),
-a -> assertCommand(a, "int x", ""),
-a -> assertCommand(a, "/feedback " + defaultFeedback, "|  Feedback mode: default\n"),
-a -> assertCommand(a, sources[0], output[0]),
-a -> assertCommand(a, sources[1], output[1]),
-a -> assertCommand(a, sources[2], output[2]),
-a -> assertCommand(a, sources[3], output[3]),
-a -> assertCommand(a, "/o " + testDefaultFile.toString(), "")
-);
 }
 }
 public void testDrop() {
 test(false, new String[]{"-nostartup"},
 }
 }
 public void testCommandPrefix() {
 test(a -> assertCommandCheckOutput(a, "/s",
-assertStartsWith("|  Command: /s is ambiguous: /seteditor, /save, /setstart")),
+assertStartsWith("|  Command: /s is ambiguous: /save, /set")),
 a -> assertCommand(a, "int var", "|  Added variable var of type int\n"),
 a -> assertCommandCheckOutput(a, "/va",
 assertStartsWith("|    int var = 0")),
 a -> assertCommandCheckOutput(a, "/save",
 assertStartsWith("|  The /save command requires a filename argument.")));

changeset 36494	4175f47b2a50
parent 35812	6a6ca0bd3c14
child 36718	bf40906bf49d