[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test Baz.hbm.xml,1.11,1.12 FooBarTest.java,1.39,1.40 MultiTableTest.java,1.9,1.10

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv31647/hibernate/test

Modified Files:
	Baz.hbm.xml FooBarTest.java MultiTableTest.java 
Log Message:
expanded Criteria API
allowed unmapped-class queries with new from syntax

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Baz.hbm.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Baz.hbm.xml	15 Feb 2003 01:00:55 -0000	1.11
--- Baz.hbm.xml	9 Mar 2003 04:04:09 -0000	1.12
***************
*** 98,102 ****
  	</map>
  
! 	<array name="fooArray" element-class="net.sf.hibernate.test.FooProxy">
  		<!--<jcs-cache usage="read-write"/>-->
  		<key column="id_" />
--- 98,102 ----
  	</map>
  
! 	<array name="fooArray" element-class="net.sf.hibernate.test.FooProxy" where="i&lt;8">
  		<!--<jcs-cache usage="read-write"/>-->
  		<key column="id_" />

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** FooBarTest.java	8 Mar 2003 06:31:23 -0000	1.39
--- FooBarTest.java	9 Mar 2003 04:04:09 -0000	1.40
***************
*** 20,23 ****
--- 20,24 ----
  import junit.framework.TestSuite;
  import net.sf.hibernate.expression.Expression;
+ import net.sf.hibernate.expression.Order;
  import net.sf.hibernate.Databinder;
  import net.sf.hibernate.FlushMode;
***************
*** 157,165 ****
  			.list();
  		assertTrue( list.size()==1 && list.get(0)==f );
! 		list = s.createCriteria(Foo.class).setMaxResults(5).list();
  		assertTrue( list.size()==1 && list.get(0)==f );
  		list = s.createCriteria(Foo.class).setMaxResults(0).list();
  		assertTrue( list.size()==0 );
! 		list = s.createCriteria(Foo.class).setFirstResult(1).list();
  		assertTrue( list.size()==0 );
  		s.delete(f);
--- 158,173 ----
  			.list();
  		assertTrue( list.size()==1 && list.get(0)==f );
! 		list = s.createCriteria(Foo.class)
! 			.setMaxResults(5)
! 			.addOrder( Order.asc("date") )
! 			.list();
  		assertTrue( list.size()==1 && list.get(0)==f );
  		list = s.createCriteria(Foo.class).setMaxResults(0).list();
  		assertTrue( list.size()==0 );
! 		list = s.createCriteria(Foo.class)
! 			.setFirstResult(1)
! 			.addOrder( Order.asc("date") )
! 			.addOrder( Order.desc("string") )
! 			.list();
  		assertTrue( list.size()==0 );
  		s.delete(f);
***************
*** 179,182 ****
--- 187,217 ----
  		s.connection().commit();
  		s.close();	
+ 	}
+ 	
+ 	public void testCollectionWhere() throws Exception {
+ 		Foo foo1 = new Foo();
+ 		Foo foo2 = new Foo();
+ 		Baz baz = new Baz();
+ 		Foo[] arr = new Foo[10];
+ 		arr[0] = foo1;
+ 		arr[9] = foo2;
+ 		Session s = sessions.openSession();
+ 		s.save(foo1);
+ 		s.save(foo2);
+ 		baz.setFooArray(arr);
+ 		s.save(baz);
+ 		s.flush();
+ 		s.connection().commit();
+ 		s.close();
+ 		s = sessions.openSession();
+ 		baz = (Baz) s.load( Baz.class, baz.getCode() );
+ 		assertTrue( baz.getFooArray().length==1 );
+ 		assertTrue( s.find("from Baz baz, baz.fooArray foo").size()==1 );
+ 		assertTrue( s.find("from Foo foo").size()==2 );
+ 		assertTrue( s.filter( baz.getFooArray(), "" ).size()==1 );
+ 		assertTrue( s.delete("from java.lang.Object o")==9 );
+ 		s.flush();
+ 		s.connection().commit();
+ 		s.close();
  	}
  	

Index: MultiTableTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MultiTableTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MultiTableTest.java	6 Mar 2003 11:11:39 -0000	1.9
--- MultiTableTest.java	9 Mar 2003 04:04:09 -0000	1.10
***************
*** 447,450 ****
--- 447,451 ----
  		sess.flush();
  		sess.connection().commit();
+ 		sess.close();
  		
  		sess = sessions.openSession();
***************
*** 454,457 ****
--- 455,459 ----
  		sess.flush();
  		sess.connection().commit();
+ 		sess.close();
  	}