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

HHH-7569 Correct test-only failures in hibernate-core-master-matrix CI 

job
This commit is contained in:
brmeyer 2012-09-19 05:29:42 -04:00
parent 45f2d91a2a
commit f3899eabc2
2 changed files with 217 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

530
hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java
View File

@ -1,14 +1,18 @@
package org.hibernate.test.hqlfetchscroll;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.junit.Test;
import org.hibernate.Hibernate;
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
@ -17,18 +21,11 @@ import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.transform.DistinctRootEntityResultTransformer;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
public class HQLScrollFetchTest extends BaseCoreFunctionalTestCase {
@ -36,340 +33,255 @@ public class HQLScrollFetchTest extends BaseCoreFunctionalTestCase {
@Test
public void testNoScroll() {
try {
insertTestData();
Session s = openSession();
List list = s.createQuery( QUERY ).setResultTransformer( DistinctRootEntityResultTransformer.INSTANCE ).list();
assertResultFromAllUsers( list );
s.close();
}
finally {
deleteAll();
}
Session s = openSession();
List list = s.createQuery( QUERY ).setResultTransformer( DistinctRootEntityResultTransformer.INSTANCE ).list();
assertResultFromAllUsers( list );
s.close();
}
@Test
@SkipForDialect( { SQLServerDialect.class, Oracle8iDialect.class, H2Dialect.class } )
public void testScroll() {
//"SQL Server, Oracle, and H2 do not sort the result set automatically, so failure as expected","HQLScrollFetchTest" );
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
finally {
deleteAll();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
@Test
public void testIncompleteScrollFirstResult() {
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
s.close();
}
finally {
deleteAll();
}
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
s.close();
}
@Test
@TestForIssue( jiraKey = "HHH-1283" )
public void testIncompleteScrollSecondResult() {
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
results.next();
p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
s.close();
}
finally {
deleteAll();
}
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
results.next();
p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
s.close();
}
@Test
public void testIncompleteScrollFirstResultInTransaction() {
try {
insertTestData();
Session s = openSession();
Transaction tx = s.beginTransaction();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
tx.commit();
s.close();
}
finally {
deleteAll();
}
Session s = openSession();
Transaction tx = s.beginTransaction();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
tx.commit();
s.close();
}
@Test
@TestForIssue( jiraKey = "HHH-1283" )
public void testIncompleteScrollSecondResultInTransaction() {
try {
insertTestData();
Session s = openSession();
Transaction tx = s.beginTransaction();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
results.next();
p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
tx.commit();
s.close();
}
finally {
deleteAll();
}
Session s = openSession();
Transaction tx = s.beginTransaction();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
results.next();
p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
tx.commit();
s.close();
}
@Test
@TestForIssue( jiraKey = "HHH-1283")
public void testIncompleteScroll() {
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
// get the other parent entity from the persistence context along with its first child
// retrieved from the resultset.
Parent pOther = null;
Child cOther = null;
for ( Object entity : ( (SessionImplementor) s ).getPersistenceContext().getEntitiesByKey().values() ) {
if ( Parent.class.isInstance( entity ) ) {
if ( entity != p ) {
if ( pOther != null ) {
fail( "unexpected parent found." );
}
pOther = (Parent) entity;
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
// get the other parent entity from the persistence context along with its first child
// retrieved from the resultset.
Parent pOther = null;
Child cOther = null;
for ( Object entity : ( (SessionImplementor) s ).getPersistenceContext().getEntitiesByKey().values() ) {
if ( Parent.class.isInstance( entity ) ) {
if ( entity != p ) {
if ( pOther != null ) {
fail( "unexpected parent found." );
}
}
else if ( Child.class.isInstance( entity ) ) {
if ( ! p.getChildren().contains( entity ) ) {
if ( cOther != null ) {
fail( "unexpected child entity found" );
}
cOther = (Child) entity;
}
}
else {
fail( "unexpected type of entity." );
pOther = (Parent) entity;
}
}
// check that the same second parent is obtained by calling Session.get()
assertNull( pOther );
assertNull( cOther );
s.close();
}
finally {
deleteAll();
else if ( Child.class.isInstance( entity ) ) {
if ( ! p.getChildren().contains( entity ) ) {
if ( cOther != null ) {
fail( "unexpected child entity found" );
}
cOther = (Child) entity;
}
}
else {
fail( "unexpected type of entity." );
}
}
// check that the same second parent is obtained by calling Session.get()
assertNull( pOther );
assertNull( cOther );
s.close();
}
@Test
@TestForIssue( jiraKey = "HHH-1283" )
public void testIncompleteScrollLast() {
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
results.last();
// get the other parent entity from the persistence context.
// since the result set was scrolled to the end, the other parent entity's collection has been
// properly initialized.
Parent pOther = null;
Set childrenOther = new HashSet();
for ( Object entity : ( ( SessionImplementor) s ).getPersistenceContext().getEntitiesByKey().values() ) {
if ( Parent.class.isInstance( entity ) ) {
if ( entity != p ) {
if ( pOther != null ) {
fail( "unexpected parent found." );
}
pOther = (Parent) entity;
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
results.next();
Parent p = (Parent) results.get( 0 );
assertResultFromOneUser( p );
results.last();
// get the other parent entity from the persistence context.
// since the result set was scrolled to the end, the other parent entity's collection has been
// properly initialized.
Parent pOther = null;
Set childrenOther = new HashSet();
for ( Object entity : ( ( SessionImplementor) s ).getPersistenceContext().getEntitiesByKey().values() ) {
if ( Parent.class.isInstance( entity ) ) {
if ( entity != p ) {
if ( pOther != null ) {
fail( "unexpected parent found." );
}
}
else if ( Child.class.isInstance( entity ) ) {
if ( ! p.getChildren().contains( entity ) ) {
childrenOther.add( entity );
}
}
else {
fail( "unexpected type of entity." );
pOther = (Parent) entity;
}
}
// check that the same second parent is obtained by calling Session.get()
assertSame( pOther, s.get( Parent.class, "parent2" ) );
assertNotNull( pOther );
// access pOther's collection; should be completely loaded
assertTrue( Hibernate.isInitialized( pOther.getChildren() ) );
assertEquals( childrenOther, pOther.getChildren() );
assertResultFromOneUser( pOther );
s.close();
}
finally {
deleteAll();
else if ( Child.class.isInstance( entity ) ) {
if ( ! p.getChildren().contains( entity ) ) {
childrenOther.add( entity );
}
}
else {
fail( "unexpected type of entity." );
}
}
// check that the same second parent is obtained by calling Session.get()
assertSame( pOther, s.get( Parent.class, "parent2" ) );
assertNotNull( pOther );
// access pOther's collection; should be completely loaded
assertTrue( Hibernate.isInitialized( pOther.getChildren() ) );
assertEquals( childrenOther, pOther.getChildren() );
assertResultFromOneUser( pOther );
s.close();
}
@Test
@TestForIssue( jiraKey = "HHH-1283" )
public void testScrollOrderParentAsc() {
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
finally {
deleteAll();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
@Test
@TestForIssue( jiraKey = "HHH-1283" )
public void testScrollOrderParentDesc() {
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name desc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
finally {
deleteAll();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name desc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
@Test
@TestForIssue( jiraKey = "HHH-1283" )
public void testScrollOrderParentAscChildrenAsc() {
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc, c.name asc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
finally {
deleteAll();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc, c.name asc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
@Test
@TestForIssue( jiraKey = "HHH-1283" )
public void testScrollOrderParentAscChildrenDesc() {
try {
insertTestData();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc, c.name desc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
finally {
deleteAll();
Session s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by p.name asc, c.name desc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
assertResultFromAllUsers( list );
s.close();
}
@Test
public void testScrollOrderChildrenDesc() {
Session s = openSession();
Transaction t = s.beginTransaction();
Parent p0 = new Parent( "parent0" );
s.save( p0 );
t.commit();
s.close();
s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by c.name desc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
try {
insertTestData();
Session s = openSession();
Transaction t = s.beginTransaction();
Parent p0 = new Parent( "parent0" );
s.save( p0 );
t.commit();
s.close();
s = openSession();
ScrollableResults results = s.createQuery( QUERY + " order by c.name desc" ).scroll();
List list = new ArrayList();
while ( results.next() ) {
list.add( results.get( 0 ) );
}
try {
assertResultFromAllUsers( list );
fail( "should have failed because data is ordered incorrectly." );
}
catch ( AssertionError ex ) {
// expected
}
finally {
s.close();
}
assertResultFromAllUsers( list );
fail( "should have failed because data is ordered incorrectly." );
}
catch ( AssertionError ex ) {
// expected
}
finally {
deleteAll();
s.close();
}
}
@Test
public void testListOrderChildrenDesc() {
Session s = openSession();
Transaction t = s.beginTransaction();
Parent p0 = new Parent( "parent0" );
s.save( p0 );
t.commit();
s.close();
s = openSession();
List results = s.createQuery( QUERY + " order by c.name desc" ).list();
try {
insertTestData();
Session s = openSession();
Transaction t = s.beginTransaction();
Parent p0 = new Parent( "parent0" );
s.save( p0 );
t.commit();
s.close();
s = openSession();
List results = s.createQuery( QUERY + " order by c.name desc" ).list();
try {
assertResultFromAllUsers( results );
fail( "should have failed because data is ordered incorrectly." );
}
catch ( AssertionError ex ) {
// expected
}
finally {
s.close();
}
assertResultFromAllUsers( results );
fail( "should have failed because data is ordered incorrectly." );
}
catch ( AssertionError ex ) {
// expected
}
finally {
deleteAll();
s.close();
}
}
@ -388,7 +300,44 @@ public class HQLScrollFetchTest extends BaseCoreFunctionalTestCase {
}
}
private void deleteAll() {
@Override
protected void prepareTest() throws Exception {
Session s = openSession();
Transaction t = s.beginTransaction();
Child child_1_1 = new Child( "achild1-1");
Child child_1_2 = new Child( "ychild1-2");
Child child_1_3 = new Child( "dchild1-3");
Child child_2_1 = new Child( "bchild2-1");
Child child_2_2 = new Child( "cchild2-2");
Child child_2_3 = new Child( "zchild2-3");
s.save( child_1_1 );
s.save( child_2_1 );
s.save( child_1_2 );
s.save( child_2_2 );
s.save( child_1_3 );
s.save( child_2_3 );
s.flush();
Parent p1 = new Parent( "parent1" );
p1.addChild( child_1_1 );
p1.addChild( child_1_2 );
p1.addChild( child_1_3 );
s.save( p1 );
Parent p2 = new Parent( "parent2" );
p2.addChild( child_2_1 );
p2.addChild( child_2_2 );
p2.addChild( child_2_3 );
s.save( p2 );
t.commit();
s.close();
}
@Override
protected void cleanupTest() throws Exception {
Session s = openSession();
Transaction t = s.beginTransaction();
List list = s.createQuery( "from Parent" ).list();
@ -398,59 +347,8 @@ public class HQLScrollFetchTest extends BaseCoreFunctionalTestCase {
t.commit();
s.close();
}
private void insertTestData() {
Session s = openSession();
Transaction t = s.beginTransaction();
Child child_1_1 = new Child( "achild1-1");
Child child_1_2 = new Child( "ychild1-2");
Child child_1_3 = new Child( "dchild1-3");
Child child_2_1 = new Child( "bchild2-1");
Child child_2_2 = new Child( "cchild2-2");
Child child_2_3 = new Child( "zchild2-3");
s.save( child_1_1 );
s.save( child_2_1 );
s.save( child_1_2 );
s.save( child_2_2 );
s.save( child_1_3 );
s.save( child_2_3 );
s.flush();
Parent p1 = new Parent( "parent1" );
p1.addChild( child_1_1 );
p1.addChild( child_1_2 );
p1.addChild( child_1_3 );
s.save( p1 );
Parent p2 = new Parent( "parent2" );
p2.addChild( child_2_1 );
p2.addChild( child_2_2 );
p2.addChild( child_2_3 );
s.save( p2 );
t.commit();
s.close();
}
// private void insertTestData() {
// Session s = openSession();
// Transaction t = s.beginTransaction();
// s.save( makeParent( "parent1", "child1-1", "child1-2", "child1-3" ) );
// s.save( makeParent( "parent2", "child2-1", "child2-2", "child2-3" ) );
// t.commit();
// s.close();
// }
public String[] getMappings() {
return new String[] { "hqlfetchscroll/ParentChild.hbm.xml" };
}
// protected Object makeParent(String name, String child1, String child2, String child3) {
// Parent parent = new Parent( name );
// parent.addChild( new Child( child1 ) );
// parent.addChild( new Child( child2 ) );
// parent.addChild( new Child( child3 ) );
// return parent;
// }
}

4
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
View File

@ -447,7 +447,9 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
sessionFactory.getCache().evictNaturalIdRegions();
}
}
protected boolean isCleanupTestDataRequired(){return false;}
protected boolean isCleanupTestDataRequired() { return false; }
protected void cleanupTestData() throws Exception {
Session s = openSession();
s.beginTransaction();