Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 91819 invoked from network); 20 Jul 2009 21:56:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Jul 2009 21:56:33 -0000 Received: (qmail 27385 invoked by uid 500); 20 Jul 2009 21:57:38 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 27329 invoked by uid 500); 20 Jul 2009 21:57:38 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 27310 invoked by uid 99); 20 Jul 2009 21:57:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2009 21:57:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2009 21:57:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6D3182388999; Mon, 20 Jul 2009 21:57:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r796037 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java Date: Mon, 20 Jul 2009 21:57:09 -0000 To: commits@openjpa.apache.org From: faywang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090720215709.6D3182388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faywang Date: Mon Jul 20 21:57:08 2009 New Revision: 796037 URL: http://svn.apache.org/viewvc?rev=796037&view=rev Log: OPENJPA-1143: fix test case as the expectedSQL is generated from Derby database and the comparison between push-down sql and expectedSQL is only valid for Derby database. Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java?rev=796037&r1=796036&r2=796037&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java Mon Jul 20 21:57:08 2009 @@ -38,6 +38,7 @@ import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; +import org.apache.openjpa.jdbc.sql.DerbyDictionary; import org.apache.openjpa.lib.jdbc.AbstractJDBCListener; import org.apache.openjpa.lib.jdbc.JDBCEvent; import org.apache.openjpa.lib.jdbc.JDBCListener; @@ -237,6 +238,11 @@ } void executeAndCompareSQL(String jpql, String expectedSQL) { + JDBCConfiguration conf = (JDBCConfiguration) emf.getConfiguration(); + DBDictionary dict = conf.getDBDictionaryInstance(); + if (!(dict instanceof DerbyDictionary)) + return; + Query jQ = em.createQuery(jpql); List jSQL = null; @@ -261,6 +267,11 @@ } void executeAndCompareSQL(Query jQ, String expectedSQL) { + JDBCConfiguration conf = (JDBCConfiguration) emf.getConfiguration(); + DBDictionary dict = conf.getDBDictionaryInstance(); + if (!(dict instanceof DerbyDictionary)) + return; + List jSQL = null; try { jSQL = executeQueryAndCollectSQL(jQ);