[jboss-svn-commits] JBoss Common SVN: r4377 - in arquillian/trunk/containers/glassfish-embedded-30: src/test/java/org/jboss/arquillian/glassfish and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-05-09 17:49:03 -0400 (Sun, 09 May 2010)
New Revision: 4377

Modified:
   arquillian/trunk/containers/glassfish-embedded-30/pom.xml
   arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/GlassFishEmbeddedContainerTestCase.java
Log:
[ARQ-137] Use @RunWish(Arquillian.class) in the GFv3 integration test

Modified: arquillian/trunk/containers/glassfish-embedded-30/pom.xml
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/pom.xml	2010-05-09 20:24:56 UTC (rev 4376)
+++ arquillian/trunk/containers/glassfish-embedded-30/pom.xml	2010-05-09 21:49:03 UTC (rev 4377)
@@ -97,6 +97,13 @@
          <version>${project.version}</version>
          <scope>test</scope>
       </dependency>
+      
+      <dependency>
+        <groupId>org.jboss.arquillian</groupId>
+        <artifactId>arquillian-junit</artifactId>
+        <version>${project.version}</version>
+        <scope>test</scope>
+      </dependency>
 
       <dependency>
          <groupId>junit</groupId>

Modified: arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/GlassFishEmbeddedContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/GlassFishEmbeddedContainerTestCase.java	2010-05-09 20:24:56 UTC (rev 4376)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/GlassFishEmbeddedContainerTestCase.java	2010-05-09 21:49:03 UTC (rev 4377)
@@ -19,50 +19,49 @@
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.logging.Logger;
 
-import org.jboss.arquillian.impl.DynamicServiceLoader;
-import org.jboss.arquillian.impl.XmlConfigurationBuilder;
-import org.jboss.arquillian.impl.context.SuiteContext;
-import org.jboss.arquillian.spi.Context;
-import org.jboss.arquillian.spi.DeployableContainer;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.api.RunMode;
+import org.jboss.arquillian.api.RunModeType;
+import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
+
 /**
  * GlassFishEmbeddedContainerTestCase
  *
  * @author <a href="mailto:aslak at redhat.com">Aslak Knutsen</a>
  * @version $Revision: $
  */
+ at RunWith(Arquillian.class)
+ at RunMode(RunModeType.LOCAL)
 public class GlassFishEmbeddedContainerTestCase 
 {
-   private DeployableContainer container;
-   
-   private Context context = new SuiteContext(new DynamicServiceLoader());
-   
-   private WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
-                              .addClass(TestServlet.class);
 
-   @Before
-   public void startup() throws Exception
+   /**
+    * Logger
+    */
+   private static final Logger log = Logger.getLogger(GlassFishEmbeddedContainerTestCase.class.getName());
+   
+   /**
+    * Deployment for the test
+    * @return
+    */
+   @Deployment
+   public static WebArchive getDeployment()
    {
-      container = new GlassFishEmbeddedContainer();
-      container.setup(context, new XmlConfigurationBuilder().build());
-      container.start(context);
-      container.deploy(context, war);
-   }
+      final WebArchive war = ShrinkWrap.create("test.war", WebArchive.class).addClass(TestServlet.class);
+      log.info(war.toString(true));
+      return war;
 
-   @After
-   public void shutdown() throws Exception
-   {
-      container.undeploy(context, war);
-      container.stop(context);
    }
 
+
    @Test
    public void shouldBeAbleToDeployWebArchive() throws Exception
    {