Mercurial > hg > release > thermostat-1.4

changeset 1525:84fbf4af48e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix integration tests to expect --help This patch fixes an integration test and three unit tests that were broken with patch 280587a7c6c2 Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2014-October/011249.html
author Lukasz Dracz <ldracz@redhat.com>
date Mon, 20 Oct 2014 15:50:43 -0400
parents 280587a7c6c2
children 1c6b65679463
files integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/CliTest.java launcher/src/test/java/com/redhat/thermostat/launcher/internal/LauncherImplTest.java
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/CliTest.java	Mon Oct 20 13:22:54 2014 -0400
+++ b/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/CliTest.java	Mon Oct 20 15:50:43 2014 -0400
@@ -216,7 +216,8 @@
                            + "usage: thermostat shell\n"
                            + "                  launches the Thermostat interactive shell\n"
                            + "\n"
-                           + "thermostat shell\n\n";
+                           + "thermostat shell\n"
+                           + "     --help    show usage of command\n";
         assertEquals(expectedOut, stdOut);
     }
 
--- a/launcher/src/test/java/com/redhat/thermostat/launcher/internal/LauncherImplTest.java	Mon Oct 20 13:22:54 2014 -0400
+++ b/launcher/src/test/java/com/redhat/thermostat/launcher/internal/LauncherImplTest.java	Mon Oct 20 15:50:43 2014 -0400
@@ -380,6 +380,7 @@
                 + "thermostat test1\n"
                 + "     --arg1 <arg>\n"
                 + "     --arg2 <arg>\n"
+                + "     --help              show usage of command\n"
                 + "  -l,--logLevel <arg>\n";
         runAndVerifyCommand(new String[] {"test1", "--arg1", "arg1value", "--argNotAccepted"}, expected, false);
     }
@@ -393,6 +394,7 @@
                 + "thermostat test1\n"
                 + "     --arg1 <arg>\n"
                 + "     --arg2 <arg>\n"
+                + "     --help              show usage of command\n"
                 + "  -l,--logLevel <arg>\n";
         runAndVerifyCommand(new String[] {"test1"}, expected, false);
     }
@@ -412,6 +414,7 @@
                 + "thermostat test1\n"
                 + "     --arg1 <arg>\n"
                 + "     --arg2 <arg>\n"
+                + "     --help              show usage of command\n"
                 + "  -l,--logLevel <arg>\n";
         runAndVerifyCommand(new String[] {"test1", "--arg1"}, expected, false);
     }