[jboss-cvs] JBossAS SVN: r73170 - trunk/testsuite/src/main/org/jboss/test/cmp2/commerce.

[jboss-cvs-commits at lists.jboss.org]

Author: smcgowan at redhat.com
Date: 2008-05-08 15:09:21 -0400 (Thu, 08 May 2008)
New Revision: 73170

Modified:
   trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
Log:
JBAS-5497

Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java	2008-05-08 19:08:31 UTC (rev 73169)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java	2008-05-08 19:09:21 UTC (rev 73170)
@@ -42,6 +42,7 @@
 import org.jboss.test.util.ejb.EJBTestCase;
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.util.UnreachableStatementException;
+import org.jboss.util.platform.Java;
 
 public class QueryTest extends EJBTestCase
 {
@@ -311,13 +312,29 @@
          "AND t1_pc.subId=t5_l_product_productCategories_R.PRODUCT_CATEGORY_SUBID " +
          "AND t4_l.product=t6_l_product.id AND t0_o.ORDER_NUMBER=t4_l.ORDER_NUMBER";
 
+      //JBAS-5031
+      String expectedJDK6 =
+         "SELECT t0_o.ORDER_NUMBER " +
+         "FROM ORDER_DATA t0_o, LINEITEMEJB t4_l, PRODUCTCATEGORYEJB t1_pc, PRODUCT_PRODUCT_CATEGORY t5_l_product_productCategories_R, PRODUCT t6_l_product " +
+         "WHERE (((t0_o.ORDER_NUMBER = ? AND t1_pc.name = ?))) " +
+	 "AND t0_o.ORDER_NUMBER=t4_l.ORDER_NUMBER " +
+         "AND t6_l_product.id=t5_l_product_productCategories_R.PRODUCT_ID " +
+         "AND t1_pc.id=t5_l_product_productCategories_R.PRODUCT_CATEGORY_ID " +
+         "AND t1_pc.subId=t5_l_product_productCategories_R.PRODUCT_CATEGORY_SUBID " +
+         "AND t4_l.product=t6_l_product.id";
+
       String compiled = compileEJBQL("SELECT OBJECT(o) FROM OrderX o, " +
                                       "IN(o.lineItems) l, " +
                                       "IN(l.product.productCategories) pc " +
                                       "WHERE (o.ordernumber = ?1 and pc.name=?2)",
                                       Collection.class, new Class[]{Long.class, String.class});
-      assertEquals(expected, compiled);
 
+       if (Java.isVersion(Java.VERSION_1_5) == false) {
+      		assertEquals(expectedJDK6, compiled);
+       } else {
+      		assertEquals(expected, compiled);
+       }
+
       expected = "SELECT DISTINCT t0_o.ORDER_NUMBER " +
          "FROM ORDER_DATA t0_o, LINEITEMEJB t3_l " +
          "WHERE (t0_o.ORDER_NUMBER = ?) OR (EXISTS (SELECT t2_o_lineItems.id FROM LINEITEMEJB t2_o_lineItems " +
@@ -363,8 +380,14 @@
                    compileEJBQL("SELECT OBJECT(o) FROM OrderX o WHERE o.ordernumber = ?1 OR o.lineItems IS NOT EMPTY",
                                 Set.class, new Class[]{Long.class}));
 
+
+       if (Java.isVersion(Java.VERSION_1_5) == false) {
+      assertEquals("SELECT t0_l.id FROM CUSTOMEREJB t1_c, ORDER_DATA t3_o, LINEITEMEJB t0_l WHERE ((t1_c.id = 1)) AND t3_o.ORDER_NUMBER=t0_l.ORDER_NUMBER AND t1_c.id=t3_o.customer",
+        compileEJBQL("SELECT OBJECT(l) FROM Customer c, IN(c.orders) o, IN(o.lineItems) l WHERE c.id=1"));
+       } else {
       assertEquals("SELECT t0_l.id FROM CUSTOMEREJB t1_c, ORDER_DATA t3_o, LINEITEMEJB t0_l WHERE ((t1_c.id = 1)) AND t1_c.id=t3_o.customer AND t3_o.ORDER_NUMBER=t0_l.ORDER_NUMBER",
-                   compileEJBQL("SELECT OBJECT(l) FROM Customer c, IN(c.orders) o, IN(o.lineItems) l WHERE c.id=1"));
+        compileEJBQL("SELECT OBJECT(l) FROM Customer c, IN(c.orders) o, IN(o.lineItems) l WHERE c.id=1"));
+	}
 
       // customer query was SELECT OBJECT(s) FROM Service AS s, Platform AS p WHERE p.id = ?1 AND s.server MEMBER OF p.servers
       assertEquals("SELECT t0_l.id FROM LINEITEMEJB t0_l, CUSTOMEREJB t1_c, ORDER_DATA t3_l_order WHERE (t1_c.id = 1 AND EXISTS (SELECT t2_c_orders.ORDER_NUMBER FROM ORDER_DATA t2_c_orders WHERE t1_c.id=t2_c_orders.customer AND t2_c_orders.ORDER_NUMBER=t3_l_order.ORDER_NUMBER) AND t0_l.ORDER_NUMBER=t3_l_order.ORDER_NUMBER)",