Mercurial > hg > release > thermostat-0.5
view distribution/src/test/java/com/redhat/thermostat/distribution/CliTest.java @ 915:0f4271d4e334
Change common options implementation.
This patch removes the old CommonCommandOptions class. Common options - dbUrl,
logLevel, username, password - are now automatically added if the "options"
list in command.properties contains "special" option names such as
AUTO_DB_OPTIONS (dbUrl, username, password) and AUTO_LOG_OPTION (logLevel). If
these are present thermostat adds options as requested automatically. Note that
all automatic options are optional. The required property can be
changed/overridden by using a <option-name>.required key in command.properties
and adding <option-name> to the "options" list AFTER the AUTO_* option.
I've also cleaned up the command.properties files and help command output.
command.properties don't need to maintain "thermostat" any longer. Moreover,
help output contains the description of the command as well. Example:
$ ./distribution/target/bin/thermostat help agent
usage: thermostat agent [-d <url> [-u <user> -p <password>]] [-s] [--debug] [-l
<level>]
starts and stops the thermostat agent
thermostat agent
-d,--dbUrl <dbUrl> connect to the given URL
-l,--logLevel <logLevel> sets the log level for this invocation. Possible
values for <level> in decreasing severity are:
SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST
and OFF.
-p,--password <password> the password to use for authentication
-s,--saveOnExit save the data on exit
-u,--username <username> the username to use for authentication
-v,--debug launch with debug console enabled
Finally, this should be the last patch required in order to drop the
storage-core dependency of common-core, since it removes the need for
client-cli to depend on the launcher bundle.
It fixes PR1200 too.
Reviewed-by: ebaron, vanaltj
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-January/005118.html
author | Severin Gehwolf <sgehwolf@redhat.com> |
---|---|
date | Fri, 11 Jan 2013 19:23:03 +0100 |
parents | 72638d2844fa |
children | ccac9bcabaa0 |
line wrap: on
line source
/* * Copyright 2012 Red Hat, Inc. * * This file is part of Thermostat. * * Thermostat is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2, or (at your * option) any later version. * * Thermostat is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Thermostat; see the file COPYING. If not see * <http://www.gnu.org/licenses/>. * * Linking this code with other modules is making a combined work * based on this code. Thus, the terms and conditions of the GNU * General Public License cover the whole combination. * * As a special exception, the copyright holders of this code give * you permission to link this code with independent modules to * produce an executable, regardless of the license terms of these * independent modules, and to copy and distribute the resulting * executable under terms of your choice, provided that you also * meet, for each linked independent module, the terms and conditions * of the license of that module. An independent module is a module * which is not derived from or based on this code. If you modify * this code, you may extend this exception to your version of the * library, but you are not obligated to do so. If you do not wish * to do so, delete this exception statement from your version. */ package com.redhat.thermostat.distribution; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.IOException; import org.junit.Ignore; import org.junit.Test; import expectj.Spawn; import expectj.TimeoutException; /** * Integration tests to exercise the basics of the thermostat command line. */ public class CliTest extends IntegrationTest { @Test public void testExpectIsSane() throws Exception { Spawn shell = spawnThermostat(); try { shell.expect("some-random-text-that-is-not-really-possible"); fail("should never match"); } catch (IOException endOfStream) { assertTrue(endOfStream.getMessage().contains("End of stream reached, no match found")); } shell.expectClose(); } @Test public void testSimpleInvocationPrintsHelp() throws Exception { Spawn shell = spawnThermostat(); shell.expectClose(); String stdOut = shell.getCurrentStandardOutContents(); assertMatchesHelpCommandList(stdOut); String stdErr = shell.getCurrentStandardErrContents(); assertEquals(stdErr, ""); } @Test public void testHelpCommandInvocation() throws Exception { Spawn shell = spawnThermostat("help"); shell.expectClose(); String stdOut = shell.getCurrentStandardOutContents(); String stdErr = shell.getCurrentStandardErrContents(); assertMatchesHelpCommandList(stdOut); assertEquals(stdErr, ""); } @Ignore("this is currently broken; help's usage includes stuff about usernames and passwords") @Test public void testHelpOnHelp() throws Exception { Spawn shell = spawnThermostat("help", "help"); shell.expectClose(); String stdOut = shell.getCurrentStandardOutContents(); String stdErr = shell.getCurrentStandardErrContents(); String[] lines = stdOut.split("\n"); String usage = lines[0]; assertEquals("usage: help [command-name]", usage); assertEquals(stdErr, ""); } @Test public void testVersionArgument() throws Exception { Spawn shell = spawnThermostat("--version"); shell.expectClose(); String stdOut = shell.getCurrentStandardOutContents(); String stdErr = shell.getCurrentStandardErrContents(); assertTrue(stdOut.matches("Thermostat version \\d+\\.\\d+\\.\\d+\n")); assertEquals(stdErr, ""); } @Test public void testShell() throws Exception { Spawn shell = spawnThermostat("shell"); shell.expect(SHELL_PROMPT); shell.send("help\n"); shell.expect(SHELL_PROMPT); assertMatchesHelpCommandList(shell.getCurrentStandardOutContents()); shell.send("exit\n"); shell.expectClose(); } @Test public void testShellHelp() throws Exception { Spawn shell = spawnThermostat("help", "shell"); shell.expectClose(); String stdOut = shell.getCurrentStandardOutContents(); String[] lines = stdOut.split("\n"); String usage = lines[0]; assertTrue(usage.matches("^usage: thermostat shell$")); String description = lines[1]; assertTrue(description.matches("^\\s+launches the Thermostat interactive shell$")); assertTrue(lines[2].matches("thermostat shell")); } @Test public void testShellUnrecognizedArgument() throws Exception { Spawn shell = spawnThermostat("shell", "--foo"); shell.expectErr("Unrecognized option: --foo"); shell.expectClose(); } @Test public void testUnrecognizedEventsInShell() throws IOException, TimeoutException { // test '!' events Spawn shell = spawnThermostat("shell"); shell.expect(SHELL_PROMPT); shell.send("what!?!\n"); shell.expect(SHELL_PROMPT); shell.send("exit\n"); assertTrue(shell.getCurrentStandardErrContents().contains("!?!: event not found")); assertNoExceptions(shell.getCurrentStandardOutContents(), shell.getCurrentStandardErrContents()); } @Test public void testInvalidCommand() throws Exception { Spawn shell = spawnThermostat("foobar", "baz"); // TODO should this be stderr? shell.expect("unknown command 'foobar'"); shell.expectClose(); String stdOut = shell.getCurrentStandardOutContents(); assertMatchesHelpCommandList(stdOut); } private static void assertMatchesHelpCommandList(String actual) { assertTrue(actual.contains("list of commands")); assertTrue(actual.contains("help")); assertTrue(actual.contains("agent")); assertTrue(actual.contains("gui")); assertTrue(actual.contains("ping")); assertTrue(actual.contains("shell")); } }