Author: stliu Date: 2010-04-21 11:42:33 -0400 (Wed, 21 Apr 2010) New Revision: 19269 Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java Log: JBPAPP-3223 HHH-3164 'id in ...' with EmbeddedId and criteria API Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-04-21 13:57:59 UTC (rev 19268) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-04-21 15:42:33 UTC (rev 19269) @@ -264,10 +264,7 @@ } public void testQueryInAndComposite() { - //HHH-4907 - if(!Dialect.getDialect().supportsRowValueConstructorSyntaxInInList()){ - return; - } + Session s = openSession( ); Transaction transaction = s.beginTransaction(); @@ -303,19 +300,22 @@ s.persist( someEntity ); s.flush(); + //HHH-4907 + if ( Dialect.getDialect().supportsRowValueConstructorSyntaxInInList() ) { - List ids = new ArrayList<SomeEntityId>(2); - ids.add( new SomeEntityId(1,12) ); - ids.add( new SomeEntityId(10,23) ); + List ids = new ArrayList<SomeEntityId>( 2 ); + ids.add( new SomeEntityId( 1, 12 ) ); + ids.add( new SomeEntityId( 10, 23 ) ); - Criteria criteria = s.createCriteria( SomeEntity.class ); - Disjunction disjunction = Restrictions.disjunction(); + Criteria criteria = s.createCriteria( SomeEntity.class ); + Disjunction disjunction = Restrictions.disjunction(); - disjunction.add( Restrictions.in( "id", ids ) ); - criteria.add( disjunction ); + disjunction.add( Restrictions.in( "id", ids ) ); + criteria.add( disjunction ); - List list = criteria.list(); - assertEquals( 2, list.size() ); + List list = criteria.list(); + assertEquals( 2, list.size() ); + } transaction.rollback(); s.close(); }