[jboss-cvs] JBossAS SVN: r91173 - branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cmp2/commerce.

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

Author: smcgowan at redhat.com
Date: 2009-07-13 13:25:41 -0400 (Mon, 13 Jul 2009)
New Revision: 91173

Modified:
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
Log:
JBPAPP-2027/JBAS-6962 - another adjustment needed for expected SQL with IBM JDK 6

Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java	2009-07-13 16:15:27 UTC (rev 91172)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java	2009-07-13 17:25:41 UTC (rev 91173)
@@ -165,11 +165,15 @@
 
       String expected = "SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t2_o2_customer, CUSTOMEREJB t1_o1_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t3_o2.customer=t2_o2_customer.id AND t0_o1.customer=t1_o1_customer.id)";
       String expected_IBM_JDK = "SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t1_o1_customer, CUSTOMEREJB t2_o2_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t0_o1.customer=t1_o1_customer.id AND t3_o2.customer=t2_o2_customer.id)";
+     String expected_IBM_JDK6 = "SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t2_o2_customer, CUSTOMEREJB t1_o1_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t3_o2.customer=t2_o2_customer.id AND t0_o1.customer=t1_o1_customer.id)";
+
       String compiled = compileJBossQL(
          "SELECT OBJECT(o1) FROM OrderX o1, OrderX o2 WHERE o1.customer <> o2.customer AND o1.creditCard = o2.creditCard",
          Collection.class, NO_PARAMS);
 
-	if (ibmJDK) {
+	if (Java.isVersion(Java.VERSION_1_6) && (ibmJDK)) {
+	    assertTrue("Expected: " + expected_IBM_JDK6 + " but got: " + compiled, expected_IBM_JDK6.equals(compiled));
+	} else if (ibmJDK) {
 		assertTrue("Expected: " + expected_IBM_JDK + " but got: " + compiled, expected_IBM_JDK.equals(compiled));
 	} else {
 		assertTrue("Expected: " + expected + " but got: " + compiled, expected.equals(compiled));
@@ -294,6 +298,8 @@
 
    public void testEJBQL() throws Exception
    {
+      boolean sunVM = System.getProperty("java.vm.vendor").indexOf("Sun") > -1;
+
       assertEquals("SELECT t0_o.ORDER_NUMBER FROM ORDER_DATA t0_o",
                    compileEJBQL("SELECT OBJECT(o) FROM OrderX o"));
 
@@ -332,7 +338,7 @@
                                       "WHERE (o.ordernumber = ?1 and pc.name=?2)",
                                       Collection.class, new Class[]{Long.class, String.class});
 
-       if (Java.isVersion(Java.VERSION_1_5) == false) {
+       if (Java.isVersion(Java.VERSION_1_6) && sunVM) {
       		assertEquals(expectedJDK6, compiled);
        } else {
       		assertEquals(expected, compiled);