12:11 a.m.
Author: sannegrinovero
Date: 2010-01-09 18:11:33 -0500 (Sat, 09 Jan 2010)
New Revision: 18493
Modified:
search/trunk/src/test/java/org/hibernate/search/test/embedded/Product.java
search/trunk/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java
search/trunk/src/test/java/org/hibernate/search/test/jgroups/master/JGroupsMasterTest.java
search/trunk/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
search/trunk/src/test/java/org/hibernate/search/test/jms/master/TShirt.java
search/trunk/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 trunk: 1(unit tests fail cos
db2 doesn't allow primary key column nullable) 2(Test JMSMasterTest contains invalid
SQL statement) 3(keywords 'size' on oracle cause two H-search test case fails
4(org.hibernate.search.test.engine.LazyCollectionsUpdatingTest fails on most DB by a NPE).
And fixed new JGroups test accordingly.
Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/Product.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/embedded/Product.java 2010-01-09
20:26:40 UTC (rev 18492)
+++ search/trunk/src/test/java/org/hibernate/search/test/embedded/Product.java 2010-01-09
23:11:33 UTC (rev 18493)
@@ -34,7 +34,6 @@
import javax.persistence.ManyToMany;
import javax.persistence.Column;
import javax.persistence.CascadeType;
-import javax.persistence.MapKeyColumn;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.Field;
@@ -49,15 +48,19 @@
@Entity
@Indexed
public class Product {
+
@Id @GeneratedValue @DocumentId
private Integer id;
+
@Field(index= Index.TOKENIZED)
private String name;
+
@ManyToMany(cascade = CascadeType.REMOVE) //just to make the test easier, cascade
doesn't really make any business sense
@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
- @MapKeyColumn(name="CUST_NAME")
+ @MapKey(columns = @Column(name="CUST_NAME",nullable=false) )
@IndexedEmbedded
private Map<String, Order> orders = new HashMap<String, Order>();
Modified:
search/trunk/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java
===================================================================
---
search/trunk/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java 2010-01-09
20:26:40 UTC (rev 18492)
+++
search/trunk/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java 2010-01-09
23:11:33 UTC (rev 18493)
@@ -51,7 +51,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();
}
@@ -68,7 +71,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/trunk/src/test/java/org/hibernate/search/test/jgroups/master/JGroupsMasterTest.java
===================================================================
---
search/trunk/src/test/java/org/hibernate/search/test/jgroups/master/JGroupsMasterTest.java 2010-01-09
20:26:40 UTC (rev 18492)
+++
search/trunk/src/test/java/org/hibernate/search/test/jgroups/master/JGroupsMasterTest.java 2010-01-09
23:11:33 UTC (rev 18493)
@@ -141,7 +141,7 @@
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/trunk/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
===================================================================
---
search/trunk/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java 2010-01-09
20:26:40 UTC (rev 18492)
+++
search/trunk/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java 2010-01-09
23:11:33 UTC (rev 18493)
@@ -56,7 +56,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
@@ -158,18 +158,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/trunk/src/test/java/org/hibernate/search/test/jms/master/TShirt.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jms/master/TShirt.java 2010-01-09
20:26:40 UTC (rev 18492)
+++ search/trunk/src/test/java/org/hibernate/search/test/jms/master/TShirt.java 2010-01-09
23:11:33 UTC (rev 18493)
@@ -24,6 +24,7 @@
*/
package org.hibernate.search.test.jms.master;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
@@ -45,6 +46,7 @@
private int id;
@Field(index= Index.TOKENIZED)
private String logo;
+ @Column(name="size_")
private String size;
public int getId() {
Modified: search/trunk/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java 2010-01-09
20:26:40 UTC (rev 18492)
+++ search/trunk/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java 2010-01-09
23:11:33 UTC (rev 18493)
@@ -24,6 +24,7 @@
*/
package org.hibernate.search.test.jms.slave;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
@@ -45,6 +46,7 @@
private int id;
@Field(index= Index.TOKENIZED)
private String logo;
+ @Column(name="size_")
private String size;
public int getId() {