Author: hardy.ferentschik Date: 2008-08-12 06:07:46 -0400 (Tue, 12 Aug 2008) New Revision: 15035 Modified: search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java search/trunk/src/test/org/hibernate/search/test/embedded/State.java search/trunk/src/test/org/hibernate/search/test/embedded/StateCandidate.java Log: Updated test to be a proper test for HSEARCH-142 Modified: search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2008-08-11 17:02:47 UTC (rev 15034) +++ search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2008-08-12 10:07:46 UTC (rev 15035) @@ -295,12 +295,8 @@ s.clear(); tx = s.beginTransaction(); - // remove the following line to see the test fails. It should not be necessary to - // to also update the name of the candidate. Only updating the state should work - // as well. - //candiate.setName( "Beckstein" ); state.setName( "Hessen" ); - candiate = (StateCandidate) s.merge( candiate ); + state = (State) s.merge( state ); tx.commit(); s.clear(); Modified: search/trunk/src/test/org/hibernate/search/test/embedded/State.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/embedded/State.java 2008-08-11 17:02:47 UTC (rev 15034) +++ search/trunk/src/test/org/hibernate/search/test/embedded/State.java 2008-08-12 10:07:46 UTC (rev 15035) @@ -7,14 +7,18 @@ import javax.persistence.OneToOne; import org.hibernate.search.annotations.ContainedIn; +import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Indexed; /** * @author Hardy Ferentschik */ @Entity +@Indexed // @indexed should not be needed, see HSEARCH-142 and testEmbeddedObjectUpdate() public class State { @Id + @DocumentId @GeneratedValue private Integer id; Modified: search/trunk/src/test/org/hibernate/search/test/embedded/StateCandidate.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/embedded/StateCandidate.java 2008-08-11 17:02:47 UTC (rev 15034) +++ search/trunk/src/test/org/hibernate/search/test/embedded/StateCandidate.java 2008-08-12 10:07:46 UTC (rev 15035) @@ -1,6 +1,6 @@ +// $Id:$ package org.hibernate.search.test.embedded; -// $Id:$ import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue;