svn commit: r1334960 - in /openejb/trunk/openejb/examples/multiple-tomee-arquillian: pom.xml src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java

[rmannibucau]

Author: rmannibucau
Date: Mon May  7 11:42:49 2012
New Revision: 1334960

URL: http://svn.apache.org/viewvc?rev=1334960&view=rev
Log:
following some very good advices of Aslak Knutsen for the multiple arquillian 
sample

Added:
    
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java
      - copied, changed from r1334958, 
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java
Removed:
    
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java
Modified:
    openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml

Modified: openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml?rev=1334960&r1=1334959&r2=1334960&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml (original)
+++ openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml Mon May  7 
11:42:49 2012
@@ -45,9 +45,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.12</version>
         <configuration>
-          <systemProperties> <!-- to activate the group -->
+          <systemPropertyVariables>
             <arquillian.launch>tomee-cluster</arquillian.launch>
-          </systemProperties>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
     </plugins>

Copied: 
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java
 (from r1334958, 
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java?p2=openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java&p1=openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java&r1=1334958&r2=1334960&rev=1334960&view=diff
==============================================================================
--- 
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java
 (original)
+++ 
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java
 Mon May  7 11:42:49 2012
@@ -17,25 +17,16 @@ import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
 
-@RunAsClient // can be replaced by testable = false in @Deployment
 @RunWith(Arquillian.class)
-public class MultipleTomEETests {
-    @ArquillianResource
-    @OperateOnDeployment("war1")
-    private URL url1;
-
-    @ArquillianResource
-    @OperateOnDeployment("war2")
-    private URL url2;
-
-    @Deployment(name = "war1")
+public class MultipleTomEETest {
+    @Deployment(name = "war1", testable = false)
     @TargetsContainer("tomee-1")
     public static WebArchive createDep1() {
         return ShrinkWrap.create(WebArchive.class, "application1.war")
                 .addAsWebResource(new StringAsset("Hello from TomEE 1"), 
"index.html");
     }
 
-    @Deployment(name = "war2")
+    @Deployment(name = "war2", testable = false)
     @TargetsContainer("tomee-2")
     public static WebArchive createDep2() {
         return ShrinkWrap.create(WebArchive.class, "application2.war")
@@ -44,15 +35,15 @@ public class MultipleTomEETests {
 
     @Test
     @OperateOnDeployment("war1")
-    public void testRunningInDep1() throws IOException {
-        final String content = IO.slurp(url1);
+    public void testRunningInDep1(@ArquillianResource final URL url) throws 
IOException {
+        final String content = IO.slurp(url);
         assertEquals("Hello from TomEE 1", content);
     }
 
     @Test
     @OperateOnDeployment("war2")
-    public void testRunningInDep2() throws IOException {
-        final String content = IO.slurp(url2);
+    public void testRunningInDep2(@ArquillianResource final URL url) throws 
IOException {
+        final String content = IO.slurp(url);
         assertEquals("Hello from TomEE 2", content);
     }
 }