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

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

Author: wolfc
Date: 2009-08-18 06:50:02 -0400 (Tue, 18 Aug 2009)
New Revision: 92507

Modified:
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
Log:
JBPAPP-2450: make an exemption for VM on HPUX

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-08-18 10:45:11 UTC (rev 92506)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java	2009-08-18 10:50:02 UTC (rev 92507)
@@ -298,7 +298,9 @@
 
    public void testEJBQL() throws Exception
    {
-      boolean sunVM = System.getProperty("java.vm.vendor").indexOf("Sun") > -1;
+      String javaVMVendor = System.getProperty("java.vm.vendor");
+      boolean sunVM = javaVMVendor.indexOf("Sun") > -1;
+      boolean isHPVM = javaVMVendor.contains("Hewlett-Packard Company");
 
       assertEquals("SELECT t0_o.ORDER_NUMBER FROM ORDER_DATA t0_o",
                    compileEJBQL("SELECT OBJECT(o) FROM OrderX o"));
@@ -338,7 +340,7 @@
                                       "WHERE (o.ordernumber = ?1 and pc.name=?2)",
                                       Collection.class, new Class[]{Long.class, String.class});
 
-       if (Java.isVersion(Java.VERSION_1_6) && sunVM) {
+       if (Java.isVersion(Java.VERSION_1_6) && (sunVM || isHPVM)) {
       		assertEquals(expectedJDK6, compiled);
        } else {
       		assertEquals(expected, compiled);