Revision: 5399
http://jnode.svn.sourceforge.net/jnode/?rev=5399&view=rev
Author: crawley
Date: 2009-05-04 03:35:41 +0000 (Mon, 04 May 2009)
Log Message:
-----------
Fixed shell unit tests to deal with CLI migration, changes to 'set'
command arguments and addition of a new "user.*" system property.
Modified Paths:
--------------
trunk/shell/src/test/org/jnode/test/shell/CompletionTest.java
trunk/shell/src/test/org/jnode/test/shell/DefaultSyntaxCompletionTest.java
Modified: trunk/shell/src/test/org/jnode/test/shell/CompletionTest.java
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/CompletionTest.java
2009-05-03 19:13:56 UTC (rev 5398)
+++ trunk/shell/src/test/org/jnode/test/shell/CompletionTest.java
2009-05-04 03:35:41 UTC (rev 5399)
@@ -109,9 +109,9 @@
ShellUtils.registerCommandInterpreter(RedirectingInterpreter.FACTORY);
AliasManager am = this.getAliasManager();
- am.add("gc", "org.jnode.shell.command.GcCommand");
- am.add("cpuid", "org.jnode.shell.command.system.CpuIDCommand");
- am.add("set", "org.jnode.shell.command.SetCommand");
+ am.add("gc", "org.jnode.command.system.GcCommand");
+ am.add("cpuid", "org.jnode.command.system.CpuIDCommand");
+ am.add("set", "org.jnode.command.system.SetCommand");
am.add("dir", "org.jnode.test.shell.MyDirCommand");
am.add("duh", "org.jnode.test.shell.MyDuhCommand");
am.add("cat", "org.jnode.test.shell.MyCatCommand");
@@ -141,7 +141,7 @@
checkCompletions(cs, "set a", new String[]{}, -1);
checkCompletions(cs, "set u", new String[]{
"user.country ", "user.dir ", "user.home ",
- "user.language ", "user.name ", "user.timezone "}, 4);
+ "user.language ", "user.name ", "user.timezone ",
"user.zoneinfo.dir "}, 4);
checkCompletions(cs, "set a ", new String[]{}, -1);
checkCompletions(cs, "set a b", new String[]{}, 6);
checkCompletions(cs, "set a b ", new String[]{}, -1);
Modified:
trunk/shell/src/test/org/jnode/test/shell/DefaultSyntaxCompletionTest.java
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/DefaultSyntaxCompletionTest.java
2009-05-03 19:13:56 UTC (rev 5398)
+++ trunk/shell/src/test/org/jnode/test/shell/DefaultSyntaxCompletionTest.java
2009-05-04 03:35:41 UTC (rev 5399)
@@ -103,9 +103,9 @@
ShellUtils.registerCommandInterpreter(RedirectingInterpreter.FACTORY);
AliasManager am = this.getAliasManager();
- am.add("gc", "org.jnode.shell.command.GcCommand");
- am.add("cpuid", "org.jnode.shell.command.system.CpuIDCommand");
- am.add("set", "org.jnode.shell.command.SetCommand");
+ am.add("gc", "org.jnode.command.system..GcCommand");
+ am.add("cpuid", "org.jnode.command.system.CpuIDCommand");
+ am.add("set", "org.jnode.command.system.SetCommand");
am.add("duh", "org.jnode.test.shell.MyDuhCommand");
am.add("alias", "org.jnode.test.shell.MyAliasCommand");
am.add("compile", "org.jnode.test.shell.MyCompileCommand");
@@ -119,8 +119,8 @@
final String[] propertyCompletions =
getExpectedPropertyNameCompletions();
- checkCompletions(cs, "set ", new String[]{"--key ", "--value "}, -1);
- checkCompletions(cs, "set -", new String[]{"--key ", "--value "}, 4);
+ checkCompletions(cs, "set ", new String[]{"--key ", "--shell ",
"--skey ", "--value "}, -1);
+ checkCompletions(cs, "set -", new String[]{"--key ", "--shell ",
"--skey ", "--value "}, 4);
checkCompletions(cs, "set --v", new String[]{"--value "}, 4);
checkCompletions(cs, "set --key", new String[]{"--key "}, 4);
checkCompletions(cs, "set --key ", propertyCompletions, -1);
@@ -128,7 +128,7 @@
checkCompletions(cs, "set --key u", new String[]{
"user.country ", "user.dir ", "user.home ",
- "user.language ", "user.name ", "user.timezone "}, 10);
+ "user.language ", "user.name ", "user.timezone ",
"user.zoneinfo.dir "}, 10);
checkCompletions(cs, "cpuid ", new String[]{}, -1);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Jnode-svn-commits mailing list
Jnode-svn-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jnode-svn-commits
