Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 61791 invoked from network); 25 Nov 2005 10:04:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Nov 2005 10:04:27 -0000 Received: (qmail 19308 invoked by uid 500); 25 Nov 2005 10:04:07 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 19297 invoked by uid 99); 25 Nov 2005 10:04:07 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 25 Nov 2005 02:04:07 -0800 Received: (qmail 60984 invoked by uid 65534); 25 Nov 2005 10:03:47 -0000 Message-ID: <20051125100347.60983.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r348923 - /incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java Date: Fri, 25 Nov 2005 10:03:46 -0000 To: jdo-commits@db.apache.org From: brazil@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brazil Date: Fri Nov 25 02:03:41 2005 New Revision: 348923 URL: http://svn.apache.org/viewcvs?rev=348923&view=rev Log: Bug fix related to JDO-165: The inner compile method in QuerTest has been added an exception handler silently catching JDOUserExceptions. JDOUserExceptions may be thrown by PersistenceManager.newQuery methods in case of negative tests. Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java?rev=348923&r1=348922&r2=348923&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java Fri Nov 25 02:03:41 2005 @@ -789,17 +789,28 @@ QueryElementHolder queryElementHolder, boolean asSingleString, String singleStringQuery, boolean positive) { PersistenceManager pm = getPM(); - Query query; - if (queryElementHolder != null) { - if (asSingleString) { - query = queryElementHolder.getSingleStringQuery(pm); + try { + Query query; + if (queryElementHolder != null) { + if (asSingleString) { + query = queryElementHolder.getSingleStringQuery(pm); + } else { + query = queryElementHolder.getAPIQuery(pm); + } } else { - query = queryElementHolder.getAPIQuery(pm); + query = getPM().newQuery(singleStringQuery); + } + compile(assertion, query, singleStringQuery, positive); + } catch (JDOUserException e) { + // This exception handler considers a JDOUserException + // to be thrown in newQuery methods. + // A JDOUserException may be expected in case of negative tests. + if (positive) { + fail(assertion + "Query '" + queryElementHolder + + "' must be compilable. The exception message is: " + + e.getMessage()); } - } else { - query = getPM().newQuery(singleStringQuery); } - compile(assertion, query, singleStringQuery, positive); } /**