From 929483f3e2c65bf6587fba4bfcd3abeb15a17fb6 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 12 Jun 2013 14:36:57 +1000 Subject: [PATCH 1/2] Disabled orm.xml in non-container persistence.xml \n To disable automatic entity security check --- zanata-war/src/test/resources/META-INF/persistence.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zanata-war/src/test/resources/META-INF/persistence.xml b/zanata-war/src/test/resources/META-INF/persistence.xml index ed92aef780..ef5f3d72c7 100755 --- a/zanata-war/src/test/resources/META-INF/persistence.xml +++ b/zanata-war/src/test/resources/META-INF/persistence.xml @@ -17,7 +17,7 @@ See also zanata-model/src/test/resources/META-INF/persistence.xml. --> - META-INF/orm.xml + org.zanata.model.HAccountActivationKey org.zanata.model.HAccount From 4edb0a342d10962c57ad1964fb3c3a49a49a500d Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 12 Jun 2013 15:04:17 +1000 Subject: [PATCH 2/2] Change from em=null to em.close to close entity manager --- .../test/java/org/zanata/ZanataJpaTest.java | 51 +++++++++---------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java index 1639594f4f..8478bc4f28 100644 --- a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java +++ b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java @@ -1,24 +1,19 @@ package org.zanata; -import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; - import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.persister.collection.AbstractCollectionPersister; import org.hibernate.persister.entity.EntityPersister; import org.jboss.seam.log.Log; import org.jboss.seam.log.Logging; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.AfterSuite; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.BeforeSuite; -import org.testng.annotations.Listeners; -import org.testng.annotations.Test; +import org.testng.annotations.*; import org.zanata.testng.TestMethodListener; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +import java.util.Map; + @Listeners(TestMethodListener.class) @Test(groups = { "jpa-tests" }) public abstract class ZanataJpaTest @@ -46,7 +41,7 @@ public void shutdownEM() log.debug("Shutting down EM"); clearHibernateSecondLevelCache(); em.getTransaction().rollback(); - em = null; + em.close(); } protected EntityManager getEm() @@ -83,10 +78,10 @@ public void shutDownEMF() emf.close(); emf = null; } - + /** - * Commits the changes on the current session and starts a new one. - * This method is useful whenever multi-session tests are needed. + * Commits the changes on the current session and starts a new one. This + * method is useful whenever multi-session tests are needed. * * @return The newly started session */ @@ -98,10 +93,10 @@ protected Session newSession() } /** - * This method is used to test multiple Entity Managers (or hibernate sessions) - * working together simultaneously. Use {@link org.zanata.ZanataJpaTest#getEm()} - * for all other tests. - * + * This method is used to test multiple Entity Managers (or hibernate + * sessions) working together simultaneously. Use + * {@link org.zanata.ZanataJpaTest#getEm()} for all other tests. + * * @return A new instance of an entity manager. */ protected EntityManager newEntityManagerInstance() @@ -114,27 +109,27 @@ protected EntityManager newEntityManagerInstance() */ protected void clearHibernateSecondLevelCache() { - SessionFactory sessionFactory = ((Session)em.getDelegate()).getSessionFactory(); + SessionFactory sessionFactory = ((Session) em.getDelegate()).getSessionFactory(); // Clear the Entity cache Map classMetadata = sessionFactory.getAllClassMetadata(); - for( Object obj : classMetadata.values() ) + for (Object obj : classMetadata.values()) { - EntityPersister p = (EntityPersister)obj; - if( p.hasCache() ) + EntityPersister p = (EntityPersister) obj; + if (p.hasCache()) { - sessionFactory.evictEntity( p.getEntityName() ); + sessionFactory.evictEntity(p.getEntityName()); } } // Clear the Collection cache Map collMetadata = sessionFactory.getAllCollectionMetadata(); - for( Object obj : collMetadata.values() ) + for (Object obj : collMetadata.values()) { - AbstractCollectionPersister p = (AbstractCollectionPersister)obj; - if( p.hasCache() ) + AbstractCollectionPersister p = (AbstractCollectionPersister) obj; + if (p.hasCache()) { - sessionFactory.evictCollection( p.getRole() ); + sessionFactory.evictCollection(p.getRole()); } } }