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

HHH-6014: Migrating the tests from testng to junit

This commit is contained in:
adamw 2011-04-01 21:37:59 +02:00
parent 26b5e1afa8
commit fb512cdc25
182 changed files with 1958 additions and 1903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessType.java
View File

@ -23,12 +23,13 @@
*/ */
package org.hibernate.envers.test.integration.accesstype; package org.hibernate.envers.test.integration.accesstype;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -40,7 +41,7 @@ public class FieldAccessType extends AbstractEntityTest {
cfg.addAnnotatedClass(FieldAccessTypeEntity.class); cfg.addAnnotatedClass(FieldAccessTypeEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

14
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/ImmutableClassAccessType.java
View File

@ -1,11 +1,13 @@
package org.hibernate.envers.test.integration.accesstype; package org.hibernate.envers.test.integration.accesstype;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import static org.junit.Assert.*;
public class ImmutableClassAccessType extends AbstractEntityTest { public class ImmutableClassAccessType extends AbstractEntityTest {
private Country country; private Country country;
@ -14,7 +16,7 @@ public class ImmutableClassAccessType extends AbstractEntityTest {
cfg.addAnnotatedClass(Country.class); cfg.addAnnotatedClass(Country.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.accesstype; package org.hibernate.envers.test.integration.accesstype;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -39,7 +40,7 @@ public class MixedAccessType extends AbstractEntityTest {
cfg.addAnnotatedClass(MixedAccessTypeEntity.class); cfg.addAnnotatedClass(MixedAccessTypeEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessType.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.accesstype; package org.hibernate.envers.test.integration.accesstype;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -39,7 +40,7 @@ public class PropertyAccessType extends AbstractEntityTest {
cfg.addAnnotatedClass(PropertyAccessTypeEntity.class); cfg.addAnnotatedClass(PropertyAccessTypeEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditReaderAPITest.java
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.auditReader; package org.hibernate.envers.test.integration.auditReader;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.envers.exception.NotAuditedException;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* A test which checks the correct behavior of AuditReader.isEntityClassAudited(Class entityClass). * A test which checks the correct behavior of AuditReader.isEntityClassAudited(Class entityClass).
@ -41,7 +42,7 @@ public class AuditReaderAPITest extends AbstractEntityTest {
cfg.addAnnotatedClass(NotAuditedTestEntity.class); cfg.addAnnotatedClass(NotAuditedTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class Delete extends AbstractEntityTest {
cfg.addAnnotatedClass(BasicTestEntity2.class); cfg.addAnnotatedClass(BasicTestEntity2.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -39,7 +40,7 @@ public class GlobalVersioned extends AbstractEntityTest {
cfg.addAnnotatedClass(BasicTestEntity4.class); cfg.addAnnotatedClass(BasicTestEntity4.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class ManyOperationsInTransaction extends AbstractEntityTest {
cfg.addAnnotatedClass(BasicTestEntity1.class); cfg.addAnnotatedClass(BasicTestEntity1.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

14
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.envers.exception.NotAuditedException;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -36,10 +37,11 @@ public class NotVersioned extends AbstractEntityTest {
private Integer id1; private Integer id1;
public void configure(Ejb3Configuration cfg) { public void configure(Ejb3Configuration cfg) {
cfg.addAnnotatedClass(BasicTestEntity1.class);
cfg.addAnnotatedClass(BasicTestEntity3.class); cfg.addAnnotatedClass(BasicTestEntity3.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();
@ -55,12 +57,12 @@ public class NotVersioned extends AbstractEntityTest {
em.getTransaction().commit(); em.getTransaction().commit();
} }
@Test(expectedExceptions = NotAuditedException.class) @Test(expected = NotAuditedException.class)
public void testRevisionsCounts() { public void testRevisionsCounts() {
getAuditReader().getRevisions(BasicTestEntity3.class, id1); getAuditReader().getRevisions(BasicTestEntity3.class, id1);
} }
@Test(expectedExceptions = NotAuditedException.class) @Test(expected = NotAuditedException.class)
public void testHistoryOfId1() { public void testHistoryOfId1() {
getAuditReader().find(BasicTestEntity3.class, id1, 1); getAuditReader().find(BasicTestEntity3.class, id1, 1);
} }

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -59,7 +60,7 @@ public class NullProperties extends AbstractEntityTest {
em.getTransaction().commit(); em.getTransaction().commit();
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
id1 = addNewEntity("x", 1); // rev 1 id1 = addNewEntity("x", 1); // rev 1
id2 = addNewEntity(null, 20); // rev 2 id2 = addNewEntity(null, 20); // rev 2

12
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java
View File

@ -22,12 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.IntTestEntity; import org.hibernate.envers.test.entities.IntTestEntity;
import org.testng.annotations.Test; import org.junit.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -54,12 +56,12 @@ public class Simple extends AbstractEntityTest {
em.getTransaction().commit(); em.getTransaction().commit();
} }
@Test(dependsOnMethods = "initData") @Test
public void testRevisionsCounts() { public void testRevisionsCounts() {
assert Arrays.asList(1, 2).equals(getAuditReader().getRevisions(IntTestEntity.class, id1)); assert Arrays.asList(1, 2).equals(getAuditReader().getRevisions(IntTestEntity.class, id1));
} }
@Test(dependsOnMethods = "initData") @Test
public void testHistoryOfId1() { public void testHistoryOfId1() {
IntTestEntity ver1 = new IntTestEntity(10, id1); IntTestEntity ver1 = new IntTestEntity(10, id1);
IntTestEntity ver2 = new IntTestEntity(20, id1); IntTestEntity ver2 = new IntTestEntity(20, id1);

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.exception.RevisionDoesNotExistException; import org.hibernate.envers.exception.RevisionDoesNotExistException;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -61,7 +62,7 @@ public class SingleOperationInTransaction extends AbstractEntityTest {
em.getTransaction().commit(); em.getTransaction().commit();
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
id1 = addNewEntity("x", 1); // rev 1 id1 = addNewEntity("x", 1); // rev 1
id2 = addNewEntity("y", 20); // rev 2 id2 = addNewEntity("y", 20); // rev 2
@ -91,12 +92,12 @@ public class SingleOperationInTransaction extends AbstractEntityTest {
} }
} }
@Test(expectedExceptions = RevisionDoesNotExistException.class) @Test(expected = RevisionDoesNotExistException.class)
public void testNotExistingRevision() { public void testNotExistingRevision() {
getAuditReader().getRevisionDate(8); getAuditReader().getRevisionDate(8);
} }
@Test(expectedExceptions = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIllegalRevision() { public void testIllegalRevision() {
getAuditReader().getRevisionDate(0); getAuditReader().getRevisionDate(0);
} }

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -58,7 +59,7 @@ public class UnversionedPropertiesChange extends AbstractEntityTest {
em.getTransaction().commit(); em.getTransaction().commit();
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
id1 = addNewEntity("x", "a"); // rev 1 id1 = addNewEntity("x", "a"); // rev 1
modifyEntity(id1, "x", "a"); // no rev modifyEntity(id1, "x", "a"); // no rev

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.basic; package org.hibernate.envers.test.integration.basic;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.UnversionedEntity; import org.hibernate.envers.test.entities.UnversionedEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -40,7 +41,7 @@ public class UnversionedProperty extends AbstractEntityTest {
cfg.addAnnotatedClass(UnversionedEntity.class); cfg.addAnnotatedClass(UnversionedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

9
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java vendored
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.cache; package org.hibernate.envers.test.integration.cache;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity;
import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -46,7 +47,7 @@ public class OneToManyCache extends AbstractEntityTest {
cfg.addAnnotatedClass(SetRefIngEntity.class); cfg.addAnnotatedClass(SetRefIngEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

9
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java vendored
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.cache; package org.hibernate.envers.test.integration.cache;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefEdEntity; import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefEdEntity;
import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefIngEntity; import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefIngEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class OneToOneCache extends AbstractEntityTest {
cfg.addAnnotatedClass(BiRefIngEntity.class); cfg.addAnnotatedClass(BiRefIngEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
BiRefEdEntity ed1 = new BiRefEdEntity(1, "data_ed_1"); BiRefEdEntity ed1 = new BiRefEdEntity(1, "data_ed_1");
BiRefEdEntity ed2 = new BiRefEdEntity(2, "data_ed_2"); BiRefEdEntity ed2 = new BiRefEdEntity(2, "data_ed_2");

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java vendored
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.cache; package org.hibernate.envers.test.integration.cache;
import java.util.List;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.IntTestEntity; import org.hibernate.envers.test.entities.IntTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.List;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class QueryCache extends AbstractEntityTest {
cfg.addAnnotatedClass(IntTestEntity.class); cfg.addAnnotatedClass(IntTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java
View File

@ -22,16 +22,17 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.collection; package org.hibernate.envers.test.integration.collection;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.collection.EnumSetEntity; import org.hibernate.envers.test.entities.collection.EnumSetEntity;
import org.hibernate.envers.test.entities.collection.EnumSetEntity.E1; import org.hibernate.envers.test.entities.collection.EnumSetEntity.E1;
import org.hibernate.envers.test.entities.collection.EnumSetEntity.E2; import org.hibernate.envers.test.entities.collection.EnumSetEntity.E2;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +44,7 @@ public class EnumSet extends AbstractEntityTest {
cfg.addAnnotatedClass(EnumSetEntity.class); cfg.addAnnotatedClass(EnumSetEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.collection; package org.hibernate.envers.test.integration.collection;
import java.util.Arrays;
import java.util.Collections;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.collection.StringListEntity; import org.hibernate.envers.test.entities.collection.StringListEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Collections;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +44,7 @@ public class StringList extends AbstractEntityTest {
cfg.addAnnotatedClass(StringListEntity.class); cfg.addAnnotatedClass(StringListEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.collection; package org.hibernate.envers.test.integration.collection;
import java.util.Arrays;
import java.util.Collections;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.collection.StringMapEntity; import org.hibernate.envers.test.entities.collection.StringMapEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Collections;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +44,7 @@ public class StringMap extends AbstractEntityTest {
cfg.addAnnotatedClass(StringMapEntity.class); cfg.addAnnotatedClass(StringMapEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.collection; package org.hibernate.envers.test.integration.collection;
import java.util.Arrays;
import java.util.Collections;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.collection.StringSetEntity; import org.hibernate.envers.test.entities.collection.StringSetEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Collections;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +44,7 @@ public class StringSet extends AbstractEntityTest {
cfg.addAnnotatedClass(StringSetEntity.class); cfg.addAnnotatedClass(StringSetEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java
View File

@ -22,16 +22,17 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.collection.mapkey; package org.hibernate.envers.test.integration.collection.mapkey;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.components.Component1; import org.hibernate.envers.test.entities.components.Component1;
import org.hibernate.envers.test.entities.components.Component2; import org.hibernate.envers.test.entities.components.Component2;
import org.hibernate.envers.test.entities.components.ComponentTestEntity; import org.hibernate.envers.test.entities.components.ComponentTestEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -47,7 +48,7 @@ public class ComponentMapKey extends AbstractEntityTest {
cfg.addAnnotatedClass(ComponentTestEntity.class); cfg.addAnnotatedClass(ComponentTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java
View File

@ -22,14 +22,15 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.collection.mapkey; package org.hibernate.envers.test.integration.collection.mapkey;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class IdMapKey extends AbstractEntityTest {
cfg.addAnnotatedClass(StrTestEntity.class); cfg.addAnnotatedClass(StrTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.collection.norevision; package org.hibernate.envers.test.integration.collection.norevision;
import java.net.URISyntaxException;
import java.util.List;
import org.hibernate.MappingException; import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractSessionTest; import org.hibernate.envers.test.AbstractSessionTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import java.net.URISyntaxException;
import java.util.List;
public abstract class AbstractCollectionChangeTest extends AbstractSessionTest { public abstract class AbstractCollectionChangeTest extends AbstractSessionTest {
protected Integer personId; protected Integer personId;
@ -20,7 +21,7 @@ public abstract class AbstractCollectionChangeTest extends AbstractSessionTest {
protected abstract List<Integer> getExpectedPersonRevisions(); protected abstract List<Integer> getExpectedPersonRevisions();
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
newSessionFactory(); newSessionFactory();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.components; package org.hibernate.envers.test.integration.components;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.components.Component1; import org.hibernate.envers.test.entities.components.Component1;
import org.hibernate.envers.test.entities.components.Component2; import org.hibernate.envers.test.entities.components.Component2;
import org.hibernate.envers.test.entities.components.ComponentTestEntity; import org.hibernate.envers.test.entities.components.ComponentTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class Components extends AbstractEntityTest {
cfg.addAnnotatedClass(ComponentTestEntity.class); cfg.addAnnotatedClass(ComponentTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

16
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java
View File

@ -22,17 +22,19 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.components; package org.hibernate.envers.test.integration.components;
import static org.hibernate.testing.TestLogger.LOG;
import java.math.BigInteger;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.components.DefaultValueComponent1; import org.hibernate.envers.test.entities.components.DefaultValueComponent1;
import org.hibernate.envers.test.entities.components.DefaultValueComponent2; import org.hibernate.envers.test.entities.components.DefaultValueComponent2;
import org.hibernate.envers.test.entities.components.DefaultValueComponentTestEntity; import org.hibernate.envers.test.entities.components.DefaultValueComponentTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.math.BigInteger;
import java.util.Arrays;
import static org.hibernate.testing.TestLogger.*;
/** /**
* Test class for components with default values. * Test class for components with default values.
@ -58,7 +60,7 @@ public class DefaultValueComponents extends AbstractEntityTest {
cfg.addAnnotatedClass(DefaultValueComponentTestEntity.class); cfg.addAnnotatedClass(DefaultValueComponentTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

19
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/CollectionOfComponents.java
View File

@ -22,20 +22,23 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.components.collections; package org.hibernate.envers.test.integration.components.collections;
import java.util.Arrays;
import java.util.Set;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.components.Component1; import org.hibernate.envers.test.entities.components.Component1;
import org.hibernate.envers.test.entities.components.ComponentSetTestEntity; import org.hibernate.envers.test.entities.components.ComponentSetTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Ignore;
import org.testng.annotations.Test; import org.junit.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Set;
/** /**
* TODO: enable and implement * TODO: enable and implement
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
*/ */
@Ignore
public class CollectionOfComponents extends AbstractEntityTest { public class CollectionOfComponents extends AbstractEntityTest {
private Integer id1; private Integer id1;
@ -43,7 +46,7 @@ public class CollectionOfComponents extends AbstractEntityTest {
cfg.addAnnotatedClass(ComponentSetTestEntity.class); cfg.addAnnotatedClass(ComponentSetTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
@ -68,12 +71,12 @@ public class CollectionOfComponents extends AbstractEntityTest {
id1 = cte1.getId(); id1 = cte1.getId();
} }
@Test(enabled = false) @Test
public void testRevisionsCounts() { public void testRevisionsCounts() {
assert Arrays.asList(1, 2).equals(getAuditReader().getRevisions(ComponentSetTestEntity.class, id1)); assert Arrays.asList(1, 2).equals(getAuditReader().getRevisions(ComponentSetTestEntity.class, id1));
} }
@Test(enabled = false) @Test
public void testHistoryOfId1() { public void testHistoryOfId1() {
assert getAuditReader().find(ComponentSetTestEntity.class, id1, 1).getComps().size() == 0; assert getAuditReader().find(ComponentSetTestEntity.class, id1, 1).getComps().size() == 0;

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.components.relations; package org.hibernate.envers.test.integration.components.relations;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.entities.components.relations.ManyToOneComponent; import org.hibernate.envers.test.entities.components.relations.ManyToOneComponent;
import org.hibernate.envers.test.entities.components.relations.ManyToOneComponentTestEntity; import org.hibernate.envers.test.entities.components.relations.ManyToOneComponentTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class ManyToOneInComponent extends AbstractEntityTest {
cfg.addAnnotatedClass(StrTestEntity.class); cfg.addAnnotatedClass(StrTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.components.relations; package org.hibernate.envers.test.integration.components.relations;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.UnversionedStrTestEntity; import org.hibernate.envers.test.entities.UnversionedStrTestEntity;
import org.hibernate.envers.test.entities.components.relations.NotAuditedManyToOneComponent; import org.hibernate.envers.test.entities.components.relations.NotAuditedManyToOneComponent;
import org.hibernate.envers.test.entities.components.relations.NotAuditedManyToOneComponentTestEntity; import org.hibernate.envers.test.entities.components.relations.NotAuditedManyToOneComponentTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +44,7 @@ public class NotAuditedManyToOneInComponent extends AbstractEntityTest {
cfg.addAnnotatedClass(UnversionedStrTestEntity.class); cfg.addAnnotatedClass(UnversionedStrTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// No revision // No revision
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.components.relations; package org.hibernate.envers.test.integration.components.relations;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.entities.components.relations.OneToManyComponent; import org.hibernate.envers.test.entities.components.relations.OneToManyComponent;
import org.hibernate.envers.test.entities.components.relations.OneToManyComponentTestEntity; import org.hibernate.envers.test.entities.components.relations.OneToManyComponentTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class OneToManyInComponent extends AbstractEntityTest {
cfg.addAnnotatedClass(StrTestEntity.class); cfg.addAnnotatedClass(StrTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/CompositeCustom.java
View File

@ -22,14 +22,15 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.customtype; package org.hibernate.envers.test.integration.customtype;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.customtype.Component; import org.hibernate.envers.test.entities.customtype.Component;
import org.hibernate.envers.test.entities.customtype.CompositeCustomTypeEntity; import org.hibernate.envers.test.entities.customtype.CompositeCustomTypeEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class CompositeCustom extends AbstractEntityTest {
cfg.addAnnotatedClass(CompositeCustomTypeEntity.class); cfg.addAnnotatedClass(CompositeCustomTypeEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.customtype; package org.hibernate.envers.test.integration.customtype;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.customtype.ParametrizedCustomTypeEntity; import org.hibernate.envers.test.entities.customtype.ParametrizedCustomTypeEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -40,7 +41,7 @@ public class ParametrizedCustom extends AbstractEntityTest {
cfg.addAnnotatedClass(ParametrizedCustomTypeEntity.class); cfg.addAnnotatedClass(ParametrizedCustomTypeEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.data; package org.hibernate.envers.test.integration.data;
import java.util.Arrays;
import java.util.Date;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Date;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -40,7 +41,7 @@ public class Dates extends AbstractEntityTest {
cfg.addAnnotatedClass(DateTestEntity.class); cfg.addAnnotatedClass(DateTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.data; package org.hibernate.envers.test.integration.data;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -39,7 +40,7 @@ public class Enums extends AbstractEntityTest {
cfg.addAnnotatedClass(EnumTestEntity.class); cfg.addAnnotatedClass(EnumTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

5
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java
View File

@ -25,8 +25,7 @@ package org.hibernate.envers.test.integration.data;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import java.util.Arrays; import java.util.Arrays;
@ -41,7 +40,7 @@ public class LobSerializables extends AbstractEntityTest {
cfg.addAnnotatedClass(LobSerializableTestEntity.class); cfg.addAnnotatedClass(LobSerializableTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.data; package org.hibernate.envers.test.integration.data;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -39,7 +40,7 @@ public class Lobs extends AbstractEntityTest {
cfg.addAnnotatedClass(LobTestEntity.class); cfg.addAnnotatedClass(LobTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.data; package org.hibernate.envers.test.integration.data;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -39,7 +40,7 @@ public class Serializables extends AbstractEntityTest {
cfg.addAnnotatedClass(SerializableTestEntity.class); cfg.addAnnotatedClass(SerializableTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

19
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java
View File

@ -1,19 +1,18 @@
package org.hibernate.envers.test.integration.entityNames.auditedEntity; package org.hibernate.envers.test.integration.entityNames.auditedEntity;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.junit.Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.util.List; import java.util.List;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** /**
* @author Hern&aacute;n Chanfreau * @author Hern&aacute;n Chanfreau
* *
*/ */
@Test(sequential=true)
public class ReadEntityWhitEntityNameTest extends AbstractOneSessionTest{ public class ReadEntityWhitEntityNameTest extends AbstractOneSessionTest{
private long id_pers1; private long id_pers1;
@ -32,7 +31,7 @@ public class ReadEntityWhitEntityNameTest extends AbstractOneSessionTest{
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
initializeSession(); initializeSession();
@ -86,7 +85,7 @@ public class ReadEntityWhitEntityNameTest extends AbstractOneSessionTest{
assert(pers3Revs.size() == 1); assert(pers3Revs.size() == 1);
} }
@Test(dependsOnMethods="testRetrieveRevisionsWithEntityName") @Test
public void testRetrieveAuditedEntityWithEntityName() { public void testRetrieveAuditedEntityWithEntityName() {
person1_1 = getAuditReader().find(Person.class, "Personaje", id_pers1, 1); person1_1 = getAuditReader().find(Person.class, "Personaje", id_pers1, 1);
person1_2 = getAuditReader().find(Person.class, "Personaje", id_pers1, 2); person1_2 = getAuditReader().find(Person.class, "Personaje", id_pers1, 2);
@ -98,7 +97,7 @@ public class ReadEntityWhitEntityNameTest extends AbstractOneSessionTest{
} }
@Test(dependsOnMethods="testRetrieveAuditedEntityWithEntityName") @Test
public void testObtainEntityNameAuditedEntityWithEntityName() { public void testObtainEntityNameAuditedEntityWithEntityName() {
String currentPers1EN = getSession().getEntityName(currentPers1); String currentPers1EN = getSession().getEntityName(currentPers1);
@ -114,7 +113,7 @@ public class ReadEntityWhitEntityNameTest extends AbstractOneSessionTest{
} }
@Test(dependsOnMethods="testObtainEntityNameAuditedEntityWithEntityName") @Test
public void testRetrieveAuditedEntityWithEntityNameWithNewSession() { public void testRetrieveAuditedEntityWithEntityNameWithNewSession() {
// force a new session and AR // force a new session and AR

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java
View File

@ -1,20 +1,19 @@
package org.hibernate.envers.test.integration.entityNames.manyToManyAudited; package org.hibernate.envers.test.integration.entityNames.manyToManyAudited;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.junit.Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** /**
* @author Hern&aacute;n Chanfreau * @author Hern&aacute;n Chanfreau
* *
*/ */
@Test(sequential=true)
public class ReadEntityWithAuditedManyToManyTest extends AbstractOneSessionTest{ public class ReadEntityWithAuditedManyToManyTest extends AbstractOneSessionTest{
private long id_car1; private long id_car1;
@ -34,7 +33,7 @@ public class ReadEntityWithAuditedManyToManyTest extends AbstractOneSessionTest{
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
initializeSession(); initializeSession();
@ -117,7 +116,7 @@ public class ReadEntityWithAuditedManyToManyTest extends AbstractOneSessionTest{
} }
@Test(dependsOnMethods="testGetEntityNameManyYoManyWithEntityName") @Test
public void testGetEntityNameManyYoManyWithEntityNameInNewSession() { public void testGetEntityNameManyYoManyWithEntityNameInNewSession() {
//force new session and AR //force new session and AR
forceNewSession(); forceNewSession();

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java
View File

@ -1,20 +1,19 @@
package org.hibernate.envers.test.integration.entityNames.oneToManyAudited; package org.hibernate.envers.test.integration.entityNames.oneToManyAudited;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.junit.Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** /**
* @author Hern&aacute;n Chanfreau * @author Hern&aacute;n Chanfreau
* *
*/ */
@Test(sequential=true)
public class ReadEntityWithAuditedCollectionTest extends AbstractOneSessionTest{ public class ReadEntityWithAuditedCollectionTest extends AbstractOneSessionTest{
private long id_car1; private long id_car1;
@ -34,7 +33,7 @@ public class ReadEntityWithAuditedCollectionTest extends AbstractOneSessionTest{
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
initializeSession(); initializeSession();
@ -112,7 +111,7 @@ public class ReadEntityWithAuditedCollectionTest extends AbstractOneSessionTest{
@Test(dependsOnMethods="testObtainEntityNameAuditedCollectionWithEntityName") @Test
public void testObtainEntityNameAuditedCollectionWithEntityNameInNewSession() { public void testObtainEntityNameAuditedCollectionWithEntityNameInNewSession() {
// force a new session and AR // force a new session and AR
forceNewSession(); forceNewSession();

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java
View File

@ -1,20 +1,19 @@
package org.hibernate.envers.test.integration.entityNames.oneToManyNotAudited; package org.hibernate.envers.test.integration.entityNames.oneToManyNotAudited;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.junit.Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** /**
* @author Hern&aacute;n Chanfreau * @author Hern&aacute;n Chanfreau
* *
*/ */
@Test(sequential=true)
public class ReadEntityWithAuditedCollectionTest extends AbstractOneSessionTest{ public class ReadEntityWithAuditedCollectionTest extends AbstractOneSessionTest{
private long id_car1; private long id_car1;
@ -33,7 +32,7 @@ public class ReadEntityWithAuditedCollectionTest extends AbstractOneSessionTest{
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
initializeSession(); initializeSession();
@ -109,7 +108,7 @@ public class ReadEntityWithAuditedCollectionTest extends AbstractOneSessionTest{
} }
@Test(dependsOnMethods="testObtainEntityNameCollectionWithEntityNameAndNotAuditedMode") @Test
public void testObtainEntityNameCollectionWithEntityNameAndNotAuditedModeInNewSession() { public void testObtainEntityNameCollectionWithEntityNameAndNotAuditedModeInNewSession() {
// force new session and AR // force new session and AR
forceNewSession(); forceNewSession();

24
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java
View File

@ -1,18 +1,17 @@
package org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited; package org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.junit.Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** /**
* @author Hern&aacute;n Chanfreau * @author Hern&aacute;n Chanfreau
* *
*/ */
@Test(sequential=true)
public class ReadEntityAssociatedAuditedTest extends AbstractOneSessionTest{ public class ReadEntityAssociatedAuditedTest extends AbstractOneSessionTest{
private long id_car1; private long id_car1;
@ -36,7 +35,7 @@ public class ReadEntityAssociatedAuditedTest extends AbstractOneSessionTest{
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
initializeSession(); initializeSession();
@ -105,7 +104,7 @@ public class ReadEntityAssociatedAuditedTest extends AbstractOneSessionTest{
} }
@Test(dependsOnMethods="testGetAssociationWithEntityName") @Test
public void testGetAssociationWithEntityNameInNewSession() { public void testGetAssociationWithEntityNameInNewSession() {
//force a new session and AR //force a new session and AR
forceNewSession(); forceNewSession();
@ -116,15 +115,6 @@ public class ReadEntityAssociatedAuditedTest extends AbstractOneSessionTest{
checkEntityNames(); checkEntityNames();
//
// Car car1 = getAuditReader().find(Car.class, id_car1, 1);
// car1.getOwner().getName();
// Car car2 = getAuditReader().find(Car.class, id_car2, 2);
// car2.getOwner().getName();
//
// Person person = getAuditReader().find(Person.class, "Personaje", id_car2, 2);
// person.getName();
} }
} }

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java
View File

@ -1,18 +1,17 @@
package org.hibernate.envers.test.integration.entityNames.singleAssociatedNotAudited; package org.hibernate.envers.test.integration.entityNames.singleAssociatedNotAudited;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.junit.Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.MappingException;
import org.hibernate.envers.test.AbstractOneSessionTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** /**
* @author Hern&aacute;n Chanfreau * @author Hern&aacute;n Chanfreau
* *
*/ */
@Test(sequential=true)
public class ReadEntityAssociatedNotAuditedTest extends AbstractOneSessionTest { public class ReadEntityAssociatedNotAuditedTest extends AbstractOneSessionTest {
private long id_car1; private long id_car1;
@ -34,7 +33,7 @@ public class ReadEntityAssociatedNotAuditedTest extends AbstractOneSessionTest {
config.addFile(new File(url.toURI())); config.addFile(new File(url.toURI()));
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
initializeSession(); initializeSession();
@ -105,7 +104,7 @@ public class ReadEntityAssociatedNotAuditedTest extends AbstractOneSessionTest {
} }
@Test(dependsOnMethods="testObtainEntityNameAssociationWithEntityNameAndNotAuditedMode") @Test
public void testObtainEntityNameAssociationWithEntityNameAndNotAuditedModeInNewSession() { public void testObtainEntityNameAssociationWithEntityNameAndNotAuditedModeInNewSession() {
//force a new session and AR //force a new session and AR
forceNewSession(); forceNewSession();

10
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java
View File

@ -22,14 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.flush; package org.hibernate.envers.test.integration.flush;
import java.io.IOException;
import javax.persistence.EntityManager;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import javax.persistence.EntityManager;
import java.io.IOException;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -56,7 +58,7 @@ public abstract class AbstractFlushTest extends AbstractEntityTest {
throw new RuntimeException("Invalid entity manager"); throw new RuntimeException("Invalid entity manager");
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initFlush() throws IOException { public void initFlush() throws IOException {
Session session = getSession(getEntityManager()); Session session = getSession(getEntityManager());
session.setFlushMode(getFlushMode()); session.setFlushMode(getFlushMode());

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.flush; package org.hibernate.envers.test.integration.flush;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -39,7 +40,7 @@ public class DoubleFlushAddDel extends AbstractFlushTest {
return FlushMode.MANUAL; return FlushMode.MANUAL;
} }
@BeforeClass(dependsOnMethods = "initFlush") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

16
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java
View File

@ -22,16 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.flush; package org.hibernate.envers.test.integration.flush;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.List;
import javax.persistence.EntityManager;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.envers.RevisionType; import org.hibernate.envers.RevisionType;
import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditEntity;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +45,7 @@ public class DoubleFlushAddMod extends AbstractFlushTest {
return FlushMode.MANUAL; return FlushMode.MANUAL;
} }
@BeforeClass(dependsOnMethods = "initFlush") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

16
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java
View File

@ -22,16 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.flush; package org.hibernate.envers.test.integration.flush;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.List;
import javax.persistence.EntityManager;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.envers.RevisionType; import org.hibernate.envers.RevisionType;
import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditEntity;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +45,7 @@ public class DoubleFlushModDel extends AbstractFlushTest {
return FlushMode.MANUAL; return FlushMode.MANUAL;
} }
@BeforeClass(dependsOnMethods = "initFlush") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

16
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java
View File

@ -22,16 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.flush; package org.hibernate.envers.test.integration.flush;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.List;
import javax.persistence.EntityManager;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.envers.RevisionType; import org.hibernate.envers.RevisionType;
import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditEntity;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +45,7 @@ public class DoubleFlushModMod extends AbstractFlushTest {
return FlushMode.MANUAL; return FlushMode.MANUAL;
} }
@BeforeClass(dependsOnMethods = "initFlush") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

16
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java
View File

@ -22,16 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.flush; package org.hibernate.envers.test.integration.flush;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.List;
import javax.persistence.EntityManager;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.envers.RevisionType; import org.hibernate.envers.RevisionType;
import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditEntity;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +45,7 @@ public class ManualFlush extends AbstractFlushTest {
return FlushMode.MANUAL; return FlushMode.MANUAL;
} }
@BeforeClass(dependsOnMethods = "initFlush") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ChangingHashcode.java
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.hashcode; package org.hibernate.envers.test.integration.hashcode;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -42,7 +43,7 @@ public class ChangingHashcode extends AbstractEntityTest {
cfg.addAnnotatedClass(WikiImage.class); cfg.addAnnotatedClass(WikiImage.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeDateId.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.ids; package org.hibernate.envers.test.integration.ids;
import java.util.Arrays;
import java.util.Date;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.ids.CompositeDateIdTestEntity; import org.hibernate.envers.test.entities.ids.CompositeDateIdTestEntity;
import org.hibernate.envers.test.entities.ids.DateEmbId; import org.hibernate.envers.test.entities.ids.DateEmbId;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Date;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -42,7 +43,7 @@ public class CompositeDateId extends AbstractEntityTest {
cfg.addAnnotatedClass(CompositeDateIdTestEntity.class); cfg.addAnnotatedClass(CompositeDateIdTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1

19
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java
View File

@ -22,19 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.ids; package org.hibernate.envers.test.integration.ids;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.ids.CustomEnum; import org.hibernate.envers.test.entities.ids.*;
import org.hibernate.envers.test.entities.ids.EmbId; import org.junit.Test;
import org.hibernate.envers.test.entities.ids.EmbIdTestEntity;
import org.hibernate.envers.test.entities.ids.EmbIdWithCustomType; import javax.persistence.EntityManager;
import org.hibernate.envers.test.entities.ids.EmbIdWithCustomTypeTestEntity; import java.util.Arrays;
import org.hibernate.envers.test.entities.ids.MulId;
import org.hibernate.envers.test.entities.ids.MulIdTestEntity;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -53,7 +48,7 @@ public class CompositeIds extends AbstractEntityTest {
cfg.addAnnotatedClass(EmbIdWithCustomTypeTestEntity.class); cfg.addAnnotatedClass(EmbIdWithCustomTypeTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
id1 = new EmbId(1, 2); id1 = new EmbId(1, 2);
id2 = new EmbId(10, 20); id2 = new EmbId(10, 20);

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/DateId.java
View File

@ -22,14 +22,15 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.ids; package org.hibernate.envers.test.integration.ids;
import java.util.Arrays;
import java.util.Date;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.ids.DateIdTestEntity; import org.hibernate.envers.test.entities.ids.DateIdTestEntity;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Date;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class DateId extends AbstractEntityTest {
cfg.addAnnotatedClass(DateIdTestEntity.class); cfg.addAnnotatedClass(DateIdTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1

6
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java
View File

@ -1,12 +1,14 @@
package org.hibernate.envers.test.integration.ids; package org.hibernate.envers.test.integration.ids;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.entities.UnversionedStrTestEntity; import org.hibernate.envers.test.entities.UnversionedStrTestEntity;
import org.hibernate.envers.test.entities.ids.ManyToOneIdNotAuditedTestEntity; import org.hibernate.envers.test.entities.ids.ManyToOneIdNotAuditedTestEntity;
import org.hibernate.envers.test.entities.ids.ManyToOneNotAuditedEmbId; import org.hibernate.envers.test.entities.ids.ManyToOneNotAuditedEmbId;
import org.testng.annotations.Test; import org.junit.Test;
import javax.persistence.EntityManager;
/** /**
* A test checking that when using Envers it is possible to have non-audited entities that use unsupported * A test checking that when using Envers it is possible to have non-audited entities that use unsupported

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java
View File

@ -23,12 +23,13 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined; package org.hibernate.envers.test.integration.inheritance.joined;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class ChildAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java
View File

@ -23,12 +23,13 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined; package org.hibernate.envers.test.integration.inheritance.joined;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class ChildNullAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java
View File

@ -23,12 +23,13 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined; package org.hibernate.envers.test.integration.inheritance.joined;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class ParentAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java
View File

@ -23,13 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined.childrelation; package org.hibernate.envers.test.integration.inheritance.joined.childrelation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class ChildReferencing extends AbstractEntityTest {
cfg.addAnnotatedClass(ReferencedEntity.class); cfg.addAnnotatedClass(ReferencedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java
View File

@ -23,12 +23,13 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined.emptychild; package org.hibernate.envers.test.integration.inheritance.joined.emptychild;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class EmptyChildAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
View File

@ -23,13 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined.notownedrelation; package org.hibernate.envers.test.integration.inheritance.joined.notownedrelation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class NotOwnedBidirectional extends AbstractEntityTest {
cfg.addAnnotatedClass(PersonalContact.class); cfg.addAnnotatedClass(PersonalContact.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
View File

@ -23,15 +23,16 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined.primarykeyjoin; package org.hibernate.envers.test.integration.inheritance.joined.primarykeyjoin;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.integration.inheritance.joined.ParentEntity; import org.hibernate.envers.test.integration.inheritance.joined.ParentEntity;
import org.hibernate.mapping.Column; import org.hibernate.mapping.Column;
import org.testng.Assert; import org.junit.Assert;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -44,7 +45,7 @@ public class ChildPrimaryKeyJoinAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java
View File

@ -23,13 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined.relation; package org.hibernate.envers.test.integration.inheritance.joined.relation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class PolymorphicCollection extends AbstractEntityTest {
cfg.addAnnotatedClass(ReferencedEntity.class); cfg.addAnnotatedClass(ReferencedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java
View File

@ -23,13 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.joined.relation.unidirectional; package org.hibernate.envers.test.integration.inheritance.joined.relation.unidirectional;
import java.util.Arrays;
import java.util.Set;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Set;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class UnidirectionalDoubleAbstract extends AbstractEntityTest {
cfg.addAnnotatedClass(SetEntity.class); cfg.addAnnotatedClass(SetEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildAuditing.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.inheritance.single; package org.hibernate.envers.test.integration.inheritance.single;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -40,7 +41,7 @@ public class ChildAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentAuditing.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.inheritance.single; package org.hibernate.envers.test.integration.inheritance.single;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -40,7 +41,7 @@ public class ParentAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.inheritance.single.childrelation; package org.hibernate.envers.test.integration.inheritance.single.childrelation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -44,7 +45,7 @@ public class ChildReferencing extends AbstractEntityTest {
cfg.addAnnotatedClass(ReferencedEntity.class); cfg.addAnnotatedClass(ReferencedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java
View File

@ -23,13 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.single.notownedrelation; package org.hibernate.envers.test.integration.inheritance.single.notownedrelation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class NotOwnedBidirectional extends AbstractEntityTest {
cfg.addAnnotatedClass(PersonalContact.class); cfg.addAnnotatedClass(PersonalContact.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java
View File

@ -22,13 +22,14 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.inheritance.single.relation; package org.hibernate.envers.test.integration.inheritance.single.relation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -44,7 +45,7 @@ public class PolymorphicCollection extends AbstractEntityTest {
cfg.addAnnotatedClass(ReferencedEntity.class); cfg.addAnnotatedClass(ReferencedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildAuditing.java
View File

@ -23,12 +23,13 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.tableperclass; package org.hibernate.envers.test.integration.inheritance.tableperclass;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class ChildAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentAuditing.java
View File

@ -23,12 +23,13 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.tableperclass; package org.hibernate.envers.test.integration.inheritance.tableperclass;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -41,7 +42,7 @@ public class ParentAuditing extends AbstractEntityTest {
cfg.addAnnotatedClass(ParentEntity.class); cfg.addAnnotatedClass(ParentEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java
View File

@ -23,13 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.tableperclass.childrelation; package org.hibernate.envers.test.integration.inheritance.tableperclass.childrelation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class ChildReferencing extends AbstractEntityTest {
cfg.addAnnotatedClass(ReferencedEntity.class); cfg.addAnnotatedClass(ReferencedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java
View File

@ -23,13 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.tableperclass.notownedrelation; package org.hibernate.envers.test.integration.inheritance.tableperclass.notownedrelation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class NotOwnedBidirectional extends AbstractEntityTest {
cfg.addAnnotatedClass(PersonalContact.class); cfg.addAnnotatedClass(PersonalContact.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/PolymorphicCollection.java
View File

@ -23,13 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.inheritance.tableperclass.relation; package org.hibernate.envers.test.integration.inheritance.tableperclass.relation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -45,7 +46,7 @@ public class PolymorphicCollection extends AbstractEntityTest {
cfg.addAnnotatedClass(ReferencedEntity.class); cfg.addAnnotatedClass(ReferencedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/InterfacesComponents.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.interfaces.components; package org.hibernate.envers.test.integration.interfaces.components;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -39,7 +40,7 @@ public class InterfacesComponents extends AbstractEntityTest {
cfg.addAnnotatedClass(ComponentTestEntity.class); cfg.addAnnotatedClass(ComponentTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
// Revision 1 // Revision 1
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java
View File

@ -1,11 +1,12 @@
package org.hibernate.envers.test.integration.interfaces.hbm.allAudited; package org.hibernate.envers.test.integration.interfaces.hbm.allAudited;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.envers.exception.NotAuditedException;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.Assert; import org.junit.Assert;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -15,7 +16,7 @@ public abstract class AbstractAllAuditedTest extends AbstractEntityTest {
private long ai_id; private long ai_id;
private long nai_id; private long nai_id;
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

25
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/joined/JoinedAllAuditedTest.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.joined; package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.joined;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -19,22 +20,4 @@ public class JoinedAllAuditedTest extends AbstractAllAuditedTest {
e.printStackTrace(); e.printStackTrace();
} }
} }
@Test
@Override
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
@Test
@Override
public void testRetrieveNonAudited() {
super.testRetrieveNonAudited();
}
@Test
@Override
public void testRevisions() {
super.testRevisions();
}
} }

25
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.subclass; package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.subclass;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -20,22 +21,4 @@ public class SubclassAllAuditedTest extends AbstractAllAuditedTest {
} }
} }
@Test
@Override
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
@Test
@Override
public void testRetrieveNonAudited() {
super.testRetrieveNonAudited();
}
@Test
@Override
public void testRevisions() {
super.testRevisions();
}
} }

25
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.union; package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.union;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -19,22 +20,4 @@ public class UnionAllAuditedTest extends AbstractAllAuditedTest {
e.printStackTrace(); e.printStackTrace();
} }
} }
@Test
@Override
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
@Test
@Override
public void testRetrieveNonAudited() {
super.testRetrieveNonAudited();
}
@Test
@Override
public void testRevisions() {
super.testRevisions();
}
} }

9
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java
View File

@ -1,9 +1,10 @@
package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited; package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited;
import javax.persistence.EntityManager;
import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.envers.exception.NotAuditedException;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -15,7 +16,7 @@ public abstract class AbstractPropertiesAuditedTest extends AbstractEntityTest {
private static int NUMERITO = 555; private static int NUMERITO = 555;
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

12
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.joined; package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.joined;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -20,9 +21,4 @@ public class JoinedPropertiesAuditedTest extends AbstractPropertiesAuditedTest {
e.printStackTrace(); e.printStackTrace();
} }
} }
@Test
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
} }

12
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.subclass; package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.subclass;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -21,9 +22,4 @@ public class SubclassPropertiesAuditedTest extends AbstractPropertiesAuditedTest
} }
} }
@Test
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
} }

12
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.union; package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.union;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -20,9 +21,4 @@ public class UnionPropertiesAuditedTest extends AbstractPropertiesAuditedTest {
e.printStackTrace(); e.printStackTrace();
} }
} }
@Test
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
} }

9
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java
View File

@ -1,9 +1,10 @@
package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2; package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2;
import javax.persistence.EntityManager;
import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.envers.exception.NotAuditedException;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -15,7 +16,7 @@ public abstract class AbstractPropertiesAudited2Test extends AbstractEntityTest
private static int NUMERITO = 555; private static int NUMERITO = 555;
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

12
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.joined; package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.joined;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -19,9 +20,4 @@ public class JoinedPropertiesAudited2Test extends AbstractPropertiesAudited2Test
e.printStackTrace(); e.printStackTrace();
} }
} }
@Test
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
} }

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.subclass; package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.subclass;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -21,10 +22,4 @@ public class SubclassPropertiesAudited2Test extends AbstractPropertiesAudited2Te
} }
} }
@Test
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
} }

12
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java
View File

@ -1,10 +1,11 @@
package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.union; package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.union;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -20,9 +21,4 @@ public class UnionPropertiesAudited2Test extends AbstractPropertiesAudited2Test
e.printStackTrace(); e.printStackTrace();
} }
} }
@Test
public void testRetrieveAudited() {
super.testRetrieveAudited();
}
} }

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/InterfacesRelation.java
View File

@ -22,12 +22,13 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.interfaces.relation; package org.hibernate.envers.test.integration.interfaces.relation;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -43,7 +44,7 @@ public class InterfacesRelation extends AbstractEntityTest {
cfg.addAnnotatedClass(SetRefIngEntity.class); cfg.addAnnotatedClass(SetRefIngEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

14
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java
View File

@ -23,18 +23,14 @@
*/ */
package org.hibernate.envers.test.integration.jta; package org.hibernate.envers.test.integration.jta;
import javax.persistence.EntityManager;
import javax.transaction.TransactionManager;
import org.hibernate.envers.test.EnversTestingJtaBootstrap;
import org.testng.annotations.Test;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.integration.reventity.ExceptionListenerRevEntity; import org.hibernate.envers.test.integration.reventity.ExceptionListenerRevEntity;
import org.junit.Test;
import org.hibernate.testing.jta.TestingJtaBootstrap; import javax.persistence.EntityManager;
import javax.transaction.TransactionManager;
/** /**
* Same as {@link org.hibernate.envers.test.integration.reventity.ExceptionListener}, but in a JTA environment. * Same as {@link org.hibernate.envers.test.integration.reventity.ExceptionListener}, but in a JTA environment.
@ -50,7 +46,7 @@ public class JtaExceptionListener extends AbstractEntityTest {
tm = addJTAConfig(cfg); tm = addJTAConfig(cfg);
} }
@Test(expectedExceptions = RuntimeException.class) @Test(expected = RuntimeException.class)
public void testTransactionRollback() throws Exception { public void testTransactionRollback() throws Exception {
tm.begin(); tm.begin();
@ -64,7 +60,7 @@ public class JtaExceptionListener extends AbstractEntityTest {
tm.commit(); tm.commit();
} }
@Test(dependsOnMethods = "testTransactionRollback") @Test
public void testDataNotPersisted() throws Exception { public void testDataNotPersisted() throws Exception {
tm.begin(); tm.begin();

18
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java
View File

@ -1,19 +1,13 @@
package org.hibernate.envers.test.integration.jta; package org.hibernate.envers.test.integration.jta;
import javax.persistence.EntityManager;
import javax.transaction.NotSupportedException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
import java.util.Arrays;
import org.hibernate.envers.test.EnversTestingJtaBootstrap;
import org.testng.annotations.Test;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.IntTestEntity; import org.hibernate.envers.test.entities.IntTestEntity;
import org.junit.Test;
import org.hibernate.testing.jta.TestingJtaBootstrap; import javax.persistence.EntityManager;
import javax.transaction.TransactionManager;
import java.util.Arrays;
/** /**
* Same as {@link org.hibernate.envers.test.integration.basic.Simple}, but in a JTA environment. * Same as {@link org.hibernate.envers.test.integration.basic.Simple}, but in a JTA environment.
@ -53,12 +47,12 @@ public class JtaTransaction extends AbstractEntityTest {
tm.commit(); tm.commit();
} }
@Test(dependsOnMethods = "initData") @Test
public void testRevisionsCounts() throws Exception { public void testRevisionsCounts() throws Exception {
assert Arrays.asList(1, 2).equals(getAuditReader().getRevisions(IntTestEntity.class, id1)); assert Arrays.asList(1, 2).equals(getAuditReader().getRevisions(IntTestEntity.class, id1));
} }
@Test(dependsOnMethods = "initData") @Test
public void testHistoryOfId1() { public void testHistoryOfId1() {
IntTestEntity ver1 = new IntTestEntity(10, id1); IntTestEntity ver1 = new IntTestEntity(10, id1);
IntTestEntity ver2 = new IntTestEntity(20, id1); IntTestEntity ver2 = new IntTestEntity(20, id1);

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java
View File

@ -22,17 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany; package org.hibernate.envers.test.integration.manytomany;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.manytomany.ListOwnedEntity; import org.hibernate.envers.test.entities.manytomany.ListOwnedEntity;
import org.hibernate.envers.test.entities.manytomany.ListOwningEntity; import org.hibernate.envers.test.entities.manytomany.ListOwningEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -49,7 +50,7 @@ public class BasicList extends AbstractEntityTest {
cfg.addAnnotatedClass(ListOwnedEntity.class); cfg.addAnnotatedClass(ListOwnedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java
View File

@ -22,17 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany; package org.hibernate.envers.test.integration.manytomany;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.manytomany.MapOwnedEntity; import org.hibernate.envers.test.entities.manytomany.MapOwnedEntity;
import org.hibernate.envers.test.entities.manytomany.MapOwningEntity; import org.hibernate.envers.test.entities.manytomany.MapOwningEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -49,7 +50,7 @@ public class BasicMap extends AbstractEntityTest {
cfg.addAnnotatedClass(MapOwnedEntity.class); cfg.addAnnotatedClass(MapOwnedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java
View File

@ -22,17 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany; package org.hibernate.envers.test.integration.manytomany;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.manytomany.SetOwnedEntity; import org.hibernate.envers.test.entities.manytomany.SetOwnedEntity;
import org.hibernate.envers.test.entities.manytomany.SetOwningEntity; import org.hibernate.envers.test.entities.manytomany.SetOwningEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -49,7 +50,7 @@ public class BasicSet extends AbstractEntityTest {
cfg.addAnnotatedClass(SetOwnedEntity.class); cfg.addAnnotatedClass(SetOwnedEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

14
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicWhereJoinTable.java
View File

@ -22,16 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany; package org.hibernate.envers.test.integration.manytomany;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.IntNoAutoIdTestEntity; import org.hibernate.envers.test.entities.IntNoAutoIdTestEntity;
import org.hibernate.envers.test.entities.manytomany.WhereJoinTableEntity; import org.hibernate.envers.test.entities.manytomany.WhereJoinTableEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import static org.junit.Assert.*;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -50,7 +52,7 @@ public class BasicWhereJoinTable extends AbstractEntityTest {
cfg.addAnnotatedClass(IntNoAutoIdTestEntity.class); cfg.addAnnotatedClass(IntNoAutoIdTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

24
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/biowned/BasicBiowned.java
View File

@ -22,16 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany.biowned; package org.hibernate.envers.test.integration.manytomany.biowned;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.manytomany.biowned.ListBiowning1Entity; import org.hibernate.envers.test.entities.manytomany.biowned.ListBiowning1Entity;
import org.hibernate.envers.test.entities.manytomany.biowned.ListBiowning2Entity; import org.hibernate.envers.test.entities.manytomany.biowned.ListBiowning2Entity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import static org.junit.Assert.*;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -47,7 +49,7 @@ public class BasicBiowned extends AbstractEntityTest {
cfg.addAnnotatedClass(ListBiowning2Entity.class); cfg.addAnnotatedClass(ListBiowning2Entity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
@ -130,7 +132,7 @@ public class BasicBiowned extends AbstractEntityTest {
o2_2_id = o2_2.getId(); o2_2_id = o2_2.getId();
} }
@Test(enabled = true) @Test
public void testRevisionsCounts() { public void testRevisionsCounts() {
// Although it would seem that when modifying references both entities should be marked as modified, because // Although it would seem that when modifying references both entities should be marked as modified, because
// ownly the owning side is notified (because of the bi-owning mapping), a revision is created only for // ownly the owning side is notified (because of the bi-owning mapping), a revision is created only for
@ -143,7 +145,7 @@ public class BasicBiowned extends AbstractEntityTest {
assertEquals(Arrays.asList(1, 4), getAuditReader().getRevisions(ListBiowning2Entity.class, o2_2_id)); assertEquals(Arrays.asList(1, 4), getAuditReader().getRevisions(ListBiowning2Entity.class, o2_2_id));
} }
@Test(enabled = true) @Test
public void testHistoryOfO1_1() { public void testHistoryOfO1_1() {
ListBiowning2Entity o2_1 = getEntityManager().find(ListBiowning2Entity.class, o2_1_id); ListBiowning2Entity o2_1 = getEntityManager().find(ListBiowning2Entity.class, o2_1_id);
ListBiowning2Entity o2_2 = getEntityManager().find(ListBiowning2Entity.class, o2_2_id); ListBiowning2Entity o2_2 = getEntityManager().find(ListBiowning2Entity.class, o2_2_id);
@ -161,7 +163,7 @@ public class BasicBiowned extends AbstractEntityTest {
assert TestTools.checkList(rev5.getReferences(), o2_2); assert TestTools.checkList(rev5.getReferences(), o2_2);
} }
@Test(enabled = true) @Test
public void testHistoryOfO1_2() { public void testHistoryOfO1_2() {
ListBiowning2Entity o2_1 = getEntityManager().find(ListBiowning2Entity.class, o2_1_id); ListBiowning2Entity o2_1 = getEntityManager().find(ListBiowning2Entity.class, o2_1_id);
ListBiowning2Entity o2_2 = getEntityManager().find(ListBiowning2Entity.class, o2_2_id); ListBiowning2Entity o2_2 = getEntityManager().find(ListBiowning2Entity.class, o2_2_id);
@ -180,7 +182,7 @@ public class BasicBiowned extends AbstractEntityTest {
assert TestTools.checkList(rev5.getReferences(), o2_2); assert TestTools.checkList(rev5.getReferences(), o2_2);
} }
@Test(enabled = true) @Test
public void testHistoryOfO2_1() { public void testHistoryOfO2_1() {
ListBiowning1Entity o1_1 = getEntityManager().find(ListBiowning1Entity.class, o1_1_id); ListBiowning1Entity o1_1 = getEntityManager().find(ListBiowning1Entity.class, o1_1_id);
ListBiowning1Entity o1_2 = getEntityManager().find(ListBiowning1Entity.class, o1_2_id); ListBiowning1Entity o1_2 = getEntityManager().find(ListBiowning1Entity.class, o1_2_id);
@ -198,7 +200,7 @@ public class BasicBiowned extends AbstractEntityTest {
assert TestTools.checkList(rev5.getReferences()); assert TestTools.checkList(rev5.getReferences());
} }
@Test(enabled = true) @Test
public void testHistoryOfO2_2() { public void testHistoryOfO2_2() {
ListBiowning1Entity o1_1 = getEntityManager().find(ListBiowning1Entity.class, o1_1_id); ListBiowning1Entity o1_1 = getEntityManager().find(ListBiowning1Entity.class, o1_1_id);
ListBiowning1Entity o1_2 = getEntityManager().find(ListBiowning1Entity.class, o1_2_id); ListBiowning1Entity o1_2 = getEntityManager().find(ListBiowning1Entity.class, o1_2_id);

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java
View File

@ -1,13 +1,14 @@
package org.hibernate.envers.test.integration.manytomany.inverseToSuperclass; package org.hibernate.envers.test.integration.manytomany.inverseToSuperclass;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest;
import org.junit.Test;
import javax.persistence.EntityManager;
import java.io.File; import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** /**
* @author Hern<EFBFBD>n Chanfreau * @author Hern<EFBFBD>n Chanfreau
@ -29,7 +30,7 @@ public class ManyToManyInverseToSuperclassTest extends AbstractEntityTest {
} }
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

26
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java
View File

@ -22,8 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany.sametable; package org.hibernate.envers.test.integration.manytomany.sametable;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
@ -31,8 +30,10 @@ import org.hibernate.envers.test.entities.manytomany.sametable.Child1Entity;
import org.hibernate.envers.test.entities.manytomany.sametable.Child2Entity; import org.hibernate.envers.test.entities.manytomany.sametable.Child2Entity;
import org.hibernate.envers.test.entities.manytomany.sametable.ParentEntity; import org.hibernate.envers.test.entities.manytomany.sametable.ParentEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* Test which checks that auditing entities which contain multiple mappings to same tables work. * Test which checks that auditing entities which contain multiple mappings to same tables work.
@ -52,7 +53,7 @@ public class BasicSametable extends AbstractEntityTest {
cfg.addAnnotatedClass(Child2Entity.class); cfg.addAnnotatedClass(Child2Entity.class);
} }
@BeforeClass(enabled = true, dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();
@ -160,7 +161,7 @@ public class BasicSametable extends AbstractEntityTest {
c2_2_id = c2_2.getId(); c2_2_id = c2_2.getId();
} }
@Test(enabled = true) @Test
public void testRevisionsCounts() { public void testRevisionsCounts() {
assert Arrays.asList(1, 2, 3, 4).equals(getAuditReader().getRevisions(ParentEntity.class, p1_id)); assert Arrays.asList(1, 2, 3, 4).equals(getAuditReader().getRevisions(ParentEntity.class, p1_id));
assert Arrays.asList(1, 2, 3, 4).equals(getAuditReader().getRevisions(ParentEntity.class, p2_id)); assert Arrays.asList(1, 2, 3, 4).equals(getAuditReader().getRevisions(ParentEntity.class, p2_id));
@ -172,7 +173,7 @@ public class BasicSametable extends AbstractEntityTest {
assert Arrays.asList(1, 5).equals(getAuditReader().getRevisions(Child1Entity.class, c2_2_id)); assert Arrays.asList(1, 5).equals(getAuditReader().getRevisions(Child1Entity.class, c2_2_id));
} }
@Test(enabled = true) @Test
public void testHistoryOfParent1() { public void testHistoryOfParent1() {
Child1Entity c1_1 = getEntityManager().find(Child1Entity.class, c1_1_id); Child1Entity c1_1 = getEntityManager().find(Child1Entity.class, c1_1_id);
Child1Entity c1_2 = getEntityManager().find(Child1Entity.class, c1_2_id); Child1Entity c1_2 = getEntityManager().find(Child1Entity.class, c1_2_id);
@ -197,7 +198,7 @@ public class BasicSametable extends AbstractEntityTest {
assert TestTools.checkList(rev5.getChildren2(), c2_2); assert TestTools.checkList(rev5.getChildren2(), c2_2);
} }
@Test(enabled = true) @Test
public void testHistoryOfParent2() { public void testHistoryOfParent2() {
Child1Entity c1_1 = getEntityManager().find(Child1Entity.class, c1_1_id); Child1Entity c1_1 = getEntityManager().find(Child1Entity.class, c1_1_id);
Child2Entity c2_1 = getEntityManager().find(Child2Entity.class, c2_1_id); Child2Entity c2_1 = getEntityManager().find(Child2Entity.class, c2_1_id);
@ -222,7 +223,7 @@ public class BasicSametable extends AbstractEntityTest {
assert TestTools.checkList(rev5.getChildren2(), c2_1); assert TestTools.checkList(rev5.getChildren2(), c2_1);
} }
@Test(enabled = true) @Test
public void testHistoryOfChild1_1() { public void testHistoryOfChild1_1() {
ParentEntity p1 = getEntityManager().find(ParentEntity.class, p1_id); ParentEntity p1 = getEntityManager().find(ParentEntity.class, p1_id);
ParentEntity p2 = getEntityManager().find(ParentEntity.class, p2_id); ParentEntity p2 = getEntityManager().find(ParentEntity.class, p2_id);
@ -240,7 +241,8 @@ public class BasicSametable extends AbstractEntityTest {
assert TestTools.checkList(rev5.getParents(), p2); assert TestTools.checkList(rev5.getParents(), p2);
} }
@Test(enabled = false) // TODO: was disabled?
@Test
public void testHistoryOfChild1_2() { public void testHistoryOfChild1_2() {
ParentEntity p1 = getEntityManager().find(ParentEntity.class, p1_id); ParentEntity p1 = getEntityManager().find(ParentEntity.class, p1_id);
@ -257,7 +259,7 @@ public class BasicSametable extends AbstractEntityTest {
assert TestTools.checkList(rev5.getParents()); assert TestTools.checkList(rev5.getParents());
} }
@Test(enabled = true) @Test
public void testHistoryOfChild2_1() { public void testHistoryOfChild2_1() {
ParentEntity p2 = getEntityManager().find(ParentEntity.class, p2_id); ParentEntity p2 = getEntityManager().find(ParentEntity.class, p2_id);
@ -274,7 +276,7 @@ public class BasicSametable extends AbstractEntityTest {
assert TestTools.checkList(rev5.getParents(), p2); assert TestTools.checkList(rev5.getParents(), p2);
} }
@Test(enabled = true) @Test
public void testHistoryOfChild2_2() { public void testHistoryOfChild2_2() {
ParentEntity p1 = getEntityManager().find(ParentEntity.class, p1_id); ParentEntity p1 = getEntityManager().find(ParentEntity.class, p1_id);
ParentEntity p2 = getEntityManager().find(ParentEntity.class, p2_id); ParentEntity p2 = getEntityManager().find(ParentEntity.class, p2_id);

11
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java
View File

@ -22,15 +22,16 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany.ternary; package org.hibernate.envers.test.integration.manytomany.ternary;
import java.util.Arrays;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.IntTestEntity; import org.hibernate.envers.test.entities.IntTestEntity;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -51,7 +52,7 @@ public class TernaryMap extends AbstractEntityTest {
cfg.addAnnotatedClass(IntTestEntity.class); cfg.addAnnotatedClass(IntTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

17
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapFlush.java
View File

@ -22,16 +22,19 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany.ternary; package org.hibernate.envers.test.integration.manytomany.ternary;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.HashMap;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.IntTestEntity; import org.hibernate.envers.test.entities.IntTestEntity;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.Test; import org.junit.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.HashMap;
import static org.junit.Assert.*;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -115,7 +118,7 @@ public class TernaryMapFlush extends AbstractEntityTest {
int2_id = int2.getId(); int2_id = int2.getId();
} }
@Test(dependsOnMethods = "createData") @Test
public void testRevisionsCounts() { public void testRevisionsCounts() {
assertEquals(Arrays.asList(1, 2, 3), getAuditReader().getRevisions(TernaryMapEntity.class, map1_id)); assertEquals(Arrays.asList(1, 2, 3), getAuditReader().getRevisions(TernaryMapEntity.class, map1_id));
assertEquals(Arrays.asList(1), getAuditReader().getRevisions(StrTestEntity.class, str1_id)); assertEquals(Arrays.asList(1), getAuditReader().getRevisions(StrTestEntity.class, str1_id));
@ -124,7 +127,7 @@ public class TernaryMapFlush extends AbstractEntityTest {
assertEquals(Arrays.asList(1) ,getAuditReader().getRevisions(IntTestEntity.class, int2_id)); assertEquals(Arrays.asList(1) ,getAuditReader().getRevisions(IntTestEntity.class, int2_id));
} }
@Test(dependsOnMethods = "createData") @Test
public void testHistoryOfMap1() { public void testHistoryOfMap1() {
StrTestEntity str1 = getEntityManager().find(StrTestEntity.class, str1_id); StrTestEntity str1 = getEntityManager().find(StrTestEntity.class, str1_id);
StrTestEntity str2 = getEntityManager().find(StrTestEntity.class, str2_id); StrTestEntity str2 = getEntityManager().find(StrTestEntity.class, str2_id);

15
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java
View File

@ -22,17 +22,18 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany.unidirectional; package org.hibernate.envers.test.integration.manytomany.unidirectional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.entities.manytomany.unidirectional.ListUniEntity; import org.hibernate.envers.test.entities.manytomany.unidirectional.ListUniEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -49,7 +50,7 @@ public class BasicUniList extends AbstractEntityTest {
cfg.addAnnotatedClass(StrTestEntity.class); cfg.addAnnotatedClass(StrTestEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

13
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java
View File

@ -22,16 +22,17 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.envers.test.integration.manytomany.unidirectional; package org.hibernate.envers.test.integration.manytomany.unidirectional;
import java.util.Arrays;
import java.util.HashMap;
import javax.persistence.EntityManager;
import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.envers.test.entities.manytomany.unidirectional.MapUniEntity; import org.hibernate.envers.test.entities.manytomany.unidirectional.MapUniEntity;
import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.test.tools.TestTools;
import org.testng.annotations.BeforeClass; import org.junit.Test;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.HashMap;
/** /**
* @author Adam Warski (adam at warski dot org) * @author Adam Warski (adam at warski dot org)
@ -47,7 +48,7 @@ public class BasicUniMap extends AbstractEntityTest {
cfg.addAnnotatedClass(MapUniEntity.class); cfg.addAnnotatedClass(MapUniEntity.class);
} }
@BeforeClass(dependsOnMethods = "init") @Test
public void initData() { public void initData() {
EntityManager em = getEntityManager(); EntityManager em = getEntityManager();

Some files were not shown because too many files have changed in this diff Show More