Simplified JPA converter test

Author: arjantijms

jpa/jpa-converter/pom.xml

@@ -6,9 +6,10 @@
         <groupId>org.javaee7</groupId>
         <artifactId>jpa</artifactId>
         <version>1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
     </parent>
+    
     <artifactId>jpa-jpa-converter</artifactId>
     <packaging>jar</packaging>
+    
     <name>Java EE 7 Sample: jpa-converter</name>
 </project>

jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCard.java

@@ -6,7 +6,10 @@
  * @author Arun Gupta
  */
 public class CreditCard implements Serializable {
-    String cardNumber;
+
+    private static final long serialVersionUID = 1L;
+    
+    private String cardNumber;
 
     public CreditCard() {
     }

jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/Employee.java

@@ -1,7 +1,7 @@
 package org.javaee7.jpa.converter;
 
 import java.io.Serializable;
-import java.util.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -19,6 +19,7 @@
     @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e")
 })
 public class Employee implements Serializable {
+    
     private static final long serialVersionUID = 1L;
 
     @Id

jpa/jpa-converter/src/test/java/org/javaee7/jpa/converter/EmployeeRepositoryTest.java

@@ -1,76 +1,65 @@
 package org.javaee7.jpa.converter;
 
+import static java.util.Arrays.asList;
+import static org.jboss.shrinkwrap.api.ArchivePaths.create;
+import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+import static org.jboss.shrinkwrap.api.asset.EmptyAsset.INSTANCE;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Filters;
-import org.jboss.shrinkwrap.api.GenericArchive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.FileAsset;
-import org.jboss.shrinkwrap.api.importer.ExplodedImporter;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.inject.Inject;
-import java.io.File;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 @RunWith(Arquillian.class)
 public class EmployeeRepositoryTest {
 
     @Deployment
-    public static Archive<?> createDeployment() {
-        final File[] assertJ = Maven.resolver().loadPomFromFile("pom.xml")
-            .resolve("org.assertj:assertj-core")
-            .withTransitivity()
-            .asFile();
-
-        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "employee-card-converter-sample.jar")
-            .addPackage(Employee.class.getPackage())
-            .addAsManifestResource("test-persistence.xml", "persistence.xml")
-            .merge(metaInfFolder(), "/META-INF", Filters.include(".*\\.sql"));
-        mergeDependencies(archive, assertJ);
-
-        return archive;
-
+    public static WebArchive createDeployment() {
+        WebArchive war = create(WebArchive.class)
+                .addPackage("org.javaee7.jpa.converter")
+                .addAsResource("META-INF/persistence.xml")
+                .addAsResource("META-INF/create.sql")
+                .addAsResource("META-INF/drop.sql")
+                .addAsResource("META-INF/load.sql")
+                .addAsWebInfResource(INSTANCE, create("beans.xml"));
+            
+            System.out.println(war.toString(true));
+            
+            return war;
     }
 
     @Inject
     private EmployeeRepository repository;
 
     @Test
     public void should_return_all_employee_records() throws Exception {
-        // when
-        final List<Employee> employees = repository.all();
+        
+        // When
+        final List<Employee> actualEmployees = repository.all();
 
-        // then
-        assertThat(employees).hasSize(6)
-            .contains(employee("Leonard", "11-22-33-44"), employee("Sheldon", "22-33-44-55"),
-                employee("Penny", "33-44-55-66"), employee("Raj", "44-55-66-77"),
-                employee("Howard", "55-66-77-88"), employee("Bernadette", "66-77-88-99"));
+        // Then
+        assertTrue(actualEmployees.size() == 6);
+        
+        List<Employee> expectedEmployees = asList(
+            employee("Leonard", "11-22-33-44"), employee("Sheldon", "22-33-44-55"),
+            employee("Penny", "33-44-55-66"), employee("Raj", "44-55-66-77"),
+            employee("Howard", "55-66-77-88"), employee("Bernadette", "66-77-88-99"));
+        
+        for (Employee employee : expectedEmployees) {
+            assertTrue(actualEmployees.contains(employee));
+        }
     }
 
-    // -- Test utility methods
+    // -- Test utility method
 
     private static Employee employee(String name, String creditCardNumber) {
-        final CreditCard creditCard = new CreditCard(creditCardNumber);
-        return new Employee(name, creditCard);
-    }
-
-    private static void mergeDependencies(JavaArchive archive, File... dependencies) {
-        for (File file : dependencies) {
-            archive.merge(ShrinkWrap.createFromZipFile(JavaArchive.class, file));
-        }
-    }
-
-    private static GenericArchive metaInfFolder() {
-        return ShrinkWrap.create(GenericArchive.class)
-            .as(ExplodedImporter.class)
-            .importDirectory("src/main/resources/META-INF")
-            .as(GenericArchive.class);
+        return new Employee(name, new CreditCard(creditCardNumber));
     }
+   
 }