HHH-7187 - Moving AbstractEntityTest

skowronm · Apr 19, 2012 · c41fee2 · c41fee2
1 parent c7aa99d
commit c41fee2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java
@@ -29,7 +29,7 @@ public abstract class AbstractOneSessionTest extends AbstractEnversTest  {
 	protected Configuration config;
 	private ServiceRegistry serviceRegistry;
 	private SessionFactory sessionFactory;
-	private Session session ;
+	private Session session;
 	private AuditReader auditReader;
 
 	@BeforeClassOnce
@@ -60,7 +60,6 @@ protected String getHibernateConfigurationFileName(){
 		return "hibernate.test.session-cfg.xml";
 	}
 
-
 	private SessionFactory getSessionFactory(){
 		return sessionFactory;
     }

diff --git a/...ers/src/matrix/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java b/...ers/src/matrix/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java
@@ -26,11 +26,11 @@
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
 import org.junit.Test;
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.hibernate.envers.query.AuditEntity;
-import org.hibernate.envers.test.AbstractEntityTest;
 import org.hibernate.envers.test.Priority;
 import org.hibernate.envers.test.entities.StrIntTestEntity;
 import org.hibernate.envers.test.entities.reventity.CustomRevEntity;
@@ -39,7 +39,7 @@
  * @author Adam Warski (adam at warski dot org)
  */
 @SuppressWarnings({"unchecked"})
-public class CustomRevEntityQuery extends AbstractEntityTest {
+public class CustomRevEntityQuery extends BaseEnversJPAFunctionalTestCase {
     private Integer id1;
     private Integer id2;
     private Long timestamp;

diff --git a/...rnate/envers/test/AbstractEntityTest.java → ...erformance/AbstractEntityManagerTest.java b/...rnate/envers/test/AbstractEntityTest.java → ...erformance/AbstractEntityManagerTest.java
@@ -21,12 +21,13 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.envers.test;
+package org.hibernate.envers.test.performance;
 
 import java.io.IOException;
 import java.util.Properties;
 import javax.persistence.EntityManager;
 
+import org.hibernate.envers.test.AbstractEnversTest;
 import org.junit.Before;
 
 import org.hibernate.cfg.Environment;
@@ -46,7 +47,7 @@
  * @author Adam Warski (adam at warski dot org)
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
-public abstract class AbstractEntityTest extends AbstractEnversTest {
+public abstract class AbstractEntityManagerTest extends AbstractEnversTest {
     public static final Dialect DIALECT = Dialect.getDialect();
 
     private EntityManagerFactoryImpl emf;

diff --git a/...envers/src/matrix/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java b/...envers/src/matrix/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java
@@ -26,12 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.envers.test.AbstractEntityTest;
-
 /**
  * @author Adam Warski (adam at warski dot org)
  */
-public abstract class AbstractPerformanceTest extends AbstractEntityTest {
+public abstract class AbstractPerformanceTest extends AbstractEntityManagerTest {
     protected String getSecondsString(long milliseconds) {
         return (milliseconds/1000) + "." + (milliseconds%1000);
     }