[teiid-commits] teiid SVN: r1601 - trunk/test-integration/db/src/test/java/org/teiid/test/testcases.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-11-25 15:58:05 -0500 (Wed, 25 Nov 2009)
New Revision: 1601

Modified:
   trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java
Log:
Teiid 773 -  Test testMultipleSourceMultipleCommands:  added check for which db type the assertion was performed on, because Oracle returns a different value than the others

Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java	2009-11-25 20:33:59 UTC (rev 1600)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java	2009-11-25 20:58:05 UTC (rev 1601)
@@ -399,7 +399,11 @@
         test.execute("select distinct e2 from g1 where e1 > 100");
         
         // NOTE:  if this is an oracle source, it failes because it return varchar2
-        test.assertResultsSetEquals(new String[] {"e2[varchar]", "blah"});
+        if (userTxn.getSource("pm1").getMetaData().getDatabaseProductName().toLowerCase().indexOf("oracle") > -1) {
+            test.assertResultsSetEquals(new String[] {"e2[varchar2]", "blah"});
+        } else {
+            test.assertResultsSetEquals(new String[] {"e2[varchar]", "blah"});
+        }
         test.closeConnection();        
     }