Cleaned Tests and changed to usage of EmptyAsset

forge · Dec 20, 2012 · fb64a78 · fb64a78
1 parent de993b2
commit fb64a78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/resource/impl/src/test/java/org/jboss/forge/test/resource/ResourceGeneratorAddonTest.java b/resource/impl/src/test/java/org/jboss/forge/test/resource/ResourceGeneratorAddonTest.java
@@ -13,7 +13,7 @@
 import org.jboss.forge.resource.ResourceFactory;
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,7 +28,7 @@ public class ResourceGeneratorAddonTest
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
-               .addAsManifestResource(new StringAsset(""), ArchivePaths.create("beans.xml"))
+               .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
                .addAsAddonDependencies(
                         AddonDependency.create(AddonId.from("resources", "1"), false, false),
                         AddonDependency.create(AddonId.from("mockstring", "1"), false, false));
@@ -42,7 +42,7 @@ public static ForgeArchive getResourcesDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addPackages(true, ResourceFactory.class.getPackage())
-               .addAsManifestResource(new StringAsset(""), ArchivePaths.create("beans.xml"))
+               .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
                .addAsAddonDependencies(
                         AddonDependency.create(AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT"), true, false));
 
@@ -54,7 +54,7 @@ public static ForgeArchive getAddonDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addClasses(MockStringResource.class, MockStringResourceGenerator.class)
-               .addAsManifestResource(new StringAsset(""), ArchivePaths.create("beans.xml"))
+               .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
                .addAsAddonDependencies(
                         AddonDependency.create(AddonId.from("resources", "1"), false, false));
 

diff --git a/ui/impl/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionTest.java b/ui/impl/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionTest.java
@@ -11,8 +11,6 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.arquillian.Addon;
-import org.jboss.forge.arquillian.Dependencies;
 import org.jboss.forge.arquillian.archive.ForgeArchive;
 import org.jboss.forge.ui.UI;
 import org.jboss.forge.ui.UIInput;
@@ -27,15 +25,13 @@
 public class UIInputInjectionTest
 {
    @Deployment
-   @Dependencies(@Addon(name = "org.jboss.forge:facets", version = "2.0.0-SNAPSHOT"))
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)
                .addPackages(true, UI.class.getPackage())
                .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
 
-      System.out.println(archive);
       return archive;
    }