HHH-7819 Correct test issues found in CI hibernate-core-master-matrix

job
hibernate · Nov 21, 2012 · a976af5 · a976af5
1 parent 94385b8
commit a976af5
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 5 deletions.
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/User.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/User.java
@@ -30,6 +30,8 @@
 import javax.persistence.MapKeyColumn;
 import javax.persistence.MapKeyEnumerated;
 import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
 import java.util.EnumMap;
 import java.util.Map;
 
@@ -38,6 +40,7 @@
  * @author Steve Ebersole
  */
 @Entity
+@Table( name = "USER_TABLE" )
 public class User {
 	@javax.persistence.Id
 	@javax.persistence.GeneratedValue(generator = "system-uuid")

diff --git a/hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java b/hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java
@@ -29,6 +29,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
 import org.hibernate.criterion.CriteriaQuery;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.LikeExpression;
@@ -42,19 +43,21 @@
 
 import org.junit.Test;
 
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 
 import static org.junit.Assert.assertEquals;
 
 /**
  * @author Steve Ebersole
  */
-public class CriterionTest extends BaseUnitTestCase {
+public class CriterionTest extends BaseCoreFunctionalTestCase {
 	@Test
 	public void testIlikeRendering() {
 		SessionFactory sf = new Configuration()
 				.addAnnotatedClass( IrrelevantEntity.class )
 				.setProperty( AvailableSettings.DIALECT, IlikeSupportingDialect.class.getName() )
+				.setProperty( Environment.HBM2DDL_AUTO, "create-drop" )
 				.buildSessionFactory();
 		final Criteria criteria = sf.openSession().createCriteria( IrrelevantEntity.class );
 		final CriteriaQueryTranslator translator = new CriteriaQueryTranslator( 
@@ -73,6 +76,7 @@ public void testIlikeMimicing() {
 		SessionFactory sf = new Configuration()
 				.addAnnotatedClass( IrrelevantEntity.class )
 				.setProperty( AvailableSettings.DIALECT, NonIlikeSupportingDialect.class.getName() )
+				.setProperty( Environment.HBM2DDL_AUTO, "create-drop" )
 				.buildSessionFactory();
 		final Criteria criteria = sf.openSession().createCriteria( IrrelevantEntity.class );
 		final CriteriaQueryTranslator translator = new CriteriaQueryTranslator(

diff --git a/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/Child.java b/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/Child.java
@@ -2,6 +2,9 @@
 
 public class Child {
 
+	// A numeric id must be the <id> field.  Some databases (Sybase, etc.)
+	// require identifier columns in order to support scrollable results.
+	private long id;
 	private String name;
 
 	Child() {
@@ -11,6 +14,14 @@ public Child(String name) {
 		this.name = name;
 	}
 
+	public long getId() {
+		return id;
+	}
+
+	void setId(long id) {
+		this.id = id;
+	}
+
 	public String getName() {
 		return name;
 	}

diff --git a/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java b/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java
@@ -176,8 +176,8 @@ else if ( Child.class.isInstance( entity ) ) {
 			}
 		}
 		// check that the same second parent is obtained by calling Session.get()
-		assertSame( pOther, s.get( Parent.class, "parent2" ) );
 		assertNotNull( pOther );
+		assertSame( pOther, s.get( Parent.class, pOther.getId() ) );
 		// access pOther's collection; should be completely loaded
 		assertTrue( Hibernate.isInitialized( pOther.getChildren() ) );
 		assertEquals( childrenOther, pOther.getChildren() );

diff --git a/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/Parent.java
@@ -4,6 +4,10 @@
 import java.util.Set;
 
 public class Parent {
+
+	// A numeric id must be the <id> field.  Some databases (Sybase, etc.)
+	// require identifier columns in order to support scrollable results.
+	private long id;
 	private String name;
 	private Set children = new HashSet();
 
@@ -14,11 +18,18 @@ public Parent(String name) {
 		this.name = name;
 	}
 
+	public long getId() {
+		return id;
+	}
+
+	void setId(long id) {
+		this.id = id;
+	}
+
 	public String getName() {
 		return name;
 	}
 
-
 	void setName(String name) {
 		this.name = name;
 	}

diff --git a/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/ParentChild.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/ParentChild.hbm.xml
@@ -6,7 +6,13 @@
 <hibernate-mapping package="org.hibernate.test.hqlfetchscroll">
 
 	<class name="Parent" table="Parents">
-		<id name="name"/>
+		<!-- A numeric id must be the <id> field.  Some databases (Sybase, etc.)
+        require identifier columns in order to support scrollable results. -->
+		<id name="id">
+		    <generator class="identity"/>
+		</id>
+
+		<property name="name"/>
 
 		<set name="children" cascade="all-delete-orphan" lazy="false">
 			<key column="parent_id"/>
@@ -16,7 +22,13 @@
 	</class>
 
 	<class name="Child" table="chlidren">
-		<id name="name"/>
+		<!-- A numeric id must be the <id> field.  Some databases (Sybase, etc.)
+        require identifier columns in order to support scrollable results. -->
+        <id name="id">
+            <generator class="identity"/>
+        </id>
+
+        <property name="name"/>
 	</class>