Moved Autocomplete with spaces example to FooCommand

forge · Aug 26, 2013 · bac6873 · bac6873
1 parent cc91dc2
commit bac6873
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/shell/tests/src/test/java/org/jboss/forge/addon/shell/mock/command/FooCommand.java b/shell/tests/src/test/java/org/jboss/forge/addon/shell/mock/command/FooCommand.java
@@ -7,6 +7,7 @@
 package org.jboss.forge.addon.shell.mock.command;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import javax.inject.Inject;
 
@@ -18,6 +19,7 @@
 import org.jboss.forge.addon.ui.input.InputComponent;
 import org.jboss.forge.addon.ui.input.UICompleter;
 import org.jboss.forge.addon.ui.input.UIInput;
+import org.jboss.forge.addon.ui.input.UISelectOne;
 import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
 import org.jboss.forge.addon.ui.result.Result;
@@ -54,6 +56,9 @@ public class FooCommand implements UICommand
    @Inject
    @WithAttributes(label = "target location")
    private UIInput<DirectoryResource> targetLocation;
+
+   @Inject
+   private UISelectOne<String> valueWithSpaces;
 
    @Override
    public UICommandMetadata getMetadata()
@@ -70,6 +75,7 @@ public boolean isEnabled(UIContext context)
    @Override
    public void initializeUI(UIBuilder builder) throws Exception
    {
+      valueWithSpaces.setValueChoices(Arrays.asList("Value 1", "Value 2", "Value 10", "Value 100"));
       help.setCompleter(new UICompleter<String>()
       {
          @Override
@@ -86,7 +92,7 @@ public Iterable<String> getCompletionProposals(UIContext context, InputComponent
          }
       });
 
-      builder.add(name).add(help).add(bool).add(bar).add(bar2).add(targetLocation);
+      builder.add(name).add(help).add(bool).add(bar).add(bar2).add(targetLocation).add(valueWithSpaces);
    }
 
    @Override

diff --git a/shell/tests/src/test/java/org/jboss/forge/addon/shell/mock/wizard/MockCommand.java b/shell/tests/src/test/java/org/jboss/forge/addon/shell/mock/wizard/MockCommand.java
@@ -6,8 +6,6 @@
  */
 package org.jboss.forge.addon.shell.mock.wizard;
 
-import java.util.Arrays;
-
 import javax.inject.Inject;
 
 import org.jboss.forge.addon.resource.Resource;
@@ -18,7 +16,6 @@
 import org.jboss.forge.addon.ui.context.UIValidationContext;
 import org.jboss.forge.addon.ui.input.UIInput;
 import org.jboss.forge.addon.ui.input.UIInputMany;
-import org.jboss.forge.addon.ui.input.UISelectOne;
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
 import org.jboss.forge.addon.ui.result.Result;
 import org.jboss.forge.addon.ui.result.Results;
@@ -41,9 +38,6 @@ public class MockCommand extends AbstractUICommand implements UICommand
    @SuppressWarnings("rawtypes")
    private UIInputMany<Resource> values;
 
-   @Inject
-   private UISelectOne<String> valueWithSpaces;
-
    @Override
    public Metadata getMetadata()
    {
@@ -53,8 +47,7 @@ public Metadata getMetadata()
    @Override
    public void initializeUI(UIBuilder builder) throws Exception
    {
-      valueWithSpaces.setValueChoices(Arrays.asList("Value 1", "Value 2", "Value 10", "Value 100"));
-      builder.add(key).add(values).add(proceed).add(valueWithSpaces);
+      builder.add(key).add(values).add(proceed);
    }
 
    @Override

diff --git a/shell/tests/src/test/java/org/jboss/forge/addon/shell/parser/CommandCompletionTest.java b/shell/tests/src/test/java/org/jboss/forge/addon/shell/parser/CommandCompletionTest.java
@@ -118,11 +118,11 @@ public void testQuotes() throws Exception
    @Test
    public void testValuesWithSpaceCompletion() throws Exception
    {
-      test.waitForCompletion("mock-command --valueWithSpaces \"Value 2\" ", "mock-command --valueWithSpaces Value 2",
-               5, TimeUnit.SECONDS);
+      test.waitForCompletion("foocommand --valueWithSpaces \"Value 2\" ", "foocommand --valueWithSpaces Value",
+               5, TimeUnit.MINUTES);
 
-      test.waitForCompletion("mock-command --valueWithSpaces \"Value 1\" ", "mock-command --valueWithSpaces Value 1",
-               5, TimeUnit.SECONDS);
+      test.waitForCompletion("foocommand --valueWithSpaces \"Value 1\" ", "foocommand --valueWithSpaces Value",
+               5, TimeUnit.MINUTES);
 
    }
 

diff --git a/ui/example/src/main/java/org/jboss/forge/addon/ui/example/wizards/ExampleWizard.java b/ui/example/src/main/java/org/jboss/forge/addon/ui/example/wizards/ExampleWizard.java
@@ -6,6 +6,8 @@
  */
 package org.jboss.forge.addon.ui.example.wizards;
 
+import java.util.Arrays;
+
 import javax.inject.Inject;
 
 import org.jboss.forge.addon.resource.DirectoryResource;
@@ -14,6 +16,7 @@
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIValidationContext;
 import org.jboss.forge.addon.ui.input.UIInput;
+import org.jboss.forge.addon.ui.input.UISelectOne;
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
 import org.jboss.forge.addon.ui.result.NavigationResult;
 import org.jboss.forge.addon.ui.result.Result;
@@ -40,6 +43,10 @@ public class ExampleWizard extends AbstractUICommand implements UIWizard
    @WithAttributes(label = "Go to Last Step", shortName = 'g')
    private UIInput<Boolean> goToLastStep;
 
+   @Inject
+   private UISelectOne<String> valueWithSpaces;
+
+
    @Override
    public Metadata getMetadata()
    {
@@ -50,7 +57,8 @@ public Metadata getMetadata()
    public void initializeUI(UIBuilder builder) throws Exception
    {
       firstName.setRequired(true).setRequiredMessage("First Name must be informed !");
-      builder.add(firstName).add(showSelectComponents).add(goToLastStep).add(directory);
+      valueWithSpaces.setValueChoices(Arrays.asList("Value 1", "Value 2", "Value 10", "Value 100"));
+      builder.add(firstName).add(showSelectComponents).add(goToLastStep).add(directory).add(valueWithSpaces);
    }
 
    @Override