Merge pull request #4 from romainsuire/deploytest

Dependency injection does not works when a WAR archive is deployed
forge · Oct 11, 2015 · 6e2de25 · 6e2de25
2 parents 8fa0ba8 + 3333f7f
commit 6e2de25
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/main/java/org/jboss/forge/arquillian/command/ArchiveType.java b/src/main/java/org/jboss/forge/arquillian/command/ArchiveType.java
@@ -16,16 +16,18 @@
  */
 public enum ArchiveType
 {
-   JAR("org.jboss.shrinkwrap.api.spec.JavaArchive"),
-   WAR("org.jboss.shrinkwrap.api.spec.WebArchive");
+   JAR("org.jboss.shrinkwrap.api.spec.JavaArchive","addAsManifestResource"),
+   WAR("org.jboss.shrinkwrap.api.spec.WebArchive","addAsWebInfResource");
 
    private final String className;
    private final String simpleClassName;
+   private final String beansXmlLocationAdder;
 
-   private ArchiveType(String className)
+   private ArchiveType(String className,String beansXmlLocationAdder)
    {
       this.className = className;
       this.simpleClassName = Types.toSimpleName(className);
+      this.beansXmlLocationAdder = beansXmlLocationAdder;
    }
 
    public String getClassName()
@@ -37,4 +39,13 @@ public String getSimpleClassName()
    {
       return simpleClassName;
    }
+
+   public String getBeansXmlLocationAdder()
+   {
+      return beansXmlLocationAdder;
+   }
+
+
+
+
 }
diff --git a/src/main/resources/JUnitTest.vtl b/src/main/resources/JUnitTest.vtl
@@ -26,7 +26,7 @@ public class ${ClassToTest}Test {
                 #if($enableJPA)
                 .addAsManifestResource("META-INF/persistence.xml", "persistence.xml")
                 #end
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .${archiveType.beansXmlLocationAdder}(EmptyAsset.INSTANCE, "beans.xml");
     }
 
     @Test

diff --git a/src/main/resources/TestNGTest.vtl b/src/main/resources/TestNGTest.vtl
@@ -23,7 +23,7 @@ public class ${ClassToTest}Test extends Arquillian {
                 #if($enableJPA)
                 .addAsManifestResource("META-INF/persistence.xml", "persistence.xml")
                 #end
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .${archiveType.beansXmlLocationAdder}(EmptyAsset.INSTANCE, "beans.xml");
     }
 
     @Test