Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-7187 - Moving AbstractEntityTest

This commit is contained in:
Lukasz Antoniak 2012-04-18 22:29:34 +02:00 committed by Strong Liu
parent c7aa99d0d3
commit c41fee2a07
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java
View File

@ -29,7 +29,7 @@ public abstract class AbstractOneSessionTest extends AbstractEnversTest {
protected Configuration config; protected Configuration config;
private ServiceRegistry serviceRegistry; private ServiceRegistry serviceRegistry;
private SessionFactory sessionFactory; private SessionFactory sessionFactory;
private Session session ; private Session session;
private AuditReader auditReader; private AuditReader auditReader;
@BeforeClassOnce @BeforeClassOnce
@ -60,7 +60,6 @@ public abstract class AbstractOneSessionTest extends AbstractEnversTest {
return "hibernate.test.session-cfg.xml"; return "hibernate.test.session-cfg.xml";
} }
private SessionFactory getSessionFactory(){ private SessionFactory getSessionFactory(){
return sessionFactory; return sessionFactory;
} }

4
hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java
View File

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

5
hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractEntityTest.java → hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
View File

@ -21,12 +21,13 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test; package org.hibernate.envers.test.performance;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import org.hibernate.envers.test.AbstractEnversTest;
import org.junit.Before; import org.junit.Before;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
@ -46,7 +47,7 @@ import org.hibernate.testing.BeforeClassOnce;
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) * @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(); public static final Dialect DIALECT = Dialect.getDialect();
private EntityManagerFactoryImpl emf; private EntityManagerFactoryImpl emf;

4
hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java
View File

@ -26,12 +26,10 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.hibernate.envers.test.AbstractEntityTest;
/** /**
* @author Adam Warski (adam at warski dot org) * @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) { protected String getSecondsString(long milliseconds) {
return (milliseconds/1000) + "." + (milliseconds%1000); return (milliseconds/1000) + "." + (milliseconds%1000);
} }