[hibernate-commits] Hibernate SVN: r19774 - in core/branches/Branch_3_5: testsuite/src/test/java/org/hibernate/test/component/basic and 3 other directories.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-06-20 15:49:59 -0400 (Sun, 20 Jun 2010)
New Revision: 19774

Modified:
   core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
   core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
   core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java
   core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java
   core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
Log:
HHH-5342 Testes fail on mysql

Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
===================================================================
--- core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java	2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java	2010-06-20 19:49:59 UTC (rev 19774)
@@ -34,7 +34,7 @@
  * @author Steve Ebersole
  */
 public class ExplicitSqlResultSetMappingTest extends TestCase {
-	private String queryString = "select t.\"NAME\" as \"QuotEd_nAMe\" from \"MY_ENTITY_TABLE\" t";
+	private String queryString = null;
 
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
@@ -47,6 +47,9 @@
 	}
 
 	private void prepareTestData() {
+		char open = getDialect().openQuote();
+		char close = getDialect().closeQuote();
+		queryString = "select t."+open+"NAME"+close+" as "+open+"QuotEd_nAMe"+close+" from "+open+"MY_ENTITY_TABLE"+close+" t";
 		Session s = sfi().openSession();
 		s.beginTransaction();
 		s.save( new MyEntity( "mine" ) );

Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
===================================================================
--- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java	2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java	2010-06-20 19:49:59 UTC (rev 19774)
@@ -200,9 +200,9 @@
 			.add( Property.forName("person.yob").between( new Integer(1999), new Integer(2002) ) )
 			.list();
 		if ( getDialect().supportsRowValueConstructorSyntax() ) {
-			s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 'Peachtree Rd')")
+			s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')")
 				.setDate("dob", new Date("March 25, 1974")).list();
-			s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 'Peachtree Rd')")
+			s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')")
 				.setDate("dob", new Date("March 25, 1974")).list();
 		}
 		t.commit();

Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java
===================================================================
--- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java	2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java	2010-06-20 19:49:59 UTC (rev 19774)
@@ -1280,11 +1280,12 @@
 		s = openSession();
 		t = s.beginTransaction();
 		try {
-			Object result = s.createCriteria( CourseMeeting.class).setProjection( Projections.countDistinct( "id" ) ).list();
+			List result = s.createCriteria( CourseMeeting.class).setProjection( Projections.countDistinct( "id" ) ).list();
 			if ( ! getDialect().supportsTupleDistinctCounts() ) {
 				fail( "expected SQLGrammarException" );
 			}
-			assertEquals( 1, ( ( Long ) result ).longValue() );
+			assertFalse(result.isEmpty());
+			assertEquals( 1, ((Long)result.get(0)).intValue() );
 		}
 		catch ( SQLGrammarException ex ) {
 			if ( ! getDialect().supportsTupleDistinctCounts() ) {

Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java
===================================================================
--- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java	2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java	2010-06-20 19:49:59 UTC (rev 19774)
@@ -40,7 +40,8 @@
 		SchemaUpdate v2schemaUpdate = new SchemaUpdate( v2cfg );
 		v2schemaUpdate.execute( true, true );
 		assertEquals( 0, v2schemaUpdate.getExceptions().size() );
-
+		
+		new SchemaExport( v2cfg ).drop( false, true );
 	}
 
 }

Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
===================================================================
--- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java	2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java	2010-06-20 19:49:59 UTC (rev 19774)
@@ -49,6 +49,7 @@
 
 	@Override
 	protected void prepareTest() throws Exception {
+		if(sfi() == null) return;
 		Session session = sfi().openSession();
 		session.beginTransaction();
 		session.save( new Person( "me" ) );
@@ -58,6 +59,7 @@
 
 	@Override
 	protected void cleanupTest() throws Exception {
+		if(sfi() == null) return;
 		Session session = sfi().openSession();
 		session.beginTransaction();
 		session.createQuery( "delete Person" ).executeUpdate();