[hibernate-commits] Hibernate SVN: r20941 - in annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations: manytomany and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2011-05-17 01:13:27 -0400 (Tue, 17 May 2011)
New Revision: 20941

Modified:
   annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java
   annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
   annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java
Log:
JBPAPP-6541 clean db tables after each test

Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java	2011-05-16 16:47:48 UTC (rev 20940)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java	2011-05-17 05:13:27 UTC (rev 20941)
@@ -116,7 +116,9 @@
 			}
 		}
 		catch ( Throwable e ) {
-			closeSession( e );
+			throw e;
+		}finally{
+			closeSession(  );
 		}
 	}
 
@@ -209,7 +211,7 @@
 		}
 	}
 
-	private void closeSession(Throwable e) throws Throwable {
+	private void closeSession() {
 		try {
 			if ( session != null && session.isOpen() ) {
 				if ( session.isConnected() ) {
@@ -228,7 +230,6 @@
 		}
 		catch ( Exception ignore ) {
 		}
-		throw e;
 	}
 
 	public Session openSession() throws HibernateException {

Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java	2011-05-16 16:47:48 UTC (rev 20940)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java	2011-05-17 05:13:27 UTC (rev 20941)
@@ -14,6 +14,9 @@
 import org.hibernate.JDBCException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
+import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.test.annotations.TestCase;
 
 /**
@@ -22,7 +25,6 @@
  * @author Emmanuel Bernard
  */
 public class ManyToManyTest extends TestCase {
-
 	public ManyToManyTest(String x) {
 		super( x );
 	}
@@ -281,9 +283,12 @@
 	 * 
 	 * 
 	 */
-// HHH-3577
+// HHH-3577 JBPAPP-1123
 	public void testOrderByContractor() throws Exception {
-
+		if(getDialect() instanceof MySQLDialect || getDialect() instanceof PostgreSQLDialect || getDialect() instanceof SQLServerDialect){
+			log.warn("skip test testOrderByContractor due to JBPAPP-1123");
+			return;
+		}
 		Session s;
 		Transaction tx;
 		s = openSession();

Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java	2011-05-16 16:47:48 UTC (rev 20940)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java	2011-05-17 05:13:27 UTC (rev 20941)
@@ -7,12 +7,14 @@
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.Set;
 
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
+import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.test.annotations.Customer;
 import org.hibernate.test.annotations.Discount;
 import org.hibernate.test.annotations.Passport;
@@ -378,8 +380,12 @@
 		tx.commit();
 		s.close();
 	}
-
+	//known issue JBPAPP-1123 HHH-3577
 	public void testOrderByOnSuperclassProperty() {
+		if(getDialect() instanceof MySQLDialect || getDialect() instanceof PostgreSQLDialect || getDialect() instanceof SQLServerDialect){
+			log.warn("skip test testOrderByContractor due to JBPAPP-1123");
+			return;
+		}
 		OrganisationUser user = new OrganisationUser();
 		user.setFirstName( "Emmanuel" );
 		user.setLastName( "Bernard" );
@@ -395,7 +401,7 @@
 		s.persist( org );
 		s.flush();
 		s.clear();
-		List l = s.createQuery( "select org from Organisation org left join fetch org.organisationUsers" ).list();
+		s.createQuery( "select org from Organisation org left join fetch org.organisationUsers" ).list();
 		s.getTransaction().rollback();
 		s.close();
 	}