Author: seade Date: Tue Feb 5 21:17:24 2008 New Revision: 618901 URL: http://svn.apache.org/viewvc?rev=618901&view=rev Log: Update SqlExpressionTest to work with Java 1.6. Fixes TORQUE-109. Thanks to Brendan Miller for the patch.
Modified: db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java Modified: db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java?rev=618901&r1=618900&r2=618901&view=diff ============================================================================== --- db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java (original) +++ db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java Tue Feb 5 21:17:24 2008 @@ -89,9 +89,14 @@ String[] values = new String[] { "42", "43", "44" }; String result = SqlExpression.buildIn("COL", values, SqlEnum.IN, true, db); - // It seems the order of the values is different for jdk1.3 vs 1.4 + // It seems the order of the values is different for jdk1.3 vs 1.4, etc. // In any case, the order is not significant. - if (result.equals("COL IN ('42','43','44')")) + if (result.equals("COL IN ('43','42','44')")) + { + // jdk 1.6 + assertEquals(result, "COL IN ('43','42','44')"); + } + else if (result.equals("COL IN ('42','43','44')")) { // jdk 1.4 assertEquals(result, "COL IN ('42','43','44')"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]