HHH-4648 - Test case

hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java

@@ -15,12 +15,14 @@ public class Car {
 	
 	private Person owner;
 
+    private Person driver;
 	
 	public Car() { }
 
-	public Car(int number, Person owner) {
+	public Car(int number, Person owner, Person driver) {
 		this.number = number;
 		this.owner = owner;
+        this.driver = driver;
 	}
 
 	
@@ -48,6 +50,11 @@ public class Car {
 		this.number = number;
 	}
 
+    public Person getDriver() {
+        return driver;
+    }
 
-
+    public void setDriver(Person driver) {
+        this.driver = driver;
+    }
 }

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

@@ -45,8 +45,8 @@ public class ReadEntityAssociatedAuditedTest extends AbstractOneSessionTest{
         Person pers1 = new Person("Hernan", 15);
         Person pers2 = new Person("Leandro", 19);
         
-        Car car1 = new Car(1, pers1);
+        Car car1 = new Car(1, pers1, null);
-        Car car2 = new Car(2, pers2);
+        Car car2 = new Car(2, pers2, null);
         
         //REV 1 
         getSession().getTransaction().begin();

hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java

@@ -0,0 +1,65 @@
+package org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited;
+
+import org.hibernate.MappingException;
+import org.hibernate.envers.test.AbstractOneSessionTest;
+import org.hibernate.envers.test.Priority;
+import org.hibernate.testing.TestForIssue;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+/**
+ * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
+ */
+public class SingleDomainObjectToMultipleTablesTest extends AbstractOneSessionTest {
+    private long carId = 0;
+    private long ownerId = 0;
+    private long driverId = 0;
+
+    protected void initMappings() throws MappingException, URISyntaxException {
+        URL url = Thread.currentThread().getContextClassLoader().getResource("mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml");
+        config.addFile(new File(url.toURI()));
+    }
+
+
+    @Test
+    @Priority(10)
+    public void initData() {
+        initializeSession();
+
+        //REV 1
+        getSession().getTransaction().begin();
+        Person owner = new Person("Lukasz", 25);
+        Person driver = new Person("Kinga", 24);
+        Car car = new Car(1, owner, null);
+        getSession().persist("Personaje", owner);
+        getSession().persist("Driveraje", driver);
+        car.setDriver(driver);
+        getSession().persist(car);
+        getSession().getTransaction().commit();
+        
+        carId = car.getId();
+        ownerId = owner.getId();
+        driverId = driver.getId();
+    }
+
+    @Test
+    @TestForIssue(jiraKey="HHH-4648")
+    public void testSingleDomainObjectToMultipleTablesMapping() {
+        Car carVer1 = getAuditReader().find(Car.class, carId, 1);
+        Person ownerVer1 = getAuditReader().find(Person.class, "Personaje", ownerId, 1);
+        Person driverVer1 = getAuditReader().find(Person.class, "Driveraje", driverId, 1);
+
+        /* Check references. */
+        Assert.assertEquals(ownerVer1.getId(), carVer1.getOwner().getId());
+        Assert.assertEquals(driverVer1.getId(), carVer1.getDriver().getId());
+
+        /* Check object properties. */
+        Assert.assertEquals("Lukasz", ownerVer1.getName());
+        Assert.assertEquals("Kinga", driverVer1.getName());
+        Assert.assertEquals(1, carVer1.getNumber());
+    }
+}

hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml

@@ -2,7 +2,21 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
-	<class name="org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited.Person" entity-name="Personaje">
+	<class name="org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited.Person" entity-name="Personaje" table="OWNERS">
+		
+		<id name="id" column="ID_person" type="long" >
+			<generator class="native" />
+		</id>
+
+		<property name="name" type="string" length="255"
+			column="NAME" not-null="true" />
+			
+		<property name="age" type="int" column="AGE"/>
+			
+	</class>
+
+    <!-- Deliberately use the same domain object and map it to a different database table. See issue HHH-4648. -->
+	<class name="org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited.Person" entity-name="Driveraje" table="DRIVERS">
 
 		<id name="id" column="ID_person" type="long" >
 			<generator class="native" />
@@ -25,6 +39,8 @@
 
 		<many-to-one name="owner" entity-name="Personaje"/>
 
+        <many-to-one name="driver" entity-name="Driveraje"/>
+
 	</class>	
 
 </hibernate-mapping>