[hibernate-commits] Hibernate SVN: r18496 - in search/branches/Branch_3_1/src/test/java/org/hibernate/search/test: engine and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-01-09 18:50:55 -0500 (Sat, 09 Jan 2010)
New Revision: 18496

Modified:
   search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/embedded/Product.java
   search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java
   search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
   search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/TShirt.java
   search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java
Log:
HSEARCH-439 merge fixes from JBAPP (v3_1_1_GA_CP) branch to Branch_3_1 branch

Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/embedded/Product.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/embedded/Product.java	2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/embedded/Product.java	2010-01-09 23:50:55 UTC (rev 18496)
@@ -33,7 +33,7 @@
 	@IndexedEmbedded
 	private Set<Author> authors = new HashSet<Author>();
 	@ManyToMany(cascade = CascadeType.REMOVE) //just to make the test easier, cascade doesn't really make any business sense
-	@MapKey(columns = @Column(name="CUST_NAME") )
+	@MapKey(columns = @Column(name="CUST_NAME",nullable=false) )
 	@IndexedEmbedded
 	private Map<String, Order> orders = new HashMap<String, Order>();
 

Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java	2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java	2010-01-09 23:50:55 UTC (rev 18496)
@@ -28,7 +28,10 @@
 		FullTextSession fullTextSession = Search.getFullTextSession( sessions.openSession() );
 		try {
 			Transaction tx = fullTextSession.beginTransaction();
-			BusStop busStop = (BusStop) fullTextSession.get( BusStop.class, 1L );
+			List list = fullTextSession.createCriteria( BusStop.class ).list();
+			assertNotNull( list );
+			assertEquals( 4 , list.size() );
+			BusStop busStop = (BusStop) list.get( 1 );
 			busStop.setRoadName( "new road" );
 			tx.commit();
 		}
@@ -45,7 +48,10 @@
 		assertFindsByRoadName( "buonarroti" );
 		FullTextSession fullTextSession = Search.getFullTextSession( sessions.openSession() );
 		try {
-			BusStop busStop = (BusStop) fullTextSession.get( BusStop.class, 1L );
+			List list = fullTextSession.createCriteria( BusStop.class ).list();
+			assertNotNull( list );
+			assertEquals( 4 , list.size() );
+			BusStop busStop = (BusStop) list.get( 1 );
 			busStop.setRoadName( "new road" );
 			fullTextSession.flush();
 		}

Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java	2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java	2010-01-09 23:50:55 UTC (rev 18496)
@@ -33,7 +33,7 @@
 import org.hibernate.search.test.SearchTestCase;
 
 /**
- * Tests  that the Master node in a JMS cluster can propertly process messages placed onto the queue.
+ * Tests  that the Master node in a JMS cluster can properly process messages placed onto the queue.
  *
  * @author Emmanuel Bernard
  * @author Hardy Ferentschik
@@ -135,18 +135,18 @@
 	}
 
 	/**
-	 * Create a test object without trigggering indexing. Use SQL directly.
+	 * Create a test object without triggering indexing. Use SQL directly.
 	 *
 	 * @return a <code>TShirt</code> test object.
 	 *
-	 * @throws SQLException in case the inset fails.
+	 * @throws SQLException in case the insert fails.
 	 */
 	private TShirt createObjectWithSQL() throws SQLException {
 		Session s = openSession();
 		s.getTransaction().begin();
 		Statement statement = s.connection().createStatement();
 		statement.executeUpdate(
-				"insert into TShirt_Master(id, logo, size) values( '1', 'JBoss balls', 'large')"
+				"insert into TShirt_Master(id, logo, size_) values( 1, 'JBoss balls', 'large')"
 		);
 		statement.close();
 		TShirt ts = ( TShirt ) s.get( TShirt.class, 1 );

Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/TShirt.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/TShirt.java	2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/TShirt.java	2010-01-09 23:50:55 UTC (rev 18496)
@@ -1,6 +1,7 @@
 //$Id$
 package org.hibernate.search.test.jms.master;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
@@ -22,6 +23,7 @@
 	private int id;
 	@Field(index= Index.TOKENIZED)
 	private String logo;
+	@Column(name="size_")
 	private String size;
 
 	public int getId() {

Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java	2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java	2010-01-09 23:50:55 UTC (rev 18496)
@@ -1,6 +1,7 @@
 //$Id$
 package org.hibernate.search.test.jms.slave;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
@@ -22,6 +23,7 @@
 	private int id;
 	@Field(index= Index.TOKENIZED)
 	private String logo;
+	@Column(name="size_")
 	private String size;
 
 	public int getId() {