Mercurial > hg > release > thermostat-0.4

changeset 349:786f968c3d20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add short options to (almost) all options. Reviewed-by: vanaltj Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-May/001668.html PR 971
author Roman Kennke <rkennke@redhat.com>
date Thu, 31 May 2012 23:28:41 +0200
parents 9a9d692f1751
children 3ae960d641db 2f7681265356
files agent/src/main/java/com/redhat/thermostat/agent/config/AgentOptionParser.java agent/src/test/java/com/redhat/thermostat/agent/AgentApplicationTest.java common/src/main/java/com/redhat/thermostat/common/cli/CommonCommandOptions.java common/src/test/java/com/redhat/thermostat/common/cli/CommonCommandOptionsTest.java common/src/test/java/com/redhat/thermostat/common/cli/HelpCommandTest.java tools/src/main/java/com/redhat/thermostat/tools/db/DBOptionParser.java tools/src/test/java/com/redhat/thermostat/tools/db/DBServiceTest.java
diffstat 7 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/agent/src/main/java/com/redhat/thermostat/agent/config/AgentOptionParser.java	Thu May 31 22:04:12 2012 +0200
+++ b/agent/src/main/java/com/redhat/thermostat/agent/config/AgentOptionParser.java	Thu May 31 23:28:41 2012 +0200
@@ -102,8 +102,8 @@
     }
 
     public static Collection<ArgumentSpec> getAcceptedArguments() {
-        ArgumentSpec saveOnExit = new SimpleArgumentSpec(Args.SAVE_ON_EXIT.option, Args.SAVE_ON_EXIT.description);
-        ArgumentSpec db = new SimpleArgumentSpec(Args.DB.option, Args.DB.description, true, true);
+        ArgumentSpec saveOnExit = new SimpleArgumentSpec(Args.SAVE_ON_EXIT.option, "s", Args.SAVE_ON_EXIT.description, false, false);
+        ArgumentSpec db = new SimpleArgumentSpec(Args.DB.option, "d",  Args.DB.description, true, true);
         ArgumentSpec debug = new SimpleArgumentSpec(Args.DEBUG.option, Args.DEBUG.description);
         return Arrays.asList(saveOnExit, db, debug);
     }
--- a/agent/src/test/java/com/redhat/thermostat/agent/AgentApplicationTest.java	Thu May 31 22:04:12 2012 +0200
+++ b/agent/src/test/java/com/redhat/thermostat/agent/AgentApplicationTest.java	Thu May 31 23:28:41 2012 +0200
@@ -88,8 +88,8 @@
         Collection<ArgumentSpec> args = agent.getAcceptedArguments();
         assertNotNull(args);
         assertEquals(3, args.size());
-        assertTrue(args.contains(new SimpleArgumentSpec("saveOnExit", "save the data on exit")));
+        assertTrue(args.contains(new SimpleArgumentSpec("saveOnExit", "s", "save the data on exit", false, false)));
         assertTrue(args.contains(new SimpleArgumentSpec("debug", "launch with debug console enabled")));
-        assertTrue(args.contains(new SimpleArgumentSpec("dbUrl", "connect to the given url", true, true)));
+        assertTrue(args.contains(new SimpleArgumentSpec("dbUrl", "d", "connect to the given url", true, true)));
     }
 }
--- a/common/src/main/java/com/redhat/thermostat/common/cli/CommonCommandOptions.java	Thu May 31 22:04:12 2012 +0200
+++ b/common/src/main/java/com/redhat/thermostat/common/cli/CommonCommandOptions.java	Thu May 31 23:28:41 2012 +0200
@@ -58,7 +58,7 @@
 
     private void addDbUrlOptionForStorageCommand(Command cmd, Collection<ArgumentSpec> acceptedArguments) {
         if (cmd.isStorageRequired()) {
-            acceptedArguments.add(new SimpleArgumentSpec(DB_URL_ARG, DB_URL_DESC, false, true));
+            acceptedArguments.add(new SimpleArgumentSpec(DB_URL_ARG, "d", DB_URL_DESC, false, true));
         }
     }
 
--- a/common/src/test/java/com/redhat/thermostat/common/cli/CommonCommandOptionsTest.java	Thu May 31 22:04:12 2012 +0200
+++ b/common/src/test/java/com/redhat/thermostat/common/cli/CommonCommandOptionsTest.java	Thu May 31 23:28:41 2012 +0200
@@ -52,7 +52,7 @@
         CommonCommandOptions commonOpts = new CommonCommandOptions();
         Collection<ArgumentSpec> cmdOpts = commonOpts.getAcceptedOptionsFor(cmd);
 
-        assertTrue(cmdOpts.contains(new SimpleArgumentSpec("dbUrl", "the URL of the storage to connect to", false, true)));
+        assertTrue(cmdOpts.contains(new SimpleArgumentSpec("dbUrl", "d", "the URL of the storage to connect to", false, true)));
     }
 
     @Test
--- a/common/src/test/java/com/redhat/thermostat/common/cli/HelpCommandTest.java	Thu May 31 22:04:12 2012 +0200
+++ b/common/src/test/java/com/redhat/thermostat/common/cli/HelpCommandTest.java	Thu May 31 23:28:41 2012 +0200
@@ -131,7 +131,7 @@
         cmd.run(ctxFactory.createContext(args));
 
         String actual = ctxFactory.getOutput();
-        assertEquals("usage: test1 [--dbUrl <arg>] [--logLevel <arg>]\ntest usage command 1\n     --dbUrl <arg>       the URL of the storage to connect to\n     --logLevel <arg>    log level\n", actual);
+        assertEquals("usage: test1 [-d <arg>] [--logLevel <arg>]\ntest usage command 1\n  -d,--dbUrl <arg>       the URL of the storage to connect to\n     --logLevel <arg>    log level\n", actual);
     }
 
     @Test
--- a/tools/src/main/java/com/redhat/thermostat/tools/db/DBOptionParser.java	Thu May 31 22:04:12 2012 +0200
+++ b/tools/src/main/java/com/redhat/thermostat/tools/db/DBOptionParser.java	Thu May 31 23:28:41 2012 +0200
@@ -131,11 +131,11 @@
     }
 
     static Collection<ArgumentSpec> getAcceptedArguments() {
-        ArgumentSpec cluster = new SimpleArgumentSpec(DBArgs.CLUSTER.option, DBArgs.CLUSTER.description);
-        ArgumentSpec dryRun = new SimpleArgumentSpec(DBArgs.DRY.option, DBArgs.DRY.description);
+        ArgumentSpec cluster = new SimpleArgumentSpec(DBArgs.CLUSTER.option, "c", DBArgs.CLUSTER.description, false, false);
+        ArgumentSpec dryRun = new SimpleArgumentSpec(DBArgs.DRY.option, "d", DBArgs.DRY.description, false, false);
         ArgumentSpec start = new SimpleArgumentSpec(DBArgs.START.option, DBArgs.START.description);
         ArgumentSpec stop = new SimpleArgumentSpec(DBArgs.STOP.option, DBArgs.STOP.description);
-        ArgumentSpec quiet = new SimpleArgumentSpec(DBArgs.QUIET.option, DBArgs.QUIET.description);
+        ArgumentSpec quiet = new SimpleArgumentSpec(DBArgs.QUIET.option, "q", DBArgs.QUIET.description, false, false);
         return Arrays.asList(cluster, dryRun, start, stop, quiet);
     }
 }
--- a/tools/src/test/java/com/redhat/thermostat/tools/db/DBServiceTest.java	Thu May 31 22:04:12 2012 +0200
+++ b/tools/src/test/java/com/redhat/thermostat/tools/db/DBServiceTest.java	Thu May 31 23:28:41 2012 +0200
@@ -262,10 +262,10 @@
         Collection<ArgumentSpec> args = dbService.getAcceptedArguments();
         assertNotNull(args);
         assertEquals(5, args.size());
-        assertTrue(args.contains(new SimpleArgumentSpec("cluster", "launch the db in cluster mode, if not specified, local mode is the default")));
-        assertTrue(args.contains(new SimpleArgumentSpec("dryRun", "run the service in dry run mode")));
+        assertTrue(args.contains(new SimpleArgumentSpec("cluster", "c", "launch the db in cluster mode, if not specified, local mode is the default", false, false)));
+        assertTrue(args.contains(new SimpleArgumentSpec("dryRun", "d", "run the service in dry run mode", false, false)));
         assertTrue(args.contains(new SimpleArgumentSpec("start", "start the database")));
         assertTrue(args.contains(new SimpleArgumentSpec("stop", "stop the database")));
-        assertTrue(args.contains(new SimpleArgumentSpec("quiet", "don't produce any output")));
+        assertTrue(args.contains(new SimpleArgumentSpec("quiet", "q", "don't produce any output", false, false)));
     }
 }