updated tests

Jared Nagle · Jared Nagle · commit d7f5d89a13be · 2013-08-24T14:01:58.000+10:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/testing/src/test/java/com/thenaglecode/core/SecurityTests.java b/testing/src/test/java/com/thenaglecode/core/SecurityTests.java
@@ -17,6 +17,9 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import static junit.framework.Assert.assertNotNull;
 
 /**
@@ -40,6 +43,8 @@ public class SecurityTests {
             "user"
     };
 
+    private static final Set<User> USERS = new HashSet<>();
+
     @EJB
     TransactionUtil txUtil;
 
@@ -59,11 +64,11 @@ public static JavaArchive createDeployment() {
 
     @Before
     public void init() {
-        deleteData();
-        insertData();
+        deleteAllUsers();
+        insertTestUsersData();
     }
 
-    private void deleteData() {
+    private void deleteAllUsers() {
         txUtil.wrapInTx(new TransactionUtil.Invokable() {
             @Override
             public void invoke() {
@@ -72,7 +77,7 @@ public void invoke() {
         });
     }
 
-    private void insertData() {
+    private void insertTestUsersData() {
         txUtil.wrapInTx(new TransactionUtil.Invokable() {
             @Override
             public void invoke() {
@@ -81,7 +86,10 @@ public void invoke() {
                 for (String username : USER_NAMES) {
                     users[i++] = new User(username);
                 }
-                for (User user : users) em.persist(user);
+                for (User user : users) {
+                    em.persist(user);
+                    USERS.add(user);
+                }
             }
         });
     }
diff --git a/web/web.iml b/web/web.iml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
