[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test FooBar.hbm.xml,1.12,1.13 FooBarTest.java,1.50,1.51 MasterDetailTest.java,1.6,1.7

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

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

Modified Files:
	FooBar.hbm.xml FooBarTest.java MasterDetailTest.java 
Log Message:
* imporvements to CompositeUserType
* cascades for <any> mappings
* fixed some bugs withy collection Filter parameters
* correct Type for avg(int)


Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBar.hbm.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FooBar.hbm.xml	2 Apr 2003 13:10:38 -0000	1.12
--- FooBar.hbm.xml	8 Apr 2003 09:49:32 -0000	1.13
***************
*** 126,130 ****
              </array>
            </component>
!           <any name="object" id-type="long">
              <column name="clazz" length="100"/>
              <column name="gen_id"/>
--- 126,130 ----
              </array>
            </component>
!           <any name="object" id-type="long" cascade="all">
              <column name="clazz" length="100"/>
              <column name="gen_id"/>

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** FooBarTest.java	6 Apr 2003 10:11:11 -0000	1.50
--- FooBarTest.java	8 Apr 2003 09:49:33 -0000	1.51
***************
*** 2902,2907 ****
  		BarProxy foo = new Bar();
  		foo.setObject(one);
! 		Serializable oid = s.save(one);
  		Serializable fid = s.save(foo);
  		s.flush();
  		s.connection().commit();
--- 2902,2908 ----
  		BarProxy foo = new Bar();
  		foo.setObject(one);
! 		//Serializable oid = s.save(one);
  		Serializable fid = s.save(foo);
+ 		Serializable oid = new Long( one.getKey() );
  		s.flush();
  		s.connection().commit();
***************
*** 2922,2926 ****
  		foo = (BarProxy) s.load(Foo.class, fid);
  		assertTrue( foo.getObject()!=null && foo.getObject() instanceof One && s.getIdentifier( foo.getObject() ).equals(oid) );
! 		s.delete( foo.getObject() );
  		s.delete(foo);
  		s.flush();
--- 2923,2927 ----
  		foo = (BarProxy) s.load(Foo.class, fid);
  		assertTrue( foo.getObject()!=null && foo.getObject() instanceof One && s.getIdentifier( foo.getObject() ).equals(oid) );
! 		//s.delete( foo.getObject() );
  		s.delete(foo);
  		s.flush();

Index: MasterDetailTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MasterDetailTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MasterDetailTest.java	2 Apr 2003 13:10:39 -0000	1.6
--- MasterDetailTest.java	8 Apr 2003 09:49:34 -0000	1.7
***************
*** 7,10 ****
--- 7,11 ----
  import java.io.ObjectOutputStream;
  import java.io.Serializable;
+ import java.util.ArrayList;
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 122,125 ****
--- 123,142 ----
  		assertTrue( s.filter( master.getDetails(), "order by this.i desc").size()==2 );
  		assertTrue( s.filter( master.getDetails(), "select this where this.id > 0").size()==2 );
+ 		Query q = s.createFilter( master.getDetails(), "where this.id > :id" );
+ 		q.setInteger("id", 0);
+ 		assertTrue( q.list().size()==2 );
+ 		q = s.createFilter( master.getDetails(), "where this.id > :id1 and this.id < :id2" );
+ 		q.setInteger("id1", 0);
+ 		q.setInteger("id2", 99999999);
+ 		assertTrue( q.list().size()==2 );
+ 		q.setInteger("id2", -1);
+ 		assertTrue( q.list().size()==0 );
+ 		q = s.createFilter( master.getDetails(), "where this.id in (:ids)" );
+ 		List list = new ArrayList();
+ 		list.add(did);
+ 		list.add(new Long(-1));
+ 		q.setParameterList("ids", list);
+ 		assertTrue( q.list().size()==1 );
+ 		assertTrue( q.iterate().hasNext() );
  		assertTrue( s.filter( master.getDetails(), "where this.id > 0").size()==2 );
  		assertTrue( s.filter( master.getDetails(), "select this.master where this.id > 0").size()==2 );