[Hibernate-commits] HibernateExt/metadata/src/test/org/hibernate/test/annotations/id IdTest.java,1.7,1.8

[<epb...@us...>]

Update of /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4885/metadata/src/test/org/hibernate/test/annotations/id

Modified Files:
	IdTest.java 
Log Message:
ANN-98

Index: IdTest.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- IdTest.java	26 Jan 2006 08:41:09 -0000	1.7
+++ IdTest.java	15 Feb 2006 22:29:28 -0000	1.8
@@ -180,6 +180,8 @@
 		s.persist(keeper);
 		tx.commit();
 		s.clear();
+
+		//lookup by id
 		tx = s.beginTransaction();
 		FootballerPk fpk = new FootballerPk("David", "Beckam");
 		fb = (Footballer) s.get(Footballer.class, fpk);
@@ -190,6 +192,26 @@
 		assertEquals( "Beckam", fb.getLastname() );
 		assertEquals( "Arsenal", fb.getClub() );
 		assertEquals( 1, s.createQuery( "from Footballer f where f.firstname = 'David'" ).list().size() );
+		tx.commit();
+
+		//reattach by merge
+		tx = s.beginTransaction();
+		fb.setClub( "Bimbo FC" );
+		s.merge( fb );
+		tx.commit();
+
+		//reattach by saveOrUpdate
+		tx = s.beginTransaction();
+		fb.setClub( "Bimbo FC SA" );
+		s.saveOrUpdate( fb );
+		tx.commit();
+
+		//clean up
+		s.clear();
+		tx = s.beginTransaction();
+		fpk = new FootballerPk("David", "Beckam");
+		fb = (Footballer) s.get(Footballer.class, fpk);
+		assertEquals( "Bimbo FC SA", fb.getClub() );
 		s.delete( fb );
 		s.delete( keeper );
 		tx.commit();