added proper testing of invalid command lines

tenorviol · Jan 1, 2012 · f8e8eac · f8e8eac
1 parent e307c58
commit f8e8eac
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/lib/gitsearch-0.1.jar b/lib/gitsearch-0.1.jar
diff --git a/src/CommandLine.java b/src/CommandLine.java
@@ -15,15 +15,15 @@ public CommandLine(String[] args) throws IllegalArgumentException {
 
     if ("index".equals(command)) {
       parseIndexArgs();
-    } else if ("search".equals(command)) {
+    } else if ("query".equals(command)) {
-      parseSearchArgs();
+      parseQueryArgs();
     } else {
       throw new IllegalArgumentException("Unknown command, '" + command + "'");
     }
   }
 
   private void parseCommand(List<String> args) throws IllegalArgumentException {
-    if (!"--index".equals(args.get(0)) || args.size() < 2) {
+    if (args.size() < 2 || !"--index".equals(args.get(0))) {
       throw new IllegalArgumentException("--index <path> required");
     }
     indexPath = args.get(1);
@@ -41,7 +41,7 @@ private void parseIndexArgs() throws IllegalArgumentException {
     }
   }
 
-  private void parseSearchArgs() throws IllegalArgumentException {
+  private void parseQueryArgs() throws IllegalArgumentException {
     if (commandArgs.size() == 0) {
       throw new IllegalArgumentException("No search query given");
     }

diff --git a/test/CommandLineTest.java b/test/CommandLineTest.java
@@ -5,14 +5,23 @@
 
 public class CommandLineTest {
 
-  @Test
+  @DataProvider(name = "invalid-command-lines")
-  public void testFoo() {
+  public Object[][] illegalCommandLineProvider() {
-    String[] args = {"--index", "./foo/index", "index"};
+    return new Object[][] {
-    try {
+      { null },
-      CommandLine cl = new CommandLine(args);
+      { "--index" },
-    } catch (Exception e) {
+      { "--index ./.index" },
-      System.out.println(e);
+      { "--index ./.index index" },
-    }
+      { "--index ./.index query" },
-    Assert.assertEquals(1,1);
+      { "--index ./.index non-command" },
+      { "query --index ./.index foo" },
+    };
+  }
+
+  @Test(dataProvider       = "invalid-command-lines",
+        expectedExceptions = IllegalArgumentException.class)
+  public void testInvalidCommandLineThrowsIllegalArgumentException(String commandLine) {
+    String[] args = (null == commandLine) ? new String[] {} : commandLine.split(" ");
+    CommandLine cl = new CommandLine(args);
   }
 }