Using new test feature

forge · Apr 22, 2015 · 46b088b · 46b088b
1 parent ea29e7a
commit 46b088b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 33 deletions.
diff --git a/dev-tools-java/src/test/java/org/jboss/forge/addon/devtools/java/DevToolsPresenceTest.java b/dev-tools-java/src/test/java/org/jboss/forge/addon/devtools/java/DevToolsPresenceTest.java
@@ -10,10 +10,8 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.arquillian.AddonDeployment;
-import org.jboss.forge.arquillian.AddonDeployments;
+import org.jboss.forge.arquillian.AddonDependencies;
 import org.jboss.forge.arquillian.archive.AddonArchive;
-import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
 import org.junit.Test;
@@ -23,24 +21,18 @@
 public class DevToolsPresenceTest
 {
    @Deployment
-   @AddonDeployments({
-            @AddonDeployment(name = "org.jboss.forge.addon:dev-tools-java"),
-            @AddonDeployment(name = "org.jboss.forge.furnace.container:cdi") })
+   @AddonDependencies
    public static AddonArchive getDeployment()
    {
       AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
-               .addBeansXML()
-               .addAsAddonDependencies(
-                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:dev-tools-java")
-               );
+               .addBeansXML();
 
       return archive;
    }
 
    @Inject
    private RegisterAsServiceCommand command;
-   
+
    @Inject
    private JavaEqualsHashcodeCommand ehCommand;
 
@@ -49,7 +41,7 @@ public void testCommandInjection() throws Exception
    {
       Assert.assertNotNull(command);
       Assert.assertNotNull(command.toString());
-      
+
       Assert.assertNotNull(ehCommand);
       Assert.assertNotNull(ehCommand.toString());
    }

diff --git a/...-java/src/test/java/org/jboss/forge/addon/devtools/java/JavaFormatSourcesCommandTest.java b/...-java/src/test/java/org/jboss/forge/addon/devtools/java/JavaFormatSourcesCommandTest.java
@@ -24,6 +24,7 @@
 import org.jboss.forge.addon.ui.controller.CommandController;
 import org.jboss.forge.addon.ui.result.Result;
 import org.jboss.forge.addon.ui.test.UITestHarness;
+import org.jboss.forge.arquillian.AddonDependencies;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
 import org.jboss.forge.arquillian.archive.AddonArchive;
@@ -40,16 +41,7 @@
 public class JavaFormatSourcesCommandTest
 {
    @Deployment
-   @AddonDeployments({
-            @AddonDeployment(name = "org.jboss.forge.addon:parser-java"),
-            @AddonDeployment(name = "org.jboss.forge.addon:dev-tools-java"),
-            @AddonDeployment(name = "org.jboss.forge.addon:ui-test-harness"),
-            @AddonDeployment(name = "org.jboss.forge.addon:projects"),
-            @AddonDeployment(name = "org.jboss.forge.addon:maven"),
-            @AddonDeployment(name = "org.jboss.forge.furnace.container:cdi"),
-            @AddonDeployment(name = "org.jboss.forge.addon:configuration"),
-            @AddonDeployment(name = "org.jboss.forge.addon:shell-test-harness")
-   })
+   @AddonDependencies
    public static AddonArchive getDeployment()
    {
 
@@ -70,16 +62,7 @@ public static AddonArchive getDeployment()
                         "org/jboss/forge/addon/devtools/java/eclipse_profile.xml")
                .add(new FileAsset(new File(
                         "src/test/resources/org/jboss/forge/addon/devtools/java/resources/forge_profile.xml")),
-                        "org/jboss/forge/addon/devtools/java/forge_profile.xml")
-               .addAsAddonDependencies(
-                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:dev-tools-java"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:maven"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:ui-test-harness"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:shell-test-harness"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:configuration"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:resources")
-               );
+                        "org/jboss/forge/addon/devtools/java/forge_profile.xml");
       return archive;
    }