test/langtools/jdk/jshell/StartOptionTest.java

rev 48495 : 8189102: All tools should support -?, -h and --help
Reviewed-by: kvn, jjg, weijun, alanb, rfield, ksrini

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2017, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2018, 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.
*** 212,222 ****
                  "--no-startup", fn, "-s");
      }
  
      // Test that the usage message is printed
      public void testUsage() {
!         for (String opt : new String[]{"-h", "--help"}) {
              startCo(s -> {
                  assertTrue(s.split("\n").length >= 7, "Not enough usage lines: " + s);
                  assertTrue(s.startsWith("Usage:   jshell <option>..."), "Unexpect usage start: " + s);
                  assertTrue(s.contains("--show-version"), "Expected help: " + s);
                  assertFalse(s.contains("Welcome"), "Unexpected start: " + s);
--- 212,222 ----
                  "--no-startup", fn, "-s");
      }
  
      // Test that the usage message is printed
      public void testUsage() {
!         for (String opt : new String[]{"-?", "-h", "--help"}) {
              startCo(s -> {
                  assertTrue(s.split("\n").length >= 7, "Not enough usage lines: " + s);
                  assertTrue(s.startsWith("Usage:   jshell <option>..."), "Unexpect usage start: " + s);
                  assertTrue(s.contains("--show-version"), "Expected help: " + s);
                  assertFalse(s.contains("Welcome"), "Unexpected start: " + s);