From 06f13dd4dc08397f53cfe5dc62d976e007519122 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 21 May 2010 06:56:48 +0000 Subject: [PATCH] account for last H2 failure on core. git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19580 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- .../sql/hand/query/NativeSQLQueriesTest.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java b/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java index 3ae6de9645..fcc55c8e0f 100644 --- a/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java +++ b/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java @@ -365,16 +365,26 @@ public class NativeSQLQueriesTest extends FunctionalTestCase { s = openSession(); t = s.beginTransaction(); - sqlQuery = s.getNamedQuery("organizationreturnproperty"); - sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + sqlQuery = s.getNamedQuery( "organizationreturnproperty" ); + sqlQuery.setResultTransformer( Transformers.ALIAS_TO_ENTITY_MAP ); list = sqlQuery.list(); - assertEquals(2,list.size() ); + assertEquals( 2,list.size() ); m = (Map) list.get(0); - assertTrue(m.containsKey("org")); - assertClassAssignability(m.get("org").getClass(), Organization.class); - assertTrue(m.containsKey("emp")); - assertClassAssignability(m.get("emp").getClass(), Employment.class); - assertEquals(2, m.size()); + assertEquals( 2, m.size() ); + assertTrue( m.containsKey("org") ); + assertTrue( m.containsKey("emp") ); + assertClassAssignability( m.get("org").getClass(), Organization.class ); + if ( jboss.getId() == ( (Organization) m.get("org") ).getId() ) { + assertClassAssignability( m.get("emp").getClass(), Employment.class ); + } + Map m2 = (Map) list.get(1); + assertEquals( 2, m.size() ); + assertTrue( m2.containsKey("org") ); + assertTrue( m2.containsKey("emp") ); + assertClassAssignability( m2.get("org").getClass(), Organization.class ); + if ( jboss.getId() == ( (Organization) m2.get("org") ).getId() ) { + assertClassAssignability( m2.get("emp").getClass(), Employment.class ); + } t.commit(); s.close();