SEAM-50 disable BookingAgentTest on glassfish

seam · Mar 26, 2011 · 206e50f · 206e50f
1 parent e1cf8f0
commit 206e50f
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 18 deletions.
diff --git a/booking/pom.xml b/booking/pom.xml
@@ -410,6 +410,16 @@
                 </dependency>
             </dependencies>
             <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                           <excludes>
+                               <exclude>org/jboss/seam/examples/booking/booking/BookingAgentTest.java</exclude>
+                           </excludes>
+                        </configuration>
+                    </plugin>                    
+                </plugins>
                 <testResources>
                     <testResource>
                         <directory>src/test/resources</directory>

diff --git a/booking/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java b/booking/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java
@@ -19,8 +19,6 @@
 import java.util.HashMap;
 
 import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
@@ -54,18 +52,16 @@ public static WebArchive createDeployment() {
         return ShrinkWrap
                 .create(WebArchive.class, "test.war")
                 .addPackage(Hotel.class.getPackage())
-                .addClasses(BookingAgent.class, BookingAgent.class, Confirmed.class, Authenticated.class, DefaultBundleKey.class)
+                .addClasses(BookingAgent.class, BookingAgent.class, Confirmed.class, Authenticated.class, DefaultBundleKey.class, TestAuthenticatedUserProducer.class)
                 .addPackage(BookingLog.class.getPackage())
                 .addAsLibraries(
+                        MavenArtifactResolver.resolve("joda-time:joda-time:1.6"),
                         MavenArtifactResolver.resolve("org.jboss.seam.solder:seam-solder:3.0.0.CR4"),
                         MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international:3.0.0.CR4"))
                 .addAsWebInfResource("test-persistence.xml", "classes/META-INF/persistence.xml")
                 .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
     }
 
-    @Inject
-    BeanManager beanManager;
-
     @Inject
     UserTransaction utx;
 
@@ -120,10 +116,4 @@ public void testBookHotel() throws Exception {
             }
         }
     }
-
-    @Produces
-    @Authenticated
-    User getRegisteredUser() {
-        return em.find(User.class, "ike");
-    }
 }
diff --git a/.../src/test/java/org/jboss/seam/examples/booking/booking/TestAuthenticatedUserProducer.java b/.../src/test/java/org/jboss/seam/examples/booking/booking/TestAuthenticatedUserProducer.java
@@ -0,0 +1,19 @@
+package org.jboss.seam.examples.booking.booking;
+
+import javax.enterprise.inject.Produces;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.examples.booking.account.Authenticated;
+import org.jboss.seam.examples.booking.model.User;
+
+public class TestAuthenticatedUserProducer {
+    @PersistenceContext
+    EntityManager em;
+
+    @Produces
+    @Authenticated
+    public User getRegisteredUser() {
+        return em.find(User.class, "ike");
+    }
+}
diff --git a/booking/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTest.java b/booking/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTest.java
@@ -46,6 +46,7 @@ public static Archive<?> createTestArchive() {
                 .addPackage(HotelSearch.class.getPackage())
                 .addPackage(Hotel.class.getPackage())
                 .addAsLibraries(
+                        MavenArtifactResolver.resolve("joda-time:joda-time:1.6"),
                         MavenArtifactResolver.resolve("org.jboss.seam.solder:seam-solder:3.0.0.CR4"),
                         MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international:3.0.0.CR4"))
                 .addAsWebInfResource("test-persistence.xml", "classes/META-INF/persistence.xml")

diff --git a/booking/src/test/resources/arquillian.xml b/booking/src/test/resources/arquillian.xml
@@ -2,20 +2,17 @@
 <arquillian xmlns="http://jboss.com/arquillian"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:jbossas-remote="urn:arq:org.jboss.arquillian.container.jbossas.remote_6"
-   xmlns:glassfish-remote="urn:arq:org.jboss.arquillian.container.glassfish.remote_3"
    xmlns:glassfish-embedded="urn:arq:org.jboss.arquillian.container.glassfish.embedded_3">
 
+   <!--
    <engine>
-      <deploymentExportPath>/tmp/</deploymentExportPath>
+      <deploymentExportPath>target</deploymentExportPath>
    </engine>
+   -->
 
    <jbossas-remote:container>
       <jbossas-remote:remoteServerHttpPort>8080</jbossas-remote:remoteServerHttpPort>
    </jbossas-remote:container>
-
-   <glassfish-remote:container>
-      <glassfish-remote:remoteServerHttpPort>7070</glassfish-remote:remoteServerHttpPort>
-   </glassfish-remote:container>
 
    <glassfish-embedded:container>
       <glassfish-embedded:bindHttpPort>7070</glassfish-embedded:bindHttpPort>