HHH-6177 Removed duplicated test cases

This commit is contained in:
Michal Skowronek 2011-06-18 17:22:57 +02:00
parent 6f3c564b9a
commit e62271c7c4
5 changed files with 0 additions and 290 deletions

View File

@ -1,134 +0,0 @@
package org.hibernate.envers.test.integration.inheritance.mixed;
import org.hibernate.envers.test.AbstractSessionTest;
import org.hibernate.envers.test.Priority;
import org.hibernate.envers.test.integration.inheritance.mixed.entities.Activity;
import org.hibernate.envers.test.integration.inheritance.mixed.entities.ActivityId;
import org.hibernate.envers.test.integration.inheritance.mixed.entities.CheckInActivity;
import org.hibernate.envers.test.integration.inheritance.mixed.entities.NormalActivity;
import org.junit.Test;
import java.util.Arrays;
import static org.junit.Assert.assertEquals;
/**
* @author Michal Skowronek (mskowr at o2 pl)
*/
public abstract class AbstractInheritanceStrategiesSessionTest extends AbstractSessionTest {
private ActivityId id1;
private ActivityId id2;
private ActivityId id3;
@Test
@Priority(10)
public void initData() {
NormalActivity normalActivity = new NormalActivity();
id1 = new ActivityId(1, 2);
normalActivity.setId(id1);
normalActivity.setSequenceNumber(1);
// Revision 1
getSession().getTransaction().begin();
getSession().persist(normalActivity);
getSession().getTransaction().commit();
// Revision 2
getSession().getTransaction().begin();
normalActivity = (NormalActivity) getSession().get(NormalActivity.class, id1);
CheckInActivity checkInActivity = new CheckInActivity();
id2 = new ActivityId(2, 3);
checkInActivity.setId(id2);
checkInActivity.setSequenceNumber(0);
checkInActivity.setDurationInMinutes(30);
checkInActivity.setRelatedActivity(normalActivity);
getSession().persist(checkInActivity);
getSession().getTransaction().commit();
// Revision 3
normalActivity = new NormalActivity();
id3 = new ActivityId(3, 4);
normalActivity.setId(id3);
normalActivity.setSequenceNumber(2);
getSession().getTransaction().begin();
getSession().persist(normalActivity);
getSession().getTransaction().commit();
// Revision 4
getSession().getTransaction().begin();
normalActivity = (NormalActivity) getSession().get(NormalActivity.class, id3);
checkInActivity = (CheckInActivity) getSession().get(CheckInActivity.class, id2);
checkInActivity.setRelatedActivity(normalActivity);
getSession().merge(checkInActivity);
getSession().getTransaction().commit();
getSession().close();
}
@Test
public void testRevisionsCounts() {
assertEquals(Arrays.asList(1), getAuditReader().getRevisions(NormalActivity.class, id1));
assertEquals(Arrays.asList(3), getAuditReader().getRevisions(NormalActivity.class, id3));
assertEquals(Arrays.asList(2, 4), getAuditReader().getRevisions(CheckInActivity.class, id2));
}
@Test
public void testCurrentStateOfCheckInActivity() {
final CheckInActivity checkInActivity = (CheckInActivity) getSession().get(CheckInActivity.class, id2);
final NormalActivity normalActivity = (NormalActivity) getSession().get(NormalActivity.class, id3);
assertEquals(id2, checkInActivity.getId());
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 = (NormalActivity) getSession().get(NormalActivity.class, id1);
final NormalActivity normalActivity2 = (NormalActivity) getSession().get(NormalActivity.class, id3);
assertEquals(id1, normalActivity1.getId());
assertEquals(1, normalActivity1.getSequenceNumber().intValue());
assertEquals(id3, normalActivity2.getId());
assertEquals(2, normalActivity2.getSequenceNumber().intValue());
}
public void doTestFirstRevisionOfCheckInActivity() throws Exception {
CheckInActivity checkInActivity = getAuditReader().find(CheckInActivity.class, id2, 2);
NormalActivity normalActivity = getAuditReader().find(NormalActivity.class, id1, 2);
assertEquals(id2, checkInActivity.getId());
assertEquals(0, checkInActivity.getSequenceNumber().intValue());
assertEquals(30, checkInActivity.getDurationInMinutes().intValue());
Activity relatedActivity = checkInActivity.getRelatedActivity();
assertEquals(normalActivity.getId(), relatedActivity.getId());
assertEquals(normalActivity.getSequenceNumber(), relatedActivity.getSequenceNumber());
}
public void doTestSecondRevisionOfCheckInActivity() throws Exception {
CheckInActivity checkInActivity = getAuditReader().find(CheckInActivity.class, id2, 4);
NormalActivity normalActivity = getAuditReader().find(NormalActivity.class, id3, 4);
assertEquals(id2, checkInActivity.getId());
assertEquals(0, checkInActivity.getSequenceNumber().intValue());
assertEquals(30, checkInActivity.getDurationInMinutes().intValue());
Activity relatedActivity = checkInActivity.getRelatedActivity();
assertEquals(normalActivity.getId(), relatedActivity.getId());
assertEquals(normalActivity.getSequenceNumber(), relatedActivity.getSequenceNumber());
}
}

View File

@ -1,30 +0,0 @@
package org.hibernate.envers.test.integration.inheritance.mixed;
import org.hibernate.MappingException;
import org.junit.Test;
import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
/**
* @author Michal Skowronek (mskowr at o2 pl)
*/
public class JoinedSubclassInheritanceSessionTest extends AbstractInheritanceStrategiesSessionTest {
protected void initMappings() throws MappingException, URISyntaxException {
URL url = Thread.currentThread().getContextClassLoader().getResource(
"mappings/mixedInheritanceStrategies/mappingsJoinedSubclass.hbm.xml");
config.addFile(new File(url.toURI()));
}
@Test
public void testFirstRevisionOfCheckInActivity() throws Exception {
doTestFirstRevisionOfCheckInActivity();
}
@Test
public void testSecondRevisionOfCheckInActivity() throws Exception {
doTestSecondRevisionOfCheckInActivity();
}
}

View File

@ -1,30 +0,0 @@
package org.hibernate.envers.test.integration.inheritance.mixed;
import org.hibernate.MappingException;
import org.junit.Test;
import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
/**
* @author Michal Skowronek (mskowr at o2 pl)
*/
public class MixedInheritanceStrategiesSessionTest extends AbstractInheritanceStrategiesSessionTest {
protected void initMappings() throws MappingException, URISyntaxException {
URL url = Thread.currentThread().getContextClassLoader().getResource(
"mappings/mixedInheritanceStrategies/mappingsMixed.hbm.xml");
config.addFile(new File(url.toURI()));
}
@Test
public void testFirstRevisionOfCheckInActivity() throws Exception {
doTestFirstRevisionOfCheckInActivity();
}
@Test
public void testSecondRevisionOfCheckInActivity() throws Exception {
doTestSecondRevisionOfCheckInActivity();
}
}

View File

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class abstract="true" name="org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractActivity"
table="ACTIVITY">
<composite-id name="id" class="org.hibernate.envers.test.integration.inheritance.mixed.entities.ActivityId">
<key-property name="id" type="integer"/>
<key-property name="id2" type="integer"/>
<generator class="assigned"/>
</composite-id>
<property name="sequenceNumber" type="int" not-null="true"/>
<joined-subclass abstract="true"
name="org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractCheckActivity">
<key foreign-key="FK_CHKACT_ACT" not-null="true">
<column name="ACTIVITY_ID"/>
<column name="ACTIVITY_ID2"/>
</key>
<property name="durationInMinutes" type="int" not-null="true" column="DURATION_IN_MINUTES"/>
<many-to-one name="relatedActivity"
cascade="merge"
foreign-key="FK_CHKACT_RELACT"
class="org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractActivity"
lazy="proxy">
<column name="RELATED_ACTIVITY_ID" not-null="false"/>
<column name="RELATED_ACTIVITY_ID2" not-null="false"/>
</many-to-one>
<joined-subclass name="org.hibernate.envers.test.integration.inheritance.mixed.entities.CheckInActivity">
<key foreign-key="FK_CHKINACT_ACT" not-null="true">
<column name="ACTIVITY_ID"/>
<column name="ACTIVITY_ID2"/>
</key>
</joined-subclass>
</joined-subclass>
<joined-subclass name="org.hibernate.envers.test.integration.inheritance.mixed.entities.NormalActivity">
<key foreign-key="FK_NORMALACT_ACT" not-null="true">
<column name="ACTIVITY_ID"/>
<column name="ACTIVITY_ID2"/>
</key>
</joined-subclass>
</class>
</hibernate-mapping>

View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class abstract="true" name="org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractActivity"
table="ACTIVITY">
<composite-id name="id" class="org.hibernate.envers.test.integration.inheritance.mixed.entities.ActivityId">
<key-property name="id" type="integer"/>
<key-property name="id2" type="integer"/>
<generator class="assigned"/>
</composite-id>
<discriminator column="ACTIVITY_TYPE" type="string" length="20"/>
<property name="sequenceNumber" type="int" not-null="true"/>
<subclass abstract="true"
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 name="ACTIVITY_ID"/>
<column name="ACTIVITY_ID2"/>
</key>
<property name="durationInMinutes" type="int" not-null="true" column="DURATION_IN_MINUTES"/>
<many-to-one name="relatedActivity"
cascade="merge"
foreign-key="FK_CHKACT_RELACT"
class="org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractActivity"
lazy="proxy">
<column name="RELATED_ACTIVITY_ID" not-null="false"/>
<column name="RELATED_ACTIVITY_ID2" not-null="false"/>
</many-to-one>
</join>
<subclass name="org.hibernate.envers.test.integration.inheritance.mixed.entities.CheckInActivity"
discriminator-value="CHECK_IN"/>
</subclass>
<subclass name="org.hibernate.envers.test.integration.inheritance.mixed.entities.NormalActivity"
discriminator-value="NORMAL"/>
</class>
</hibernate-mapping>