Revert "implemented TestShellStreamProvider"

This reverts commit de1bc7c.
forge · Feb 9, 2013 · 84ddddc · 84ddddc
1 parent 19a3066
commit 84ddddc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 57 deletions.
diff --git a/aesh-test/src/main/java/org/jboss/forge/aesh/TestShellStreamProvider.java b/aesh-test/src/main/java/org/jboss/forge/aesh/TestShellStreamProvider.java
@@ -6,31 +6,11 @@
  */
 package org.jboss.forge.aesh;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  * 
  */
 public class TestShellStreamProvider implements ShellStreamProvider
 {
-    private InputStream input;
-    private OutputStream output;
-
-    public void setInputStream(InputStream input) {
-        this.input = input;
-    }
-
-    public InputStream getInputStream() {
-        return input;
-    }
-
-    public void setOutputStream(OutputStream output) {
-        this.output = output;
-    }
 
-    public OutputStream getOutputStream() {
-        return output;
-    }
 }
diff --git a/aesh/src/main/java/org/jboss/forge/aesh/ForgeShell.java b/aesh/src/main/java/org/jboss/forge/aesh/ForgeShell.java
@@ -73,15 +73,7 @@ public void initShell() throws Exception
 
       for (ExportedInstance<ShellStreamProvider> provider : registry.getExportedInstances(ShellStreamProvider.class))
       {
-          try {
-              System.out.println("Loaded: ShellStreamProvider - " + provider.get());
-              ShellStreamProvider streamProvider = provider.get();
-              Settings.getInstance().setInputStream(streamProvider.getInputStream());
-              Settings.getInstance().setStdOut(streamProvider.getOutputStream());
-          }
-          catch (Exception e) {
-              logger.log(Level.WARNING, "Failed to load ShellStreamProvider");
-          }
+         System.out.println("Loaded: ShellStreamProvider - " + provider.get());
          // Configure the stream here. This will only execute if there is a addon deployed BEFORE aesh, which is the
          // case in tests. We control that order there (or can fix if it is not working.)
 

diff --git a/aesh/src/main/java/org/jboss/forge/aesh/ShellStreamProvider.java b/aesh/src/main/java/org/jboss/forge/aesh/ShellStreamProvider.java
@@ -8,21 +8,11 @@
 
 import org.jboss.forge.container.services.Exported;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 @Exported
 public interface ShellStreamProvider
 {
    // Methods to do Stream configuration/get stream handles
-    void setInputStream(InputStream input);
-
-    InputStream getInputStream();
-
-    void setOutputStream(OutputStream output);
-
-    OutputStream getOutputStream();
 }
diff --git a/aesh/src/test/java/org/jboss/forge/aesh/AeshAddonTest.java b/aesh/src/test/java/org/jboss/forge/aesh/AeshAddonTest.java
@@ -1,6 +1,7 @@
 package org.jboss.forge.aesh;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 import javax.inject.Inject;
 
@@ -21,16 +22,13 @@
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 @RunWith(Arquillian.class)
-@Ignore
 public class AeshAddonTest extends TestCase
 {
 
@@ -41,10 +39,7 @@ public AeshAddonTest()
    }
 
    @Deployment
-   @Dependencies({
-           @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"),
-           @Addon(name = "org.jboss.forge:aesh-test", version = "2.0.0-SNAPSHOT")
-   })
+   @Dependencies(@Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"))
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
@@ -53,15 +48,11 @@ public static ForgeArchive getDeployment()
                .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml")
                         .resolve("org.jboss.aesh:aesh:0.32").withTransitivity().asFile())
                .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
-               .addAsAddonDependencies(AddonDependency.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")))
-               .addAsAddonDependencies(AddonDependency.create(AddonId.from("org.jboss.forge:aesh-test", "2.0.0-SNAPSHOT")));
+               .addAsAddonDependencies(AddonDependency.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")));
 
       return archive;
    }
 
-    @Inject
-    private ShellStreamProvider streamProvider;
-
    @Inject
    private ForgeShell shell;
 
@@ -71,6 +62,7 @@ public static ForgeArchive getDeployment()
    @Test
    public void testContainerInjection()
    {
+       /*
       try
       {
 
@@ -83,7 +75,7 @@ public void testContainerInjection()
          setupSettings(pipedInputStream, out);
 
          shell.initShell();
-         shell.addCommand(new ShellCommand(fooCommand, shell));
+         shell.addCommand(new ShellCommand(fooCommand));
 
          outputStream.write(("foo\n").getBytes());
          shell.startShell();
@@ -111,15 +103,14 @@ public void testContainerInjection()
       {
          ioe.printStackTrace();
       }
+      */
    }
 
    private void setupSettings(InputStream input, OutputStream out)
    {
-       streamProvider.setInputStream(input);
-       streamProvider.setOutputStream(out);
       Settings.getInstance().setName("test");
-      //Settings.getInstance().setInputStream(input);
-      //Settings.getInstance().setStdOut(out);
+      Settings.getInstance().setInputStream(input);
+      Settings.getInstance().setStdOut(out);
       // aeshProducer.getSettings().setStdOut(new ByteArrayOutputStream());
       if (!Config.isOSPOSIXCompatible())
          Settings.getInstance().setAnsiConsole(false);