[Hibernate-commits] Hibernate/cirrus/hibernate/test Foo.java,1.36,1.37 LessSimple.java,1.2,1.3 Multi.hbm.xml,1.10,1.11 MultiTableTest.java,1.8,1.9 Qux.java,1.12,1.13

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory usw-pr-cvs1:/tmp/cvs-serv27523/hibernate/test

Modified Files:
	Foo.java LessSimple.java Multi.hbm.xml MultiTableTest.java 
	Qux.java 
Log Message:
outerjoin fetching for normalized mappings

Index: Foo.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Foo.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Foo.java	28 Oct 2002 19:27:49 -0000	1.36
--- Foo.java	5 Nov 2002 03:44:02 -0000	1.37
***************
*** 380,383 ****
--- 380,385 ----
  		this.versionTimestamp = versionTimestamp;
  	}
+ 	
+ 	public void finalize() { } 
  
  }

Index: LessSimple.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/LessSimple.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LessSimple.java	4 Nov 2002 08:10:53 -0000	1.2
--- LessSimple.java	5 Nov 2002 03:44:02 -0000	1.3
***************
*** 8,11 ****
--- 8,13 ----
  	private String foo;
  	private Set set;
+ 	private Simple another;
+ 	private LessSimple yetanother;
  	/**
  	 * Returns the intprop.
***************
*** 54,57 ****
--- 56,91 ----
  	public void setSet(Set set) {
  		this.set = set;
+ 	}
+ 
+ 	/**
+ 	 * Returns the another.
+ 	 * @return Simple
+ 	 */
+ 	public Simple getAnother() {
+ 		return another;
+ 	}
+ 
+ 	/**
+ 	 * Returns the yetanother.
+ 	 * @return LessSimple
+ 	 */
+ 	public LessSimple getYetanother() {
+ 		return yetanother;
+ 	}
+ 
+ 	/**
+ 	 * Sets the another.
+ 	 * @param another The another to set
+ 	 */
+ 	public void setAnother(Simple another) {
+ 		this.another = another;
+ 	}
+ 
+ 	/**
+ 	 * Sets the yetanother.
+ 	 * @param yetanother The yetanother to set
+ 	 */
+ 	public void setYetanother(LessSimple yetanother) {
+ 		this.yetanother = yetanother;
  	}
  

Index: Multi.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Multi.hbm.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Multi.hbm.xml	4 Nov 2002 08:10:54 -0000	1.10
--- Multi.hbm.xml	5 Nov 2002 03:44:02 -0000	1.11
***************
*** 14,19 ****
  	    <joined-subclass name="cirrus.hibernate.test.LessSimple" table="subclass">
  	        <superclass-key column="id_"/>
! 	        <property name="intprop"/>
  	        <one-to-one name="other" class="cirrus.hibernate.test.LessSimple"/>
  	        <property name="foo"/>
  	        <set role="set" lazy="false">
--- 14,21 ----
  	    <joined-subclass name="cirrus.hibernate.test.LessSimple" table="subclass">
  	        <superclass-key column="id_"/>
! 	        <property name="intprop" not-null="true"/>
  	        <one-to-one name="other" class="cirrus.hibernate.test.LessSimple"/>
+ 	        <many-to-one name="another" column="other1" class="cirrus.hibernate.test.Simple"/>
+ 	        <many-to-one name="yetanother" column="other3" class="cirrus.hibernate.test.LessSimple"/>
  	        <property name="foo"/>
  	        <set role="set" lazy="false">
***************
*** 26,30 ****
  	    	<superclass-key column="sid"/>
  	        <property name="extraProp"/>
! 	        <many-to-one name="other" class="cirrus.hibernate.test.Multi" />
  	        
  	        <joined-subclass name="cirrus.hibernate.test.SubMulti" table="submulti">
--- 28,32 ----
  	    	<superclass-key column="sid"/>
  	        <property name="extraProp"/>
! 	        <many-to-one name="other" column="other2" class="cirrus.hibernate.test.Multi" />
  	        
  	        <joined-subclass name="cirrus.hibernate.test.SubMulti" table="submulti">

Index: MultiTableTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/MultiTableTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MultiTableTest.java	4 Nov 2002 08:10:54 -0000	1.8
--- MultiTableTest.java	5 Nov 2002 03:44:02 -0000	1.9
***************
*** 32,35 ****
--- 32,38 ----
  		s.save( simp, new Long(1234) );
  		LessSimple ls = new LessSimple();
+ 		ls.setOther(ls);
+ 		ls.setAnother(ls);
+ 		ls.setYetanother(ls);
  		ls.setName("Less Simple");
  		Set set = new HashSet();
***************
*** 44,48 ****
  		t = s.beginTransaction();
  		ls = (LessSimple) s.load( LessSimple.class, new Long(2) );
! 		assertTrue( ls.getOther()==ls );
  		assertTrue( ls.getSet().size()==2 );
  		Iterator iter = ls.getSet().iterator();
--- 47,51 ----
  		t = s.beginTransaction();
  		ls = (LessSimple) s.load( LessSimple.class, new Long(2) );
! 		assertTrue( ls.getOther()==ls && ls.getAnother()==ls && ls.getYetanother()==ls );
  		assertTrue( ls.getSet().size()==2 );
  		Iterator iter = ls.getSet().iterator();

Index: Qux.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Qux.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Qux.java	2 Nov 2002 14:32:13 -0000	1.12
--- Qux.java	5 Nov 2002 03:44:02 -0000	1.13
***************
*** 157,160 ****
--- 157,162 ----
  		return NO_VETO;
  	}
+ 	
+ 	protected void finalize() { } 
  
  }