auto import from //branches/cupcake/...@130745
This commit is contained in:
@@ -38,20 +38,20 @@ public class CommandLineProcessorTest extends TestCase {
|
||||
public MockCommandLineProcessor(ISdkLog logger) {
|
||||
super(logger,
|
||||
new String[][] {
|
||||
{ "action1", "Some action" },
|
||||
{ "action2", "Another action" },
|
||||
{ "verb1", "action1", "Some action" },
|
||||
{ "verb1", "action2", "Another action" },
|
||||
});
|
||||
define(MODE.STRING, false /*mandatory*/,
|
||||
"action1", "1", "first", "non-mandatory flag", null);
|
||||
"verb1", "action1", "1", "first", "non-mandatory flag", null);
|
||||
define(MODE.STRING, true /*mandatory*/,
|
||||
"action1", "2", "second", "mandatory flag", null);
|
||||
"verb1", "action1", "2", "second", "mandatory flag", null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void printHelpAndExitForAction(String actionFilter,
|
||||
public void printHelpAndExitForAction(String verb, String directObject,
|
||||
String errorFormat, Object... args) {
|
||||
mHelpCalled = true;
|
||||
super.printHelpAndExitForAction(actionFilter, errorFormat, args);
|
||||
super.printHelpAndExitForAction(verb, directObject, errorFormat, args);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -132,14 +132,14 @@ public class CommandLineProcessorTest extends TestCase {
|
||||
assertTrue(c.isVerbose());
|
||||
assertTrue(c.wasExitCalled());
|
||||
assertTrue(c.wasHelpCalled());
|
||||
assertTrue(c.getStdErr().indexOf("Missing action name.") != -1);
|
||||
assertTrue(c.getStdErr().indexOf("Missing verb name.") != -1);
|
||||
|
||||
c = new MockCommandLineProcessor(mLog);
|
||||
c.parseArgs(new String[] { "--verbose" });
|
||||
assertTrue(c.isVerbose());
|
||||
assertTrue(c.wasExitCalled());
|
||||
assertTrue(c.wasHelpCalled());
|
||||
assertTrue(c.getStdErr().indexOf("Missing action name.") != -1);
|
||||
assertTrue(c.getStdErr().indexOf("Missing verb name.") != -1);
|
||||
}
|
||||
|
||||
public final void testHelp() {
|
||||
@@ -148,39 +148,39 @@ public class CommandLineProcessorTest extends TestCase {
|
||||
c.parseArgs(new String[] { "-h" });
|
||||
assertTrue(c.wasExitCalled());
|
||||
assertTrue(c.wasHelpCalled());
|
||||
assertTrue(c.getStdErr().indexOf("Missing action name.") == -1);
|
||||
assertTrue(c.getStdErr().indexOf("Missing verb name.") == -1);
|
||||
|
||||
c = new MockCommandLineProcessor(mLog);
|
||||
c.parseArgs(new String[] { "--help" });
|
||||
assertTrue(c.wasExitCalled());
|
||||
assertTrue(c.wasHelpCalled());
|
||||
assertTrue(c.getStdErr().indexOf("Missing action name.") == -1);
|
||||
assertTrue(c.getStdErr().indexOf("Missing verb name.") == -1);
|
||||
}
|
||||
|
||||
public final void testMandatory() {
|
||||
MockCommandLineProcessor c = new MockCommandLineProcessor(mLog);
|
||||
|
||||
c.parseArgs(new String[] { "action1", "-1", "value1", "-2", "value2" });
|
||||
c.parseArgs(new String[] { "verb1", "action1", "-1", "value1", "-2", "value2" });
|
||||
assertFalse(c.wasExitCalled());
|
||||
assertFalse(c.wasHelpCalled());
|
||||
assertEquals("", c.getStdErr());
|
||||
assertEquals("value1", c.getValue("action1", "first"));
|
||||
assertEquals("value2", c.getValue("action1", "second"));
|
||||
assertEquals("value1", c.getValue("verb1", "action1", "first"));
|
||||
assertEquals("value2", c.getValue("verb1", "action1", "second"));
|
||||
|
||||
c = new MockCommandLineProcessor(mLog);
|
||||
c.parseArgs(new String[] { "action1", "-2", "value2" });
|
||||
c.parseArgs(new String[] { "verb1", "action1", "-2", "value2" });
|
||||
assertFalse(c.wasExitCalled());
|
||||
assertFalse(c.wasHelpCalled());
|
||||
assertEquals("", c.getStdErr());
|
||||
assertEquals(null, c.getValue("action1", "first"));
|
||||
assertEquals("value2", c.getValue("action1", "second"));
|
||||
assertEquals(null, c.getValue("verb1", "action1", "first"));
|
||||
assertEquals("value2", c.getValue("verb1", "action1", "second"));
|
||||
|
||||
c = new MockCommandLineProcessor(mLog);
|
||||
c.parseArgs(new String[] { "action1" });
|
||||
c.parseArgs(new String[] { "verb1", "action1" });
|
||||
assertTrue(c.wasExitCalled());
|
||||
assertTrue(c.wasHelpCalled());
|
||||
assertTrue(c.getStdErr().indexOf("must be defined") != -1);
|
||||
assertEquals(null, c.getValue("action1", "first"));
|
||||
assertEquals(null, c.getValue("action1", "second"));
|
||||
assertEquals(null, c.getValue("verb1", "action1", "first"));
|
||||
assertEquals(null, c.getValue("verb1", "action1", "second"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,10 +37,10 @@ public class SdkCommandLineTest extends TestCase {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void printHelpAndExitForAction(String actionFilter,
|
||||
public void printHelpAndExitForAction(String verb, String directObject,
|
||||
String errorFormat, Object... args) {
|
||||
mHelpCalled = true;
|
||||
super.printHelpAndExitForAction(actionFilter, errorFormat, args);
|
||||
super.printHelpAndExitForAction(verb, directObject, errorFormat, args);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -78,34 +78,64 @@ public class SdkCommandLineTest extends TestCase {
|
||||
super.tearDown();
|
||||
}
|
||||
|
||||
/** Test list with long name and verbose */
|
||||
public final void testList_Long_Verbose() {
|
||||
/** Test list */
|
||||
public final void testList_Avd_Verbose() {
|
||||
MockSdkCommandLine c = new MockSdkCommandLine(mLog);
|
||||
assertEquals("all", c.getListFilter());
|
||||
c.parseArgs(new String[] { "-v", "list", "--filter", "vm" });
|
||||
c.parseArgs(new String[] { "-v", "list", "avd" });
|
||||
assertFalse(c.wasHelpCalled());
|
||||
assertFalse(c.wasExitCalled());
|
||||
assertEquals("vm", c.getListFilter());
|
||||
assertEquals("list", c.getVerb());
|
||||
assertEquals("avd", c.getDirectObject());
|
||||
assertTrue(c.isVerbose());
|
||||
}
|
||||
|
||||
/** Test list with short name and no verbose */
|
||||
public final void testList_Short() {
|
||||
public final void testList_Target() {
|
||||
MockSdkCommandLine c = new MockSdkCommandLine(mLog);
|
||||
assertEquals("all", c.getListFilter());
|
||||
c.parseArgs(new String[] { "list", "-f", "vm" });
|
||||
c.parseArgs(new String[] { "list", "target" });
|
||||
assertFalse(c.wasHelpCalled());
|
||||
assertFalse(c.wasExitCalled());
|
||||
assertEquals("vm", c.getListFilter());
|
||||
assertEquals("list", c.getVerb());
|
||||
assertEquals("target", c.getDirectObject());
|
||||
assertFalse(c.isVerbose());
|
||||
}
|
||||
|
||||
/** Test list with long name and missing parameter */
|
||||
public final void testList_Long_MissingParam() {
|
||||
|
||||
public final void testList_None() {
|
||||
MockSdkCommandLine c = new MockSdkCommandLine(mLog);
|
||||
assertEquals("all", c.getListFilter());
|
||||
c.parseArgs(new String[] { "list", "--filter" });
|
||||
c.parseArgs(new String[] { "list" });
|
||||
assertFalse(c.wasHelpCalled());
|
||||
assertFalse(c.wasExitCalled());
|
||||
assertEquals("list", c.getVerb());
|
||||
assertEquals("", c.getDirectObject());
|
||||
assertFalse(c.isVerbose());
|
||||
}
|
||||
|
||||
public final void testList_Invalid() {
|
||||
MockSdkCommandLine c = new MockSdkCommandLine(mLog);
|
||||
c.parseArgs(new String[] { "list", "unknown" });
|
||||
assertTrue(c.wasHelpCalled());
|
||||
assertTrue(c.wasExitCalled());
|
||||
assertEquals("all", c.getListFilter());
|
||||
assertEquals(null, c.getVerb());
|
||||
assertEquals(null, c.getDirectObject());
|
||||
assertFalse(c.isVerbose());
|
||||
}
|
||||
|
||||
public final void testList_Plural() {
|
||||
MockSdkCommandLine c = new MockSdkCommandLine(mLog);
|
||||
c.parseArgs(new String[] { "list", "avds" });
|
||||
assertFalse(c.wasHelpCalled());
|
||||
assertFalse(c.wasExitCalled());
|
||||
assertEquals("list", c.getVerb());
|
||||
// we get the non-plural form
|
||||
assertEquals("avd", c.getDirectObject());
|
||||
assertFalse(c.isVerbose());
|
||||
|
||||
c = new MockSdkCommandLine(mLog);
|
||||
c.parseArgs(new String[] { "list", "targets" });
|
||||
assertFalse(c.wasHelpCalled());
|
||||
assertFalse(c.wasExitCalled());
|
||||
assertEquals("list", c.getVerb());
|
||||
// we get the non-plural form
|
||||
assertEquals("target", c.getDirectObject());
|
||||
assertFalse(c.isVerbose());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user