Merge pull request #99 from aslakknutsen/arquillian

arun-gupta · arun-gupta · commit b6c185506335 · 2013-11-12T02:04:40.000-08:00
Add Wildfly Managed/Remote and Glassfish Embedded Arquillian profiles
diff --git a/jaxrs/jaxrs-endpoint/src/test/java/org/javaee7/jaxrs/endpoint/MyResourceTest.java b/jaxrs/jaxrs-endpoint/src/test/java/org/javaee7/jaxrs/endpoint/MyResourceTest.java
@@ -6,26 +6,31 @@
 
 package org.javaee7.jaxrs.endpoint;
 
+import static org.junit.Assert.assertEquals;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
+
 import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.TargetsContainer;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.FixMethodOrder;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 
 /**
  * @author Arun Gupta
  */
-//@RunWith(Arquillian.class)
+@RunWith(Arquillian.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class MyResourceTest {
 
@@ -37,8 +42,7 @@ public class MyResourceTest {
      *
      * @return a war file
      */
-    @Deployment
-//    @TargetsContainer("wildfly-arquillian")
+    @Deployment(testable = false)
     public static WebArchive createDeployment() {
         WebArchive war = ShrinkWrap.create(WebArchive.class).
                 addClass(MyApplication.class).
@@ -49,10 +53,13 @@ public static WebArchive createDeployment() {
         return war;
     }
     
-    @BeforeClass
-    public static void setupClass() {
+    @ArquillianResource
+    private URL base;
+
+    @Before
+    public void setupClass() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target("http://localhost:8080/jaxrs-endpoint/webresources/fruit");
+        target = client.target(new URL(base, "webresources/fruit").toExternalForm());
     }
     
     /**
diff --git a/jaxrs/jaxrs-endpoint/src/test/resources/arquillian.xml b/jaxrs/jaxrs-endpoint/src/test/resources/arquillian.xml
@@ -1,16 +1,14 @@
-<arquillian xmlns="http://jboss.org/schema/arquillian"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-        http://jboss.org/schema/arquillian
-        http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-	<!-- defaultProtocol type="Servlet 3.0" /-->
-	<engine>
-		<property name="deploymentExportPath">${serverRoot:/opt/programs/wildfly-8.0.0.Beta1}/standalone/deployments</property>
-	</engine>
-	<container qualifier="wildfly-arquillian" default="true">
-		<configuration>
-			<property name="jbossHome">${serverRoot:/opt/programs/wildfly-8.0.0.Beta1}</property>
-			<property name="serverConfig">${serverProfile:standalone-full.xml}</property>
-		</configuration>
-	</container>
-</arquillian>
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian" xsi:schemaLocation="http://jboss.org/schema/arquillian
+                         http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+    <defaultProtocol type="Servlet 3.0"/>
+
+    <container qualifier="test" default="true">
+        <configuration>
+            <property name="jbossHome">${serverRoot:target/wildfly-8.0.0.Beta1}</property>
+            <property name="serverConfig">${serverProfile:standalone-full.xml}</property>
+        </configuration>
+    </container>
+
+</arquillian>
diff --git a/pom.xml b/pom.xml
