From 9d84c8dea84b6f95fdbbfa59b99b00bd4512e802 Mon Sep 17 00:00:00 2001 From: Erik-Berndt Scheper Date: Tue, 28 Jun 2011 17:29:24 +0200 Subject: [PATCH] HHH-6349 Testcase: AuditJoinTable rows missing when detached entities with collections are merged into the persistence context --- .../collection/MultipleCollectionEntity.java | 2 +- .../collection/MultipleCollectionRefEntity1.java | 2 +- .../collection/MultipleCollectionRefEntity2.java | 2 +- .../collection/DetachedMultipleCollectionChangeTest.java | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) rename hibernate-envers/src/test/java/org/hibernate/envers/test/{integration => entities}/collection/MultipleCollectionEntity.java (98%) rename hibernate-envers/src/test/java/org/hibernate/envers/test/{integration => entities}/collection/MultipleCollectionRefEntity1.java (97%) rename hibernate-envers/src/test/java/org/hibernate/envers/test/{integration => entities}/collection/MultipleCollectionRefEntity2.java (97%) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionEntity.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionEntity.java rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionEntity.java index 5ebb2e82a6..1473c96035 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionEntity.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.envers.test.entities.collection; import java.util.ArrayList; import java.util.Collections; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionRefEntity1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity1.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionRefEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity1.java index 475798d4c9..74e18dcbe0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionRefEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity1.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.envers.test.entities.collection; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionRefEntity2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity2.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionRefEntity2.java rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity2.java index d2bb93d566..f294b57223 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/MultipleCollectionRefEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity2.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.envers.test.entities.collection; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedMultipleCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedMultipleCollectionChangeTest.java index 0437e066b6..9e874a2127 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedMultipleCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedMultipleCollectionChangeTest.java @@ -20,6 +20,9 @@ import org.hibernate.envers.internal.EnversMessageLogger; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.EnversTestingJtaBootstrap; import org.hibernate.envers.test.Priority; +import org.hibernate.envers.test.entities.collection.MultipleCollectionEntity; +import org.hibernate.envers.test.entities.collection.MultipleCollectionRefEntity1; +import org.hibernate.envers.test.entities.collection.MultipleCollectionRefEntity2; import org.jboss.logging.Logger; import org.junit.Test;