You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pp...@apache.org on 2009/11/03 06:39:57 UTC
svn commit: r832304 -
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
Author: ppoddar
Date: Tue Nov 3 05:39:56 2009
New Revision: 832304
URL: http://svn.apache.org/viewvc?rev=832304&view=rev
Log:
Changed column name for Order.count to CNT to save HSQLDB
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java?rev=832304&r1=832303&r2=832304&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java Tue Nov 3 05:39:56 2009
@@ -188,17 +188,17 @@
return;
for (int i = 0; i < jSQL.size(); i++) {
- if (!jSQL.get(i).equals(cSQL.get(i))) {
+ if (!jSQL.get(i).equalsIgnoreCase(cSQL.get(i))) {
printSQL("Target SQL for JPQL", jSQL);
printSQL("Target SQL for CriteriaQuery", cSQL);
- assertEquals(i + "-th SQL for JPQL and CriteriaQuery for " + jpql + " is different", jSQL.get(i), cSQL
- .get(i));
+ assertTrue(i + "-th SQL for JPQL and CriteriaQuery for " + jpql + " is different",
+ jSQL.get(i).equalsIgnoreCase(cSQL.get(i)));
}
}
if (expectedSQL != null) {
- assertEquals("SQL for JPQL and ExpectedSQL for " + jpql + " is different", jSQL.get(0),
- expectedSQL);
+ assertTrue("SQL for JPQL " + jpql + " is different than expecetd " + expectedSQL,
+ jSQL.get(0).equalsIgnoreCase(expectedSQL));
}
}
@@ -222,7 +222,7 @@
if (!jSQL.get(i).equals(expectedSQL)) {
printSQL("SQL for JPQL", jSQL.get(i));
printSQL("Expected SQL", expectedSQL);
- assertTrue(i + "-th Expected SQL and SQL for JPQL: " + jpql + " are different",
+ assertTrue(i + "-th SQL for JPQL: " + jpql + " are different than Expected SQL " + expectedSQL,
expectedSQL.equalsIgnoreCase(jSQL.get(i)));
}
}
@@ -247,7 +247,8 @@
if (!jSql.equalsIgnoreCase(expectedSQL)) {
printSQL("SQL for JPQL", jSql);
- assertEquals(expectedSQL, jSql);
+ assertTrue("SQL for JPQL " + jSql + " is different than expecetd " + expectedSQL,
+ expectedSQL.equalsIgnoreCase(jSql));
}
}