[hibernate-commits] Hibernate SVN: r21078 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria.

[hibernate-commits at lists.jboss.org]

Author: brmeyer
Date: 2012-09-14 16:05:26 -0400 (Fri, 14 Sep 2012)
New Revision: 21078

Modified:
   core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java
Log:
JBPAPP-9893 HHH-7589  org.hibernate.test.criteria.OuterJoinCriteriaTest fails on Oracle

Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java	2012-09-14 19:11:34 UTC (rev 21077)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java	2012-09-14 20:05:26 UTC (rev 21078)
@@ -30,6 +30,8 @@
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.criterion.Restrictions;
+import org.hibernate.dialect.Oracle8iDialect;
+import org.hibernate.dialect.Oracle9Dialect;
 import org.hibernate.junit.functional.FunctionalTestCase;
 import org.hibernate.sql.JoinFragment;
 
@@ -51,6 +53,12 @@
 	}
 
 	public void testSubcriteriaWithNonNullRestrictions() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();
 
@@ -83,6 +91,12 @@
 	}
 
 	public void testSubcriteriaWithNonNullRestrictionsAliasToEntityMap() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();
 
@@ -121,6 +135,12 @@
 
 
 	public void testSubcriteriaWithNullOrNonNullRestrictions() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();
 
@@ -164,6 +184,12 @@
 	}
 
 	public void testSubcriteriaWithNullOrNonNullRestrictionsAliasToEntityMap() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();
 
@@ -211,53 +237,13 @@
 		s.close();
 	}
 
-//	public void testSubcriteriaWithClauseAliasToEntityMap() {
-//		Session s = openSession();
-//		s.getTransaction().begin();
-//
-//		Criteria rootCriteria = s.createCriteria( Order.class, "o" );
-//		Criteria subCriteria = rootCriteria.createCriteria(
-//				"orderLines",
-//				"ol", JoinFragment.LEFT_OUTER_JOIN,
-//				Restrictions.or(
-//						Restrictions.isNull( "ol.articleId" ),		  // Allow null
-//						Restrictions.eq( "ol.articleId", "1000" )
-//				)
-//		);
-//		assertNotSame( rootCriteria, subCriteria );
-//
-//		List orders = rootCriteria.setResultTransformer( Criteria.ALIAS_TO_ENTITY_MAP ).list();
-//
-//		// all orders should be returned (via map.get( "o" )) with their full collections;
-//		assertEquals( 3, orders.size() );
-//		for ( Iterator it = orders.iterator(); it.hasNext(); ) {
-//			Map map = ( Map ) it.next();
-//			Order o = ( Order ) map.get( "o" );
-//		    // the orderLine returned from the map should either be null or have articleId = "1000"
-//			OrderLine ol = ( OrderLine ) map.get( "ol" );
-//			if ( order1.getOrderId() == o.getOrderId() ) {
-//				// o.getLines() should contain all of its orderLines
-//				assertEquals( order1.getLines().size(), o.getLines().size() );
-//				assertNotNull( ol );
-//				assertEquals( "1000", ol.getArticleId() );
-//			}
-//			else if ( order2.getOrderId() == o.getOrderId() ) {
-//				assertTrue( o.getLines().isEmpty() );
-//				assertNull( ol );
-//			}
-//			else if ( order3.getOrderId() == o.getOrderId() ) {
-//				assertEquals( order3.getLines().size(), o.getLines().size() );
-//				assertNull( ol);
-//			}
-//			else {
-//				fail( "unknown order" );
-//			}
-//		}
-//		s.getTransaction().commit();
-//		s.close();
-//	}
-
 	public void testAliasWithNonNullRestrictions() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();
 
@@ -292,6 +278,12 @@
 	}
 
 	public void testAliasWithNullOrNonNullRestrictions() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();
 
@@ -333,6 +325,12 @@
 	}
 
 	public void testNonNullSubcriteriaRestrictionsOnRootCriteria() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();
 
@@ -368,6 +366,12 @@
 	}
 
 	protected void prepareTest() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();
 
@@ -397,6 +401,12 @@
 	}
 
 	protected void cleanupTest() {
+		if ( getDialect() instanceof Oracle9Dialect
+				|| getDialect() instanceof Oracle8iDialect) {
+			// Does not support identity key generation.
+			return;
+		}
+		
 		Session s = openSession();
 		s.getTransaction().begin();