added tests for valid command lines

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

Hide file tree

Showing 3 changed files with 31 additions and 6 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
@@ -53,7 +53,7 @@ public static void help() {
     //             + " [-index INDEX_PATH] [-docs DOCS_PATH] [-update]\n\n"
     //             + "This indexes the documents in DOCS_PATH, creating a Lucene index"
     //             + "in INDEX_PATH that can be searched with SearchFiles";
-    System.out.println("java com.github.tenorviol.gitsearch.CommandLine --index <index path> search <query term(s)>");
+    System.out.println("java com.github.tenorviol.gitsearch.CommandLine --index <index path> query <query term(s)>");
     //String usage =
     //  "Usage:\tjava org.apache.lucene.demo.SearchFiles [-index dir] [-field f] [-repeat n] [-queries file] [-query string] [-raw] [-paging hitsPerPage]\n\nSee http://lucene.apache.org/java/4_0/demo.html for details.";
   }

diff --git a/test/CommandLineTest.java b/test/CommandLineTest.java
@@ -3,18 +3,21 @@
 
 import com.github.tenorviol.gitsearch.CommandLine;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class CommandLineTest {
 
   @DataProvider(name = "invalid-command-lines")
   public Object[][] illegalCommandLineProvider() {
     return new Object[][] {
       { null },
       { "--index" },
-      { "--index ./.index" },
-      { "--index ./.index index" },
-      { "--index ./.index query" },
-      { "--index ./.index non-command" },
-      { "query --index ./.index foo" },
+      { "--index path/to/index" },
+      { "--index path/to/index index" },
+      { "--index path/to/index query" },
+      { "--index path/to/index non-command" },
+      { "query --index path/to/index add/to/index" },
     };
   }
 
@@ -24,4 +27,26 @@ public void testInvalidCommandLineThrowsIllegalArgumentException(String commandL
     String[] args = (null == commandLine) ? new String[] {} : commandLine.split(" ");
     CommandLine cl = new CommandLine(args);
   }
+
+  @DataProvider(name = "command-lines")
+  public Object[][] commandLineProvider() {
+    return new Object[][] {
+      { "--index path/to/index index add/to/index second/add/to/index" },
+      { "--index path/to/index query word1 word2 field:word3" },
+    };
+  }
+
+  @Test(dataProvider = "command-lines")
+  public void testIndexCommand(String commandLine) {
+    String[] args = commandLine.split(" ");
+    CommandLine cl = new CommandLine(args);
+
+    Assert.assertEquals(cl.indexPath,          args[1]);
+    Assert.assertEquals(cl.command,            args[2]);
+    Assert.assertEquals(cl.commandArgs.size(), args.length - 3);
+
+    List list = Arrays.asList(args);
+    list = list.subList(3, list.size());
+    Assert.assertEquals(cl.commandArgs, list);
+  }
 }