Author: adamw
Date: 2009-01-20 04:00:54 -0500 (Tue, 20 Jan 2009)
New Revision: 15803
Modified:
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
Log:
HHH-3563: changing tests to use the same convention
Modified:
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java
===================================================================
---
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java 2009-01-20
08:13:54 UTC (rev 15802)
+++
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java 2009-01-20
09:00:54 UTC (rev 15803)
@@ -42,7 +42,7 @@
cfg.addAnnotatedClass(MixedAccessTypeEntity.class);
}
- @Test
+ @BeforeClass(dependsOnMethods = "init")
public void initData() {
EntityManager em = getEntityManager();
em.getTransaction().begin();
@@ -57,12 +57,12 @@
em.getTransaction().commit();
}
- @Test(dependsOnMethods = "initData")
+ @Test
public void testRevisionsCounts() {
assert Arrays.asList(1,
2).equals(getAuditReader().getRevisions(MixedAccessTypeEntity.class, id1));
}
- @Test(dependsOnMethods = "initData")
+ @Test
public void testHistoryOfId1() {
MixedAccessTypeEntity ver1 = new MixedAccessTypeEntity(id1, "data");
MixedAccessTypeEntity ver2 = new MixedAccessTypeEntity(id1, "data2");
Modified:
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
===================================================================
---
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java 2009-01-20
08:13:54 UTC (rev 15802)
+++
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java 2009-01-20
09:00:54 UTC (rev 15803)
@@ -48,7 +48,7 @@
cfg.addAnnotatedClass(StrTestEntity.class);
}
- @Test
+ @BeforeClass(dependsOnMethods = "init")
public void initData() {
// Revision 1
EntityManager em = getEntityManager();
@@ -89,12 +89,12 @@
ste_id2 = ste2.getId();
}
- @Test(dependsOnMethods = "initData")
+ @Test
public void testRevisionsCounts() {
assert Arrays.asList(2,
3).equals(getAuditReader().getRevisions(ManyToOneComponentTestEntity.class, mtocte_id1));
}
- @Test(dependsOnMethods = "initData")
+ @Test
public void testHistoryOfId1() {
StrTestEntity ste1 = getEntityManager().find(StrTestEntity.class, ste_id1);
StrTestEntity ste2 = getEntityManager().find(StrTestEntity.class, ste_id2);
Modified:
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
===================================================================
---
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java 2009-01-20
08:13:54 UTC (rev 15802)
+++
core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java 2009-01-20
09:00:54 UTC (rev 15803)
@@ -31,6 +31,7 @@
import org.hibernate.envers.test.entities.components.relations.OneToManyComponent;
import org.hibernate.envers.test.entities.StrTestEntity;
import org.testng.annotations.Test;
+import org.testng.annotations.BeforeClass;
import org.hibernate.ejb.Ejb3Configuration;
@@ -47,7 +48,7 @@
cfg.addAnnotatedClass(StrTestEntity.class);
}
- @Test
+ @BeforeClass(dependsOnMethods = "init")
public void initData() {
// Revision 1
EntityManager em = getEntityManager();
@@ -89,12 +90,12 @@
ste_id2 = ste2.getId();
}
- @Test(dependsOnMethods = "initData")
+ @Test
public void testRevisionsCounts() {
assert Arrays.asList(2,
3).equals(getAuditReader().getRevisions(OneToManyComponentTestEntity.class, otmcte_id1));
}
- @Test(dependsOnMethods = "initData")
+ @Test
public void testHistoryOfId1() {
StrTestEntity ste1 = getEntityManager().find(StrTestEntity.class, ste_id1);
StrTestEntity ste2 = getEntityManager().find(StrTestEntity.class, ste_id2);
Show replies by date