[SQLLINE-142] Add missed '-e' option in '--help' output

Add usage of -e option in tests to skip useless prompt output in logs.
julianhyde · Oct 2, 2018 · 4689fa7 · 4689fa7
1 parent c222391
commit 4689fa7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/sqlline/SqlLine.java b/src/main/java/sqlline/SqlLine.java
@@ -1463,7 +1463,7 @@ public void handleException(Throwable e) {
  error(e.getMessage());
  }
  } else {
- e.printStackTrace(System.err);
+ e.printStackTrace(getErrorStream());
  }
  }
 

diff --git a/src/main/resources/sqlline/SqlLine.properties b/src/main/resources/sqlline/SqlLine.properties
@@ -199,6 +199,7 @@ cmd-usage: Usage: java sqlline.SqlLine \n \
 \ -n <username> the username to connect as\n \
 \ -p <password> the password to connect as\n \
 \ -d <driver class> the driver class to use\n \
+\ -e <command> the command to execute\n \
 \ -nn <nickname> nickname for the connection\n \
 \ -ch <command handler>[,<command handler>]* a custom command handler to use\n \
 \ -f <file> script file to execute (same as --run)\n \

diff --git a/src/test/java/sqlline/SqlLineArgsTest.java b/src/test/java/sqlline/SqlLineArgsTest.java
@@ -807,6 +807,7 @@ public void testCommandHandlerOnStartup() throws IOException {
  sqlLine.setErrorStream(sqllineOutputStream);
  final InputStream is = new ByteArrayInputStream(new byte[0]);
  final String[] args = {
+ "-e", "!set maxwidth 80",
  "-ch", "sqlline.extensions.HelloWorldCommandHandler"};
  sqlLine.begin(args, is, false);
 
@@ -838,7 +839,8 @@ public void testCommandHandler() throws IOException {
  sqlLine.setOutputStream(sqllineOutputStream);
  sqlLine.setErrorStream(sqllineOutputStream);
  final InputStream is = new ByteArrayInputStream(new byte[0]);
- SqlLine.Status status = sqlLine.begin(new String[]{}, is, false);
+ SqlLine.Status status =
+ sqlLine.begin(new String[]{"-e", "!set maxwidth 80"}, is, false);
 
  final String script = "!commandhandler"
  + " sqlline.extensions.HelloWorld2CommandHandler"
@@ -1067,7 +1069,8 @@ public void testConnectWithDbPropertyAsParameter() throws Throwable {
  beeLine.setOutputStream(beelineOutputStream);
  beeLine.setErrorStream(beelineOutputStream);
  final InputStream is = new ByteArrayInputStream(new byte[0]);
- SqlLine.Status status = beeLine.begin(new String[]{}, is, false);
+ SqlLine.Status status =
+ beeLine.begin(new String[]{"-e", "!set maxwidth 80"}, is, false);
  assertThat(status, equalTo(SqlLine.Status.OK));
  DispatchCallback dc = new DispatchCallback();
  beeLine.runCommands(Collections.singletonList("!set maxwidth 80"), dc);
@@ -1107,7 +1110,8 @@ public void testConnectWithDbPropertyAsParameter2() throws Throwable {
  beeLine.setOutputStream(beelineOutputStream);
  beeLine.setErrorStream(beelineOutputStream);
  final InputStream is = new ByteArrayInputStream(new byte[0]);
- SqlLine.Status status = beeLine.begin(new String[]{}, is, false);
+ SqlLine.Status status =
+ beeLine.begin(new String[]{"-e", "!set maxwidth 80"}, is, false);
  assertThat(status, equalTo(SqlLine.Status.OK));
  DispatchCallback dc = new DispatchCallback();
  beeLine.runCommands(Collections.singletonList("!set maxwidth 80"), dc);
@@ -1144,7 +1148,8 @@ public void testConnectWithDbProperty() throws Throwable {
  beeLine.setOutputStream(beelineOutputStream);
  beeLine.setErrorStream(beelineOutputStream);
  final InputStream is = new ByteArrayInputStream(new byte[0]);
- SqlLine.Status status = beeLine.begin(new String[]{}, is, false);
+ SqlLine.Status status =
+ beeLine.begin(new String[]{"-e", "!set maxwidth 80"}, is, false);
  assertThat(status, equalTo(SqlLine.Status.OK));
  DispatchCallback dc = new DispatchCallback();
  beeLine.runCommands(Collections.singletonList("!set maxwidth 80"), dc);
@@ -1341,15 +1346,16 @@ public void testAppInfoMessage() throws Throwable {
  assertThat(pair.output,
  containsString(Application.DEFAULT_APP_INFO_MESSAGE));
 
- String[] args = {"-ac", "INCORRECT_CLASS_NAME"};
+ String[] args = {"-e", "!set maxwidth 80", "-ac", "INCORRECT_CLASS_NAME"};
  pair = run(args);
  assertThat(pair.status, equalTo(SqlLine.Status.OK));
  assertThat(pair.output,
  containsString("Could not initialize INCORRECT_CLASS_NAME"));
  assertThat(pair.output,
  containsString(CustomApplication.DEFAULT_APP_INFO_MESSAGE));
 
- String[] args2 = {"-ac", "sqlline.extensions.CustomApplication"};
+ String[] args2 = {"-e", "!set maxwidth 80",
+ "-ac", "sqlline.extensions.CustomApplication"};
  pair = run(args2);
  assertThat(pair.status, equalTo(SqlLine.Status.OK));
  assertThat(pair.output,