HHH-9777 : Dereferenced collections are not processed properly
HHH-9777 : Dereferenced collections are not processed properly (test case changes only)
This commit is contained in:
parent
e07eef3db1
commit
93f56ecf5d
|
@ -321,7 +321,7 @@ public abstract class CollectionType extends AbstractType implements Association
|
||||||
|
|
||||||
// TODO: I don't really like this implementation; it would be better if
|
// TODO: I don't really like this implementation; it would be better if
|
||||||
// this was handled by searchForDirtyCollections()
|
// this was handled by searchForDirtyCollections()
|
||||||
return isOwnerVersioned( session ) && super.isDirty( old, current, session );
|
return super.isDirty( old, current, session );
|
||||||
// return false;
|
// return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,7 @@ import org.hibernate.collection.spi.PersistentCollection;
|
||||||
import org.hibernate.engine.spi.CollectionEntry;
|
import org.hibernate.engine.spi.CollectionEntry;
|
||||||
import org.hibernate.engine.spi.EntityEntry;
|
import org.hibernate.engine.spi.EntityEntry;
|
||||||
import org.hibernate.engine.spi.SessionImplementor;
|
import org.hibernate.engine.spi.SessionImplementor;
|
||||||
|
import org.hibernate.testing.TestForIssue;
|
||||||
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
|
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
|
||||||
|
|
||||||
import java.lang.InstantiationException;
|
import java.lang.InstantiationException;
|
||||||
|
@ -48,6 +49,7 @@ import static org.junit.Assert.assertTrue;
|
||||||
public abstract class AbstractDereferencedCollectionTest extends BaseCoreFunctionalTestCase {
|
public abstract class AbstractDereferencedCollectionTest extends BaseCoreFunctionalTestCase {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@TestForIssue( jiraKey = "HHH-9777" )
|
||||||
public void testMergeNullCollection() {
|
public void testMergeNullCollection() {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
s.getTransaction().begin();
|
s.getTransaction().begin();
|
||||||
|
@ -121,6 +123,7 @@ public abstract class AbstractDereferencedCollectionTest extends BaseCoreFunctio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@TestForIssue( jiraKey = "HHH-9777" )
|
||||||
public void testGetAndNullifyCollection() {
|
public void testGetAndNullifyCollection() {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
s.getTransaction().begin();
|
s.getTransaction().begin();
|
||||||
|
@ -196,7 +199,7 @@ public abstract class AbstractDereferencedCollectionTest extends BaseCoreFunctio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
//@FailureExpected( jiraKey = "HHH-9777")
|
@TestForIssue( jiraKey = "HHH-9777" )
|
||||||
public void testGetAndReplaceCollection() {
|
public void testGetAndReplaceCollection() {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
s.getTransaction().begin();
|
s.getTransaction().begin();
|
||||||
|
|
|
@ -23,10 +23,6 @@
|
||||||
*/
|
*/
|
||||||
package org.hibernate.test.collection.dereferenced;
|
package org.hibernate.test.collection.dereferenced;
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import org.hibernate.testing.FailureExpected;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Gail Badner
|
* @author Gail Badner
|
||||||
*/
|
*/
|
||||||
|
@ -36,25 +32,4 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe
|
||||||
protected Class<?> getCollectionOwnerClass() {
|
protected Class<?> getCollectionOwnerClass() {
|
||||||
return UnversionedCascadeOne.class;
|
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();
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -36,25 +36,4 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere
|
||||||
protected Class<?> getCollectionOwnerClass() {
|
protected Class<?> getCollectionOwnerClass() {
|
||||||
return UnversionedNoCascadeOne.class;
|
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();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,7 +118,6 @@ public class FooBarTest extends LegacyTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@FailureExpected(jiraKey = "HHH-9777")
|
|
||||||
public void testSaveOrUpdateCopyAny() throws Exception {
|
public void testSaveOrUpdateCopyAny() throws Exception {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
s.beginTransaction();
|
s.beginTransaction();
|
||||||
|
|
Loading…
Reference in New Issue