You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by mo...@apache.org on 2012/05/12 21:13:10 UTC
svn commit: r1337612 - in /incubator/any23/trunk/core/src:
main/java/org/apache/any23/cli/ToolRunner.java
test/java/org/apache/any23/cli/ToolRunnerTest.java
Author: mostarda
Date: Sat May 12 19:13:09 2012
New Revision: 1337612
URL: http://svn.apache.org/viewvc?rev=1337612&view=rev
Log:
Fixed usage of -v option and no arguments case. Related to issue #ANY23-88 .
Modified:
incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java
incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/ToolRunnerTest.java
Modified: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java?rev=1337612&r1=1337611&r2=1337612&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java Sat May 12 19:13:09 2012
@@ -87,14 +87,10 @@ public final class ToolRunner {
Map<String, JCommander> commands = commander.getCommands();
String parsedCommand = commander.getParsedCommand();
- if(parsedCommand == null) {
- infoStream.println("A command must be specified.");
- printHelp = true;
- }
if (printHelp) {
commander.usage();
- return 1;
+ return 0;
}
if (showVersion) {
@@ -102,6 +98,12 @@ public final class ToolRunner {
return 0;
}
+ if(parsedCommand == null) {
+ infoStream.println("A command must be specified.");
+ commander.usage();
+ return 1;
+ }
+
if (verbose) {
LogUtils.setVerboseLogging();
} else {
Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/ToolRunnerTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/ToolRunnerTest.java?rev=1337612&r1=1337611&r2=1337612&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/ToolRunnerTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/ToolRunnerTest.java Sat May 12 19:13:09 2012
@@ -17,6 +17,7 @@
package org.apache.any23.cli;
+import junit.framework.Assert;
import org.junit.Test;
import java.io.IOException;
@@ -50,4 +51,14 @@ public class ToolRunnerTest {
}
}
+ @Test
+ public void testGetVersion() throws Exception {
+ Assert.assertEquals(0, new ToolRunner().execute("-v") );
+ }
+
+ @Test
+ public void testGetHelp() throws Exception {
+ Assert.assertEquals(0, new ToolRunner().execute("-h") );
+ }
+
}