A few commandline test updates

Whiteknight · Nov 29, 2011 · d2fa7e3 · d2fa7e3
1 parent b40470d
commit d2fa7e3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/t/commandline/Arguments.t b/t/commandline/Arguments.t
@@ -101,21 +101,26 @@ class Test_Rosella_CommandLine_Arguments
     function fetch_pair()
     {
         self.status.verify("Test Rosella.CommandLine.Arguments.fetch_pair()");
-        var obj = create_new();
+        var obj = create_new("--foo", "a", "b");
 
-        string arg_0 = "foo";
+        string arg_0 = "--foo";
         int arg_1 = 0;
         var result = obj.fetch_pair(arg_0, arg_1);
+        self.assert.equal(elements(result), 1);
+        self.assert.equal(result["a"], "b");
     }
 
     function fetch_pair_hash()
     {
         self.status.verify("Test Rosella.CommandLine.Arguments.fetch_pair_hash()");
-        var obj = create_new();
+        var obj = create_new("--foo=a=b", "--foo=c=d");
 
-        string arg_0 = "";
+        string arg_0 = "--foo";
         int arg_1 = 0;
         var result = obj.fetch_pair_hash(arg_0, arg_1);
+        self.assert.equal(elements(result), 2);
+        self.assert.equal(result["a"], "b");
+        self.assert.equal(result["c"], "d");
     }
 
     function fetch_unparsed()

diff --git a/t/commandline/Program.t b/t/commandline/Program.t
@@ -13,7 +13,7 @@ class Test_Rosella_CommandLine_Program
         self.status.verify("Test Rosella.CommandLine.Program.on_error()");
         var obj = new Rosella.CommandLine.Program("test");
 
-        var arg_0 = null;
+        var arg_0 = function(var e) { };
         var result = obj.on_error(arg_0);
     }
 
@@ -36,6 +36,9 @@ class Test_Rosella_CommandLine_Program
         self.assert.instance_of(result, class Rosella.CommandLine.ProgramMode);
     }
 
+    // TODO: We need lots of tests for running programs, including mode
+    // dispatch, error recovery, etc.
+
     function run()
     {
         self.status.unimplemented("Test .run()");
@@ -45,16 +48,6 @@ class Test_Rosella_CommandLine_Program
         var arg_0 = null;
         var result = obj.run(arg_0);
     }
-
-    function try_handle_error()
-    {
-        self.status.unimplemented("Test .try_handle_error()");
-        self.status.verify("Test Rosella.CommandLine.Program.try_handle_error()");
-        var obj = new Rosella.CommandLine.Program("");
-
-        var arg_0 = null;
-        var result = obj.try_handle_error(arg_0);
-    }
 }
 
 function main[main]()

diff --git a/t/commandline/ProgramMode.t b/t/commandline/ProgramMode.t
@@ -13,7 +13,7 @@ class Test_Rosella_CommandLine_ProgramMode
         self.status.verify("Test Rosella.CommandLine.ProgramMode.set_function()");
         var obj = new Rosella.CommandLine.ProgramMode("");
 
-        var arg_0 = null;
+        var arg_0 = function(var args) { };
         var result = obj.set_function(arg_0);
     }