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

Added annotation configuration to improve readability 

Added JPA-based test-case
This commit is contained in:
Michal Skowronek 2011-05-17 01:34:09 +02:00
parent dca0fa8baf
commit 1fa0ac0be0
8 changed files with 167 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/PassingJoinedSubclassInheritanceSessionTest.java → hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/JoinedSubclassInheritanceSessionTest.java
View File

@ -10,7 +10,7 @@ import java.net.URL;
/**
* @author Michal Skowronek (mskowr at o2 pl)
*/
public class PassingJoinedSubclassInheritanceSessionTest extends AbstractInheritanceStrategiesSessionTest {
public class JoinedSubclassInheritanceSessionTest extends AbstractInheritanceStrategiesSessionTest {
protected void initMappings() throws MappingException, URISyntaxException {
URL url = Thread.currentThread().getContextClassLoader().getResource(

137
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java Normal file
View File

@ -0,0 +1,137 @@
package org.hibernate.envers.test.integration.inheritance.mixed;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest;
import org.hibernate.envers.test.Priority;
import org.hibernate.envers.test.integration.inheritance.mixed.entities.*;
import org.hibernate.testing.FailureExpected;
import org.junit.Test;
import java.util.Arrays;
import static org.junit.Assert.assertEquals;
/**
* @author Michal Skowronek (mskowr at o2 pl)
*/
public class MixedInheritanceStrategiesEntityTest extends AbstractEntityTest {
@Override
public void configure(Ejb3Configuration cfg) {
cfg.addAnnotatedClass(AbstractActivity.class);
cfg.addAnnotatedClass(AbstractCheckActivity.class);
cfg.addAnnotatedClass(CheckInActivity.class);
cfg.addAnnotatedClass(NormalActivity.class);
}
@Test
@Priority(10)
public void initData() {
NormalActivity normalActivity = new NormalActivity();
normalActivity.setId(1);
normalActivity.setSequenceNumber(1);
// Revision 1
getEntityManager().getTransaction().begin();
getEntityManager().persist(normalActivity);
getEntityManager().getTransaction().commit();
// Revision 2
getEntityManager().getTransaction().begin();
normalActivity = getEntityManager().find(NormalActivity.class, 1);
CheckInActivity checkInActivity = new CheckInActivity();
checkInActivity.setId(2);
checkInActivity.setSequenceNumber(0);
checkInActivity.setDurationInMinutes(30);
checkInActivity.setRelatedActivity(normalActivity);
getEntityManager().persist(checkInActivity);
getEntityManager().getTransaction().commit();
// Revision 3
normalActivity = new NormalActivity();
normalActivity.setId(3);
normalActivity.setSequenceNumber(2);
getEntityManager().getTransaction().begin();
getEntityManager().persist(normalActivity);
getEntityManager().getTransaction().commit();
// Revision 4
getEntityManager().getTransaction().begin();
normalActivity = getEntityManager().find(NormalActivity.class, 3);
checkInActivity = getEntityManager().find(CheckInActivity.class, 2);
checkInActivity.setRelatedActivity(normalActivity);
getEntityManager().merge(checkInActivity);
getEntityManager().getTransaction().commit();
}
@Test
public void testRevisionsCounts() {
assertEquals(Arrays.asList(1), getAuditReader().getRevisions(NormalActivity.class, 1));
assertEquals(Arrays.asList(3), getAuditReader().getRevisions(NormalActivity.class, 3));
assertEquals(Arrays.asList(2, 4), getAuditReader().getRevisions(CheckInActivity.class, 2));
}
@Test
public void testCurrentStateOfCheckInActivity() {
final CheckInActivity checkInActivity = getEntityManager().find(CheckInActivity.class, 2);
final NormalActivity normalActivity = getEntityManager().find(NormalActivity.class, 3);
assertEquals(2, checkInActivity.getId().intValue());
assertEquals(0, checkInActivity.getSequenceNumber().intValue());
assertEquals(30, checkInActivity.getDurationInMinutes().intValue());
final Activity relatedActivity = checkInActivity.getRelatedActivity();
assertEquals(normalActivity.getId(), relatedActivity.getId());
assertEquals(normalActivity.getSequenceNumber(), relatedActivity.getSequenceNumber());
}
@Test
public void testCheckCurrentStateOfNormalActivities() throws Exception {
final NormalActivity normalActivity1 = getEntityManager().find(NormalActivity.class, 1);
final NormalActivity normalActivity2 = getEntityManager().find(NormalActivity.class, 3);
assertEquals(1, normalActivity1.getId().intValue());
assertEquals(1, normalActivity1.getSequenceNumber().intValue());
assertEquals(3, normalActivity2.getId().intValue());
assertEquals(2, normalActivity2.getSequenceNumber().intValue());
}
@Test
@FailureExpected(message = "Problem with mixed inheritance strategies", jiraKey = "HHH-6177")
public void doTestFirstRevisionOfCheckInActivity() throws Exception {
CheckInActivity checkInActivity = getAuditReader().find(CheckInActivity.class, 2, 2);
NormalActivity normalActivity = getAuditReader().find(NormalActivity.class, 1, 2);
assertEquals(2, checkInActivity.getId().intValue());
assertEquals(0, checkInActivity.getSequenceNumber().intValue());
assertEquals(30, checkInActivity.getDurationInMinutes().intValue());
Activity relatedActivity = checkInActivity.getRelatedActivity();
assertEquals(normalActivity.getId(), relatedActivity.getId());
assertEquals(normalActivity.getSequenceNumber(), relatedActivity.getSequenceNumber());
}
@Test
@FailureExpected(message = "Problem with mixed inheritance strategies", jiraKey = "HHH-6177")
public void doTestSecondRevisionOfCheckInActivity() throws Exception {
CheckInActivity checkInActivity = getAuditReader().find(CheckInActivity.class, 2, 4);
NormalActivity normalActivity = getAuditReader().find(NormalActivity.class, 3, 4);
assertEquals(2, checkInActivity.getId().intValue());
assertEquals(0, checkInActivity.getSequenceNumber().intValue());
assertEquals(30, checkInActivity.getDurationInMinutes().intValue());
Activity relatedActivity = checkInActivity.getRelatedActivity();
assertEquals(normalActivity.getId(), relatedActivity.getId());
assertEquals(normalActivity.getSequenceNumber(), relatedActivity.getSequenceNumber());
}
}

2
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/FailingMixedInheritanceStrategiesSessionTest.java → hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesSessionTest.java
View File

@ -11,7 +11,7 @@ import java.net.URL;
/**
* @author Michal Skowronek (mskowr at o2 pl)
*/
public class FailingMixedInheritanceStrategiesSessionTest extends AbstractInheritanceStrategiesSessionTest {
public class MixedInheritanceStrategiesSessionTest extends AbstractInheritanceStrategiesSessionTest {
protected void initMappings() throws MappingException, URISyntaxException {
URL url = Thread.currentThread().getContextClassLoader().getResource(

8
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractActivity.java
View File

@ -2,8 +2,16 @@ package org.hibernate.envers.test.integration.inheritance.mixed.entities;
import org.hibernate.envers.Audited;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
@Audited
@Entity
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
public abstract class AbstractActivity implements Activity {
@Id
private Integer id;
private Integer sequenceNumber;

8
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractCheckActivity.java
View File

@ -2,9 +2,17 @@ package org.hibernate.envers.test.integration.inheritance.mixed.entities;
import org.hibernate.envers.Audited;
import javax.persistence.*;
@Audited
@Entity
@DiscriminatorValue(value = "CHECK")
@SecondaryTable(name = "ACTIVITY_CHECK", pkJoinColumns = @PrimaryKeyJoinColumn(name = "ACTIVITY_ID"))
public abstract class AbstractCheckActivity extends AbstractActivity {
@Column(table = "ACTIVITY_CHECK")
private Integer durationInMinutes;
@ManyToOne(targetEntity = AbstractActivity.class, cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
@JoinColumn(table = "ACTIVITY_CHECK")
private Activity relatedActivity;
public Integer getDurationInMinutes() {

5
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/CheckInActivity.java
View File

@ -2,7 +2,12 @@ package org.hibernate.envers.test.integration.inheritance.mixed.entities;
import org.hibernate.envers.Audited;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
@Audited
@Entity
@DiscriminatorValue(value = "CHECK_IN")
public class CheckInActivity extends AbstractCheckActivity {
@Override

5
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/NormalActivity.java
View File

@ -2,7 +2,12 @@ package org.hibernate.envers.test.integration.inheritance.mixed.entities;
import org.hibernate.envers.Audited;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
@Audited
@Entity
@DiscriminatorValue(value = "NORMAL")
public class NormalActivity extends AbstractActivity {
@Override

3
hibernate-envers/src/test/resources/mappings/mixedInheritanceStrategies/mappingsFailing.hbm.xml
View File

@ -16,7 +16,8 @@
<property name="sequenceNumber" type="int" not-null="true"/>
<subclass abstract="true"
name="org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractCheckActivity">
name="org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractCheckActivity"
discriminator-value="CHECK">
<join table="ACTIVITY_CHECK">
<key foreign-key="FK_CHKACT_ACT" not-null="true" column="ACTIVITY_ID"/>
<property name="durationInMinutes" type="int" not-null="true" column="DURATION_IN_MINUTES"/>