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

HHH-9387 HHH-9389 HHH-9390 : Minor correct to tests to work on 4.2

This commit is contained in:
Gail Badner 2014-09-11 13:12:25 -07:00
parent ea1d63ef43
commit 45c786c54f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
View File

@ -381,7 +381,10 @@ public class CollectionElementTest extends BaseCoreFunctionalTestCase {
);
// The default owner join column can only be computed if it has a PK with 1 column.
assertEquals ( 1, ownerCollection.getOwner().getKey().getColumnSpan() );
assertEquals( ownerForeignKeyNameExpected, ownerCollection.getKey().getColumnIterator().next().getText() );
assertEquals(
ownerForeignKeyNameExpected,
( (Column) ownerCollection.getKey().getColumnIterator().next() ).getText()
);
boolean hasOwnerFK = false;
for ( Iterator it=ownerCollection.getCollectionTable().getForeignKeyIterator(); it.hasNext(); ) {

7
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ManyToManyDefaultsTest.java
View File

@ -27,6 +27,7 @@ import java.util.Iterator;
import org.junit.Test;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.testing.FailureExpected;
@ -215,7 +216,9 @@ public class ManyToManyDefaultsTest extends BaseCoreFunctionalTestCase {
);
// The default owner and inverse join columns can only be computed if they have PK with 1 column.
assertEquals ( 1, ownerCollection.getOwner().getKey().getColumnSpan() );
assertEquals( ownerForeignKeyNameExpected, ownerCollection.getKey().getColumnIterator().next().getText() );
assertEquals(
ownerForeignKeyNameExpected,
( (Column) ownerCollection.getKey().getColumnIterator().next() ).getText() );
final EntityType associatedEntityType = (EntityType) ownerCollection.getElement().getType();
final PersistentClass associatedPersistentClass =
@ -227,7 +230,7 @@ public class ManyToManyDefaultsTest extends BaseCoreFunctionalTestCase {
);
assertEquals(
inverseForeignKeyNameExpected,
inverseCollection.getKey().getColumnIterator().next().getText()
( (Column) inverseCollection.getKey().getColumnIterator().next() ).getText()
);
}
boolean hasOwnerFK = false;