Fix failing tests

forge · Jan 18, 2013 · b94dd23 · b94dd23
1 parent 5f638ff
commit b94dd23
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 22 deletions.
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,16 +1,21 @@
 package org.jboss.forge.aesh;
 
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+
+import javax.inject.Inject;
+
 import junit.framework.TestCase;
+
 import org.jboss.aesh.console.Config;
 import org.jboss.aesh.console.settings.Settings;
 import org.jboss.aesh.edit.KeyOperation;
 import org.jboss.aesh.edit.actions.Operation;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.aesh.commands.ClearCommand;
-import org.jboss.forge.aesh.commands.ExitCommand;
-import org.jboss.forge.aesh.commands.ListServicesCommand;
-import org.jboss.forge.aesh.commands.StopCommand;
 import org.jboss.forge.arquillian.Addon;
 import org.jboss.forge.arquillian.Dependencies;
 import org.jboss.forge.arquillian.archive.ForgeArchive;
@@ -24,13 +29,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.inject.Inject;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
@@ -48,16 +46,9 @@ public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)
-               .addClasses(AeshShell.class)
-               .addClass(ShellCommand.class)
-               .addClass(ShellContext.class)
-               .addClass(StopCommand.class)
-               .addClass(ExitCommand.class)
-               .addClass(ClearCommand.class)
-               .addClass(FooCommand.class)
-               .addClass(ListServicesCommand.class)
+               .addPackages(true, AeshShell.class.getPackage())
                .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml")
-                       .resolve("org.jboss.aesh:aesh:0.29").withTransitivity().asFile())
+                        .resolve("org.jboss.aesh:aesh:0.29").withTransitivity().asFile())
                .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
                .addAsAddonDependencies(AddonDependency.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")));
 

diff --git a/resources/impl/src/main/java/org/jboss/forge/resource/FileResourceGenerator.java b/resources/impl/src/main/java/org/jboss/forge/resource/FileResourceGenerator.java
@@ -21,15 +21,15 @@ public boolean handles(Class<?> type, Object resource)
    @SuppressWarnings("unchecked")
    public <T extends Resource<File>> T getResource(ResourceFactory factory, Class<FileResource<?>> type, File resource)
    {
-      if (type.isAssignableFrom(DirectoryResource.class) || resource.isDirectory())
+      if (DirectoryResource.class.isAssignableFrom(type) || (resource.exists() && resource.isDirectory()))
          return (T) new DirectoryResource(factory, resource);
       return (T) new UnknownFileResource(factory, resource);
    }
 
    @Override
    public <T extends Resource<File>> Class<?> getResourceType(Class<FileResource<?>> type, File resource)
    {
-      if (type.isAssignableFrom(DirectoryResource.class) || resource.isDirectory())
+      if (DirectoryResource.class.isAssignableFrom(type) || (resource.exists() && resource.isDirectory()))
          return DirectoryResource.class;
       return UnknownFileResource.class;
    }

diff --git a/resources/impl/src/test/java/org/jboss/forge/test/resource/FileResourceGeneratorTest.java b/resources/impl/src/test/java/org/jboss/forge/test/resource/FileResourceGeneratorTest.java
@@ -1,6 +1,7 @@
 package org.jboss.forge.test.resource;
 
 import java.io.File;
+import java.util.UUID;
 
 import javax.inject.Inject;
 
@@ -13,6 +14,7 @@
 import org.jboss.forge.container.AddonId;
 import org.jboss.forge.resource.DirectoryResource;
 import org.jboss.forge.resource.FileResource;
+import org.jboss.forge.resource.Resource;
 import org.jboss.forge.resource.ResourceFactory;
 import org.jboss.forge.resource.UnknownFileResource;
 import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -45,6 +47,14 @@ public static ForgeArchive getDeployment()
    @Inject
    private ResourceFactory factory;
 
+   @Test
+   public void testCreateUnknownFileResource() throws Exception
+   {
+      FileResource<?> resource = factory.create(new File(UUID.randomUUID().toString())).reify(FileResource.class);
+      Assert.assertNotNull(resource);
+      Assert.assertEquals(UnknownFileResource.class, resource.getClass());
+   }
+
    @Test
    public void testCreateFileResource() throws Exception
    {
@@ -61,6 +71,19 @@ public void testCreateDirectoryResource() throws Exception
       dir.delete();
       dir.mkdir();
 
+      Resource<File> resource = factory.create(dir);
+      Assert.assertNotNull(resource);
+      Assert.assertTrue(resource.exists());
+      Assert.assertTrue(resource instanceof DirectoryResource);
+   }
+
+   @Test
+   public void testCreateDirectoryResourceViaRiefy() throws Exception
+   {
+      File dir = File.createTempFile("temp", "file");
+      dir.delete();
+      dir.mkdir();
+
       File child = new File(dir, "child");
       child.mkdir();