JPA mapping updates

[utils] / security / jpatest / src / test / java / org / wamblee / security / authorization / jpa / JpaAuthorizationServiceTest.java

diff --git a/security/jpatest/src/test/java/org/wamblee/security/authorization/jpa/JpaAuthorizationServiceTest.java b/security/jpatest/src/test/java/org/wamblee/security/authorization/jpa/JpaAuthorizationServiceTest.java
index 1573f4734b52efed34dc344ec45739e323c81201..d2053c2c5f42f1ee0f88cda40fd8d1dd4f719ba3 100644 (file)
--- a/security/jpatest/src/test/java/org/wamblee/security/authorization/jpa/JpaAuthorizationServiceTest.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authorization/jpa/JpaAuthorizationServiceTest.java
@@ -15,19 +15,20 @@
  */
 package org.wamblee.security.authorization.jpa;
 
+import static org.wamblee.security.authorization.AuthorizationResult.*;
+
 import javax.persistence.EntityManager;
 
 import org.apache.log4j.Logger;
-import org.wamblee.security.authorization.AbstractAuthorizationService;
+import org.wamblee.security.authentication.jpa.SecurityPersistenceUnit;
 import org.wamblee.security.authorization.AllOperation;
-import org.wamblee.security.authorization.AuthorizationResult;
+import org.wamblee.security.authorization.AuthorizationRule;
 import org.wamblee.security.authorization.AuthorizationService;
 import org.wamblee.security.authorization.AuthorizationServiceTest;
-import org.wamblee.security.authorization.TestAuthorizationRule;
+import org.wamblee.security.authorization.DefaultAuthorizationService;
 import org.wamblee.support.persistence.JpaTester;
 import org.wamblee.support.persistence.TransactionProxyFactory;
 import org.wamblee.support.persistence.JpaBuilder.JpaUnitOfWork;
-import org.wamblee.usermgt.jpa.SecurityPersistenceUnit;
 
 /**
  * Unit test for the persistent authorization service.
@@ -42,7 +43,7 @@ public class JpaAuthorizationServiceTest extends AuthorizationServiceTest {
 
     private static final String RULES_TABLE = "SEC_AUTH_RULE";
 
-    private static final String SERVICE_RULES_TABLE = "SEC_AUTH_SVC_SEC_AUTH_RULE";
+    private static final String SERVICE_RULES_TABLE = "SEC_AUTH_SVC_RULE";
 
     private static final String OPERATIONCOND_TABLE = "SEC_OPERATION_CONDITION";
 
@@ -62,6 +63,12 @@ public class JpaAuthorizationServiceTest extends AuthorizationServiceTest {
         super.setUp();
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        jpaTester.stop();
+        super.tearDown();
+    }
+
     /*
      * (non-Javadoc)
      * 
@@ -75,7 +82,7 @@ public class JpaAuthorizationServiceTest extends AuthorizationServiceTest {
             jpaTester.getJpaBuilder(), AuthorizationService.class);
         JpaAuthorizationService service = new JpaAuthorizationService(
             "DEFAULT", factory.getTransactionScopedEntityManager(),
-            createUserAccessor(), 10000);
+            getUserAccessor(), getUserAdministration(), 10000);
 
         return factory.getProxy(service);
     }