HHH-9777 : Dereferenced collections are not processed properly

HHH-9777 : Dereferenced collections are not processed properly (test case changes only)

Author: gbadner

hibernate-core/src/main/java/org/hibernate/type/CollectionType.java

@@ -321,7 +321,7 @@ public boolean isDirty(Object old, Object current, SessionImplementor session)
 
 		// TODO: I don't really like this implementation; it would be better if
 		// this was handled by searchForDirtyCollections()
-		return isOwnerVersioned( session ) && super.isDirty( old, current, session );
+		return super.isDirty( old, current, session );
 		// return false;
 
 	}

hibernate-core/src/test/java/org/hibernate/test/collection/dereferenced/AbstractDereferencedCollectionTest.java

@@ -31,6 +31,7 @@
 import org.hibernate.engine.spi.CollectionEntry;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 import java.lang.InstantiationException;
@@ -48,6 +49,7 @@
 public abstract class AbstractDereferencedCollectionTest extends BaseCoreFunctionalTestCase {
 
 	@Test
+	@TestForIssue( jiraKey = "HHH-9777" )
 	public void testMergeNullCollection() {
 		Session s = openSession();
 		s.getTransaction().begin();
@@ -121,6 +123,7 @@ public void testMergeNullCollection() {
 	}
 
 	@Test
+	@TestForIssue( jiraKey = "HHH-9777" )
 	public void testGetAndNullifyCollection() {
 		Session s = openSession();
 		s.getTransaction().begin();
@@ -196,7 +199,7 @@ public void testGetAndNullifyCollection() {
 	}
 
 	@Test
-	//@FailureExpected( jiraKey = "HHH-9777")
+	@TestForIssue( jiraKey = "HHH-9777" )
 	public void testGetAndReplaceCollection() {
 		Session s = openSession();
 		s.getTransaction().begin();

hibernate-core/src/test/java/org/hibernate/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java

@@ -23,10 +23,6 @@
  */
 package org.hibernate.test.collection.dereferenced;
 
-import org.junit.Test;
-
-import org.hibernate.testing.FailureExpected;
-
 /**
  * @author Gail Badner
  */
@@ -36,25 +32,4 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe
 	protected Class<?> getCollectionOwnerClass() {
 		return UnversionedCascadeOne.class;
 	}
-
-	@Override
-	@Test
-	@FailureExpected(jiraKey = "HHH-9777")
-	public void testMergeNullCollection() {
-		super.testMergeNullCollection();
-	}
-
-	@Override
-	@Test
-	@FailureExpected(jiraKey = "HHH-9777")
-	public void testGetAndNullifyCollection() {
-		super.testGetAndNullifyCollection();
-	}
-
-	@Override
-	@Test
-	@FailureExpected(jiraKey = "HHH-9777")
-	public void testGetAndReplaceCollection() {
-		super.testGetAndReplaceCollection();
-	}
 }

hibernate-core/src/test/java/org/hibernate/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java

@@ -36,25 +36,4 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere
 	protected Class<?> getCollectionOwnerClass() {
 		return UnversionedNoCascadeOne.class;
 	}
-
-	@Override
-	@Test
-	@FailureExpected(jiraKey = "HHH-9777")
-	public void testMergeNullCollection() {
-		super.testMergeNullCollection();
-	}
-
-	@Override
-	@Test
-	@FailureExpected(jiraKey = "HHH-9777")
-	public void testGetAndNullifyCollection() {
-		super.testGetAndNullifyCollection();
-	}
-
-	@Override
-	@Test
-	@FailureExpected(jiraKey = "HHH-9777")
-	public void testGetAndReplaceCollection() {
-		super.testGetAndReplaceCollection();
-	}
 }

hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java

@@ -118,7 +118,6 @@ public String[] getMappings() {
 	}
 
 	@Test
-	@FailureExpected(jiraKey = "HHH-9777")
 	public void testSaveOrUpdateCopyAny() throws Exception {
 		Session s = openSession();
 		s.beginTransaction();