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

HHH-9239 HHH-9240 : FailureExpected test cases when merging entity copies with dirty collections

This commit is contained in:
Gail Badner 2014-06-12 14:50:45 -07:00
parent 70532259fa
commit c7c5b015c1
2 changed files with 53 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java
View File

@ -30,6 +30,7 @@ import org.junit.Test;
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -40,7 +41,8 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
* Tests merging multiple detached representations of the same entity.
* Tests merging multiple detached representations of the same entity
* where some associations include cascade="delete-orphan"
*
* @author Gail Badner
*/
@ -53,7 +55,7 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
}
@Test
//@FailureExpected( jiraKey = "HHH-9106" )
@FailureExpected( jiraKey = "HHH-9240" )
public void testTopLevelUnidirOneToManyBackrefWithNewElement() {
Item item1 = new Item();
item1.setName( "item1 name" );
@ -108,7 +110,7 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
}
@Test
@TestForIssue( jiraKey = "HHH-9171" )
@FailureExpected( jiraKey = "HHH-9239" )
public void testNestedUnidirOneToManyBackrefWithNewElement() {
Item item1 = new Item();
item1.setName( "item1 name" );
@ -144,29 +146,19 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
s = openSession();
tx = s.beginTransaction();
Item item1Merged = (Item) s.merge( item1 );
// The new SubItem was persisted because it is added to the nested item's collection.
// item1.subItems overwrites the collection (which should remove the new SubItem),
// Even though cascade includes "delete-orphan", the new SubItem is not
// deleted. This is because JPA spec says,"If the entity being orphaned is a detached,
// new, or removed entity, the semantics of orphanRemoval do not apply."
// Because the collection key is non-nullable, SubItem still has a backref to the
// same collection owner.
// gb: Shouldn't the collection key be updated to null causing a ConstraintViolationException???
// Note that the collection resulting from the merge looks OK here.
assertEquals( 1, item1Merged.getSubItemsBackref().size() );
// The resulting collection should contain the added element
assertEquals( 2, item1Merged.getSubItemsBackref().size() );
assertEquals( "subItem1 name", item1Merged.getSubItemsBackref().get( 0 ).getName() );
assertEquals( "subItem2 name", item1Merged.getSubItemsBackref().get( 1 ).getName() );
tx.commit();
s.close();
s = openSession();
tx = s.beginTransaction();
item1 = (Item) s.get( Item.class, item1.getId() );
// The following fails because that new SubItem from the previous transaction gets loaded
// into the collection because it still has the collection key set. <== gb: bug?
assertEquals( 1, item1.getSubItemsBackref().size() );
assertEquals( 2, item1.getSubItemsBackref().size() );
assertEquals( "subItem1 name", item1.getSubItemsBackref().get( 0 ).getName() );
assertEquals( "subItem2 name", item1.getSubItemsBackref().get( 1 ).getName() );
tx.commit();
s.close();
@ -212,7 +204,7 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
s = openSession();
tx = s.beginTransaction();
Item item1Merged = (Item) s.merge( item1 );
// top-level collection should win
// element should be removed
assertEquals( 1, item1Merged.getSubItemsBackref().size() );
tx.commit();
s.close();
@ -221,6 +213,7 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
tx = s.beginTransaction();
item1 = (Item) s.get( Item.class, item1.getId() );
assertEquals( 1, item1.getSubItemsBackref().size() );
// because cascade includes "delete-orphan" the removed SubItem should have been deleted.
subItem1 = (SubItem) s.get( SubItem.class, subItem1.getId() );
assertNull( subItem1 );
tx.commit();
@ -229,7 +222,7 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
}
@Test
//@FailureExpected( jiraKey = "HHH-9171" )
@FailureExpected( jiraKey = "HHH-9239" )
public void testNestedUnidirOneToManyBackrefWithRemovedElement() {
Item item1 = new Item();
item1.setName( "item1 name" );
@ -265,9 +258,8 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
s = openSession();
tx = s.beginTransaction();
Item item1Merged = (Item) s.merge( item1 );
// collection from top-level Item should win
assertEquals( 2, item1Merged.getSubItemsBackref().size() );
assertTrue( item1Merged.getSubItemsBackref().contains( subItem1 ) );
// the element should have been removed
assertEquals( 1, item1Merged.getSubItemsBackref().size() );
assertTrue( item1Merged.getSubItemsBackref().contains( subItem2 ) );
tx.commit();
s.close();
@ -275,9 +267,11 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
s = openSession();
tx = s.beginTransaction();
item1 = (Item) s.get( Item.class, item1.getId() );
assertEquals( 2, item1.getSubItemsBackref().size() );
assertTrue( item1.getSubItemsBackref().contains( subItem1 ) );
assertEquals( 1, item1.getSubItemsBackref().size() );
assertTrue( item1.getSubItemsBackref().contains( subItem2 ) );
// because cascade includes "delete-orphan" the removed SubItem should have been deleted.
subItem1 = (SubItem) s.get( SubItem.class, subItem1.getId() );
assertNull( subItem1 );
tx.commit();
s.close();
@ -335,6 +329,7 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
}
@Test
@FailureExpected( jiraKey = "HHH-9239" )
public void testNestedUnidirOneToManyNoBackrefWithNewElement() {
Category category1 = new Category();
category1.setName( "category1 name" );
@ -367,23 +362,16 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
s = openSession();
tx = s.beginTransaction();
// top-level collection should still have just 1 element.
// copy of subcategory2 should still be persisted even though cascade includes delete-orphan.
// This is because in Section 2.9, Entity Relationships, the JPA 2.1 spec says:
// "If the entity being orphaned is a detached, new, or removed entity, the semantics of orphanRemoval do not apply.".
Category category1Merged = (Category) s.merge( category1 );
assertEquals( 1, category1Merged.getSubCategories().size() );
assertTrue( category1Merged.getSubCategories().contains( subCategory1 ) );
// new element should be there
assertEquals( 2, category1Merged.getSubCategories().size() );
tx.commit();
s.close();
s = openSession();
tx = s.beginTransaction();
category1 = (Category) s.get( Category.class, category1.getId() );
assertEquals( 1, category1.getSubCategories().size() );
assertTrue( category1.getSubCategories().contains( subCategory1 ) );
subCategory2 = (SubCategory) s.createQuery( "from SubCategory sc where sc.name = 'subCategory2 name'" ).uniqueResult();
assertNotNull( subCategory2 );
assertEquals( 2, category1.getSubCategories().size() );
tx.commit();
s.close();
@ -446,7 +434,7 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
}
@Test
//@FailureExpected( jiraKey = "HHH-9171" )
@FailureExpected( jiraKey = "HHH-9239" )
public void testNestedUnidirOneToManyNoBackrefWithRemovedElement() {
Category category1 = new Category();
category1.setName( "category1 name" );
@ -480,10 +468,8 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
s = openSession();
tx = s.beginTransaction();
// top-level collection should still have 2 elements.
Category category1Merged = (Category) s.merge( category1 );
assertEquals( 2, category1Merged.getSubCategories().size() );
assertTrue( category1Merged.getSubCategories().contains( subCategory1 ) );
assertEquals( 1, category1Merged.getSubCategories().size() );
assertTrue( category1Merged.getSubCategories().contains( subCategory2 ) );
tx.commit();
s.close();
@ -491,9 +477,10 @@ public class MergeMultipleEntityRepresentationsOrphanDeleteTest extends BaseCore
s = openSession();
tx = s.beginTransaction();
category1 = (Category) s.get( Category.class, category1.getId() );
assertEquals( 2, category1.getSubCategories().size() );
assertTrue( category1.getSubCategories().contains( subCategory1 ) );
assertEquals( 1, category1.getSubCategories().size() );
assertTrue( category1.getSubCategories().contains( subCategory2 ) );
subCategory1 = (SubCategory) s.get( SubCategory.class, subCategory1.getId() );
assertNull( subCategory1 );
tx.commit();
s.close();

66
hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java
View File

@ -31,6 +31,7 @@ import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.StaleObjectStateException;
import org.hibernate.Transaction;
import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
@ -668,7 +669,7 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
}
@Test
//@FailureExpected( jiraKey = "HHH-9106" )
@FailureExpected( jiraKey = "HHH-9240" )
public void testTopLevelUnidirOneToManyBackrefWithNewElement() {
Item item1 = new Item();
item1.setName( "item1 name" );
@ -723,7 +724,7 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
}
@Test
//@FailureExpected( jiraKey = "HHH-9171" )
@FailureExpected( jiraKey = "HHH-9239" )
public void testNestedUnidirOneToManyBackrefWithNewElement() {
Item item1 = new Item();
item1.setName( "item1 name" );
@ -758,29 +759,19 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
s = openSession();
tx = s.beginTransaction();
Item item1Merged = (Item) s.merge( item1 );
// The new SubItem was persisted because it is added to the nested item's collection.
// item1.subItems overwrites the collection (effectively removing the new SubItem from
// the collection). Because delete-orpban is not enabled, the new SubItem should not be
// deleted; an exception should have been thrown because the new SubItem is no longer
// in a collection and the collection key is non-nullable.
//
// Because cascade includes "delete-orphan", that new SubItem should have been
// deleted, but due to HHH-9171 it was not deleted. Because the collection key
// is non-nullable, SubItem still has a backref to the same collection owner.
// The collection resulting from the merge looks OK here.
assertEquals( 1, item1Merged.getSubItemsBackref().size() );
// The resulting collection should contain the added element
assertEquals( 2, item1Merged.getSubItemsBackref().size() );
assertEquals( "subItem1 name", item1Merged.getSubItemsBackref().get( 0 ).getName() );
assertEquals( "subItem2 name", item1Merged.getSubItemsBackref().get( 1 ).getName() );
tx.commit();
s.close();
s = openSession();
tx = s.beginTransaction();
item1 = (Item) s.get( Item.class, item1.getId() );
// The following fails due to HHH-9171 because in that new SubItem (that should
// have been deleted) from the previous transaction gets loaded into the collection
// because it still has the collection key set.
assertEquals( 1, item1.getSubItemsBackref().size() );
assertEquals( 2, item1.getSubItemsBackref().size() );
assertEquals( "subItem1 name", item1.getSubItemsBackref().get( 0 ).getName() );
assertEquals( "subItem2 name", item1Merged.getSubItemsBackref().get( 1 ).getName() );
tx.commit();
s.close();
@ -826,7 +817,7 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
s = openSession();
tx = s.beginTransaction();
Item item1Merged = (Item) s.merge( item1 );
// top-level collection should win
// entity should have been removed
assertEquals( 1, item1Merged.getSubItemsBackref().size() );
tx.commit();
s.close();
@ -845,7 +836,7 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
}
@Test
//@FailureExpected( jiraKey = "HHH-9171" )
@FailureExpected( jiraKey = "HHH-9239" )
public void testNestedUnidirOneToManyBackrefWithRemovedElement() {
Item item1 = new Item();
item1.setName( "item1 name" );
@ -881,21 +872,19 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
s = openSession();
tx = s.beginTransaction();
Item item1Merged = (Item) s.merge( item1 );
// collection from top-level Item should win
assertEquals( 2, item1Merged.getSubItemsBackref().size() );
assertTrue( item1Merged.getSubItemsBackref().contains( subItem1 ) );
assertTrue( item1Merged.getSubItemsBackref().contains( subItem2 ) );
// entity should have been removed
assertEquals( 1, item1Merged.getSubItemsBackref().size() );
tx.commit();
s.close();
s = openSession();
tx = s.beginTransaction();
item1 = (Item) s.get( Item.class, item1.getId() );
assertEquals( 2, item1.getSubItemsBackref().size() );
assertTrue( item1.getSubItemsBackref().contains( subItem1 ) );
assertTrue( item1.getSubItemsBackref().contains( subItem2 ) );
assertEquals( 1, item1.getSubItemsBackref().size() );
subItem1 = (SubItem) s.get( SubItem.class, subItem1.getId() );
// cascade does not include delete-orphan, so subItem1 should still be persistent.
assertNotNull( subItem1 );
tx.commit();
s.close();
cleanup();
}
@ -951,6 +940,7 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
}
@Test
@FailureExpected( jiraKey = "HHH-9239" )
public void testNestedUnidirOneToManyNoBackrefWithNewElement() {
Category category1 = new Category();
category1.setName( "category1 name" );
@ -983,21 +973,15 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
s = openSession();
tx = s.beginTransaction();
// top-level collection should still have just 1 element.
// copy of subcategory2 should still be persisted.
Category category1Merged = (Category) s.merge( category1 );
assertEquals( 1, category1Merged.getSubCategories().size() );
assertTrue( category1Merged.getSubCategories().contains( subCategory1 ) );
assertEquals( 2, category1Merged.getSubCategories().size() );
tx.commit();
s.close();
s = openSession();
tx = s.beginTransaction();
category1 = (Category) s.get( Category.class, category1.getId() );
assertEquals( 1, category1.getSubCategories().size() );
assertTrue( category1.getSubCategories().contains( subCategory1 ) );
subCategory2 = (SubCategory) s.createQuery( "from SubCategory sc where sc.name = 'subCategory2 name'" ).uniqueResult();
assertNotNull( subCategory2 );
assertEquals( 2, category1.getSubCategories().size() );
tx.commit();
s.close();
@ -1061,7 +1045,7 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
}
@Test
//@FailureExpected( jiraKey = "HHH-9171" )
@FailureExpected( jiraKey = "HHH-9239" )
public void testNestedUnidirOneToManyNoBackrefWithRemovedElement() {
Category category1 = new Category();
category1.setName( "category1 name" );
@ -1095,10 +1079,8 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
s = openSession();
tx = s.beginTransaction();
// top-level collection should still have 2 elements.
Category category1Merged = (Category) s.merge( category1 );
assertEquals( 2, category1Merged.getSubCategories().size() );
assertTrue( category1Merged.getSubCategories().contains( subCategory1 ) );
assertEquals( 1, category1Merged.getSubCategories().size() );
assertTrue( category1Merged.getSubCategories().contains( subCategory2 ) );
tx.commit();
s.close();
@ -1106,9 +1088,11 @@ public class MergeMultipleEntityRepresentationsTest extends BaseCoreFunctionalTe
s = openSession();
tx = s.beginTransaction();
category1 = (Category) s.get( Category.class, category1.getId() );
assertEquals( 2, category1.getSubCategories().size() );
assertTrue( category1.getSubCategories().contains( subCategory1 ) );
assertEquals( 1, category1.getSubCategories().size() );
assertTrue( category1.getSubCategories().contains( subCategory2 ) );
// cascade does not include delete-orphan, so subCategory1 should still be persistent.
subCategory1 = (SubCategory) s.get( SubCategory.class, subCategory1.getId() );
assertNotNull( subCategory1 );
tx.commit();
s.close();