From f4fdd766e5393220fd0e7b54a57de9d4dde02cca Mon Sep 17 00:00:00 2001
From: arun-gupta <arun.gupta@gmail.com>
Date: Mon, 8 Dec 2014 22:25:14 +0100
Subject: [PATCH 1/3] starting to add Arquillian deps

---
 solution/movieplex7/pom.xml | 81 +++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/solution/movieplex7/pom.xml b/solution/movieplex7/pom.xml
index ba0863e..a081f5f 100644
--- a/solution/movieplex7/pom.xml
+++ b/solution/movieplex7/pom.xml
@@ -8,7 +8,24 @@
     <packaging>war</packaging>
 
     <name>Java EE 7 Hands-on Lab Solution</name>
+    
+    <properties>
+        <org.jboss.arquillian.version>1.1.1.Final</org.jboss.arquillian.version>
+        <org.wildfly>8.2.0.Final</org.wildfly>
+    </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${org.jboss.arquillian.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
     <dependencies>
         <dependency>
             <groupId>javax</groupId>
@@ -16,6 +33,20 @@
             <version>7.0</version>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.jboss.arquillian.junit</groupId>
+            <artifactId>arquillian-junit-container</artifactId>
+            <scope>test</scope>
+            <version>1.1.5.Final</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -44,6 +75,56 @@
             </plugin>
         </plugins>
     </build>
+    
+    <profiles>
+        <profile>
+            <id>wildfly-remote-arquillian</id>
+            <dependencies>
+                <dependency>
+                    <groupId>io.undertow</groupId>
+                    <artifactId>undertow-websockets-jsr</artifactId>
+                    <version>1.0.0.Beta33</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-client</artifactId>
+                    <version>3.0.10.Final</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-jaxb-provider</artifactId>
+                    <version>3.0.10.Final</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-json-p-provider</artifactId>
+                    <version>3.0.10.Final</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
+                    <version>${org.wildfly}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <testResources>
+                    <testResource>
+                        <directory>src/test/resources</directory>
+                        <filtering>true</filtering>
+                    </testResource>
+                    <testResource>
+                        <directory>src/test/resources-wildfly-remote</directory>
+                        <filtering>true</filtering>
+                    </testResource>
+                </testResources>
+            </build>
+        </profile>    
+    </profiles>
 
 </project>
 

From 250079fc5273a3b90a1122e5f18a07b0cf37ddf7 Mon Sep 17 00:00:00 2001
From: arun-gupta <arun.gupta@gmail.com>
Date: Mon, 8 Dec 2014 22:28:04 +0100
Subject: [PATCH 2/3] adding first test - not working yet

---
 .../movieplex7/rest/MovieFacadeRESTTest.java  | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 solution/movieplex7/src/test/java/org/javaee7/movieplex7/rest/MovieFacadeRESTTest.java

diff --git a/solution/movieplex7/src/test/java/org/javaee7/movieplex7/rest/MovieFacadeRESTTest.java b/solution/movieplex7/src/test/java/org/javaee7/movieplex7/rest/MovieFacadeRESTTest.java
new file mode 100644
index 0000000..9e3b4bb
--- /dev/null
+++ b/solution/movieplex7/src/test/java/org/javaee7/movieplex7/rest/MovieFacadeRESTTest.java
@@ -0,0 +1,50 @@
+package org.javaee7.movieplex7.rest;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import org.javaee7.movieplex7.entities.Movie;
+import org.jboss.arquillian.container.test.api.Deployment;
+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.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.runner.RunWith;
+
+/**
+ * @author arungupta
+ */
+@RunWith(Arquillian.class)
+public class MovieFacadeRESTTest {
+    
+    private WebTarget target;
+
+    @Deployment(testable = false)
+    public static WebArchive createDeployment() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addPackages(true, "org.javaee7.movieplex7");
+    }
+    
+    @ArquillianResource
+    private URL base;
+
+    @Before
+    public void setUp() throws MalformedURLException {
+        Client client = ClientBuilder.newClient();
+        target = client.target(URI.create(new URL(base, "webresources/movie").toExternalForm()));
+        target.register(Movie.class);
+    }
+    
+    @Test
+    public void testGetAll() throws Exception {
+        Movie[] list = target.request().get(Movie[].class);
+        assertEquals(20, list.length);
+    }
+    
+}

From 5c8e041f3fe26b168baed401fd37367a66f2d22b Mon Sep 17 00:00:00 2001
From: arun-gupta <arun.gupta@gmail.com>
Date: Mon, 8 Dec 2014 23:06:03 +0100
Subject: [PATCH 3/3] simple test is now working

---
 .../movieplex7/rest/MovieFacadeRESTTest.java     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/solution/movieplex7/src/test/java/org/javaee7/movieplex7/rest/MovieFacadeRESTTest.java b/solution/movieplex7/src/test/java/org/javaee7/movieplex7/rest/MovieFacadeRESTTest.java
index 9e3b4bb..a0898f4 100644
--- a/solution/movieplex7/src/test/java/org/javaee7/movieplex7/rest/MovieFacadeRESTTest.java
+++ b/solution/movieplex7/src/test/java/org/javaee7/movieplex7/rest/MovieFacadeRESTTest.java
@@ -1,5 +1,6 @@
 package org.javaee7.movieplex7.rest;
 
+import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -24,11 +25,24 @@
 public class MovieFacadeRESTTest {
     
     private WebTarget target;
+    private static final String WEBAPP_SRC = "src/main/webapp";
+    private static final String RESOURCE_SRC = "src/main/resources";
 
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
-        return ShrinkWrap.create(WebArchive.class)
+        WebArchive war = ShrinkWrap.create(WebArchive.class)
                 .addPackages(true, "org.javaee7.movieplex7");
+        
+        for (File file : new File(WEBAPP_SRC + "/WEB-INF").listFiles()) {
+            war.addAsWebInfResource(file);
+        }
+        
+        for (File file : new File(RESOURCE_SRC).listFiles()) {
+            war.addAsResource(file);
+        }
+        
+        System.out.println(war.toString(true));
+        return war;
     }
     
     @ArquillianResource