Modify deployment.

kevinpollet · Jul 13, 2011 · 9dafe06 · 9dafe06
1 parent 4da1dbb
commit 9dafe06
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/src/test/java/com/github/kevinpollet/sample/cdi/test/interceptor/BarInterceptorTest.java b/src/test/java/com/github/kevinpollet/sample/cdi/test/interceptor/BarInterceptorTest.java
@@ -19,7 +19,7 @@
 import com.github.kevinpollet.sample.cdi.test.util.Deployments;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,8 +35,9 @@
 @RunWith(Arquillian.class)
 public class BarInterceptorTest {
 
+   // ARQ-403
    @Deployment
-   public static Archive<?> deployment() {
+   public static JavaArchive deployment() {
       return Deployments.baseDeployment()
             .addClass(BarInterceptorTest.class)
             .addClass(GreetingService.class)

diff --git a/src/test/java/com/github/kevinpollet/sample/cdi/test/interceptor/FooInterceptorTest.java b/src/test/java/com/github/kevinpollet/sample/cdi/test/interceptor/FooInterceptorTest.java
@@ -19,7 +19,7 @@
 import com.github.kevinpollet.sample.cdi.test.util.Deployments;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,7 +36,7 @@
 public class FooInterceptorTest {
 
    @Deployment
-   public static Archive<?> deployment() {
+   public static JavaArchive deployment() {
       return Deployments.baseDeployment()
             .addClass(FooInterceptorTest.class)
             .addClass(GreetingService.class)

diff --git a/src/test/java/com/github/kevinpollet/sample/cdi/test/util/Deployments.java b/src/test/java/com/github/kevinpollet/sample/cdi/test/util/Deployments.java
@@ -17,32 +17,20 @@
 
 import com.github.kevinpollet.sample.cdi.SampleExtension;
 import com.github.kevinpollet.sample.cdi.interceptor.Foo;
-import org.jboss.shrinkwrap.api.GenericArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
-import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
 
 /**
  * @author Kevin Pollet
  */
 public class Deployments {
 
-   public static WebArchive baseDeployment() {
-      return ShrinkWrap.create(WebArchive.class)
-            .addAsLibrary(
-                  ShrinkWrap.create(JavaArchive.class)
-                        .addPackage(SampleExtension.class.getPackage())
-                        .addPackage(Foo.class.getPackage())
-                        .addAsManifestResource(Foo.class.getResource("/META-INF/services/javax.enterprise.inject.spi.Extension"), "/services/javax.enterprise.inject.spi.Extension")
-                        .addAsManifestResource(Foo.class.getResource("/META-INF/beans.xml"), "beans.xml")
-            )
-            .addAsLibraries(
-                  DependencyResolvers.use(MavenDependencyResolver.class)
-                        .loadReposFromPom("pom.xml")
-                        .artifact("org.jboss.seam.solder:seam-solder")
-                        .resolveAs(GenericArchive.class)
-            );
+   // ARQ-403, Open Web Beans embedded container doesn't support WebArchive
+   public static JavaArchive baseDeployment() {
+      return ShrinkWrap.create(JavaArchive.class)
+            .addPackage(SampleExtension.class.getPackage())
+            .addPackage(Foo.class.getPackage())
+            .addAsManifestResource(Foo.class.getResource("/META-INF/services/javax.enterprise.inject.spi.Extension"), "/services/javax.enterprise.inject.spi.Extension")
+            .addPackages(true, "org.jboss.seam.solder");
    }
 }
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
@@ -18,7 +18,7 @@
             xsi:schemaLocation="http://jboss.org/schema/arquillian
               http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
-   <container qualifier="jboss">
+   <container qualifier="jboss" default="true">
       <protocol type="jmx-as7">
          <property name="executionType">REMOTE</property>
       </protocol>