Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 76075 invoked from network); 3 Oct 2006 21:54:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Oct 2006 21:54:43 -0000 Received: (qmail 86155 invoked by uid 500); 3 Oct 2006 21:54:43 -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 86144 invoked by uid 99); 3 Oct 2006 21:54:43 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Oct 2006 14:54:43 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:54598] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 48/23-00170-22CD2254 for ; Tue, 03 Oct 2006 14:54:42 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 067C31A981C; Tue, 3 Oct 2006 14:54:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452644 - in /db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete: DeletePersistentAll.java DeleteQueryElements.java Date: Tue, 03 Oct 2006 21:54:39 -0000 To: jdo-commits@db.apache.org From: mbo@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061003215440.067C31A981C@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mbo Date: Tue Oct 3 14:54:39 2006 New Revision: 452644 URL: http://svn.apache.org/viewvc?view=rev&rev=452644 Log: JDO-411: merged changes from trunk into branch 2.0.1 Modified: db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java Modified: db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java URL: http://svn.apache.org/viewvc/db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java?view=diff&rev=452644&r1=452643&r2=452644 ============================================================================== --- db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java (original) +++ db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java Tue Oct 3 14:54:39 2006 @@ -21,7 +21,7 @@ import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.company.CompanyModelReader; -import org.apache.jdo.tck.pc.company.Person; +import org.apache.jdo.tck.pc.company.Insurance; import org.apache.jdo.tck.query.QueryElementHolder; import org.apache.jdo.tck.query.QueryTest; import org.apache.jdo.tck.util.BatchTestRunner; @@ -58,7 +58,7 @@ /*UNIQUE*/ null, /*RESULT*/ null, /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, @@ -72,9 +72,9 @@ /*UNIQUE*/ null, /*RESULT*/ null, /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, - /*WHERE*/ "firstname == param", + /*WHERE*/ "carrier == param", /*VARIABLES*/ null, /*PARAMETERS*/ "String param", /*IMPORTS*/ null, @@ -96,43 +96,43 @@ /** */ public void testNoParametersAPI() { deletePersistentAllByAPIQuery(ASSERTION_FAILED, - VALID_QUERIES[0], null, 5); + VALID_QUERIES[0], null, 10); } /** */ public void testNoParametersSingleString() { deletePersistentAllBySingleStringQuery(ASSERTION_FAILED, - VALID_QUERIES[0], null, 5); + VALID_QUERIES[0], null, 10); } /** */ public void testObjectArrayParametersAPI() { - Object[] parameters = new Object[] {"emp1First"}; + Object[] parameters = new Object[] {"Carrier1"}; deletePersistentAllByAPIQuery(ASSERTION_FAILED, - VALID_QUERIES[1], parameters, 1); + VALID_QUERIES[1], parameters, 2); } /** */ public void testObjectArrayParametersSingleString() { - Object[] parameters = new Object[] {"emp1First"}; + Object[] parameters = new Object[] {"Carrier1"}; deletePersistentAllBySingleStringQuery(ASSERTION_FAILED, - VALID_QUERIES[1], parameters, 1); + VALID_QUERIES[1], parameters, 2); } /** */ public void testMapParametersAPI() { Map parameters = new HashMap(); - parameters.put("param", "emp1First"); + parameters.put("param", "Carrier1"); deletePersistentAllByAPIQuery(ASSERTION_FAILED, - VALID_QUERIES[1], parameters, 1); + VALID_QUERIES[1], parameters, 2); } /** */ public void testMapParametersSingleString() { Map parameters = new HashMap(); - parameters.put("param", "emp1First"); + parameters.put("param", "Carrier1"); deletePersistentAllBySingleStringQuery(ASSERTION_FAILED, - VALID_QUERIES[1], parameters, 1); + VALID_QUERIES[1], parameters, 2); } /** Modified: db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java URL: http://svn.apache.org/viewvc/db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java?view=diff&rev=452644&r1=452643&r2=452644 ============================================================================== --- db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java (original) +++ db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java Tue Oct 3 14:54:39 2006 @@ -20,8 +20,9 @@ import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.company.CompanyModelReader; +import org.apache.jdo.tck.pc.company.DentalInsurance; import org.apache.jdo.tck.pc.company.FullTimeEmployee; -import org.apache.jdo.tck.pc.company.Person; +import org.apache.jdo.tck.pc.company.Insurance; import org.apache.jdo.tck.query.QueryElementHolder; import org.apache.jdo.tck.query.QueryTest; import org.apache.jdo.tck.query.result.classes.FullName; @@ -57,10 +58,10 @@ /*UNIQUE*/ Boolean.TRUE, /*RESULT*/ null, /*INTO*/ null, - /*FROM*/ FullTimeEmployee.class, + /*FROM*/ DentalInsurance.class, /*EXCLUDE*/ null, - /*WHERE*/ "salary > 10000 & projects.contains(p) & " + - "p.budget > limit", + /*WHERE*/ "((FullTimeEmployee)employee).salary > 10000 & " + + "employee.projects.contains(p) & p.budget > limit", /*VARIABLES*/ "Project p", /*PARAMETERS*/ "BigDecimal limit", /*IMPORTS*/ "import org.apache.jdo.tck.pc.company.Project; " + @@ -79,9 +80,9 @@ // The query is invalid because it defines a result clause. new QueryElementHolder( /*UNIQUE*/ null, - /*RESULT*/ "firstname, lastname", + /*RESULT*/ "carrier", /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, @@ -95,8 +96,8 @@ new QueryElementHolder( /*UNIQUE*/ null, /*RESULT*/ null, - /*INTO*/ FullName.class, - /*FROM*/ Person.class, + /*INTO*/ String.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, @@ -110,9 +111,9 @@ // and a result class. new QueryElementHolder( /*UNIQUE*/ null, - /*RESULT*/ "firstname, lastname", - /*INTO*/ FullName.class, - /*FROM*/ Person.class, + /*RESULT*/ "carrier", + /*INTO*/ String.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, @@ -127,13 +128,13 @@ /*UNIQUE*/ null, /*RESULT*/ null, /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, /*PARAMETERS*/ null, /*IMPORTS*/ null, - /*GROUP BY*/ "lastname", + /*GROUP BY*/ "carrier", /*ORDER BY*/ null, /*FROM*/ null, /*TO*/ null), @@ -141,15 +142,15 @@ // and a grouping clause new QueryElementHolder( /*UNIQUE*/ null, - /*RESULT*/ "lastname", + /*RESULT*/ "carrier", /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, /*PARAMETERS*/ null, /*IMPORTS*/ null, - /*GROUP BY*/ "lastname", + /*GROUP BY*/ "carrier", /*ORDER BY*/ null, /*FROM*/ null, /*TO*/ null), @@ -158,14 +159,14 @@ /*UNIQUE*/ null, /*RESULT*/ null, /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, /*PARAMETERS*/ null, /*IMPORTS*/ null, /*GROUP BY*/ null, - /*ORDER BY*/ "lastname", + /*ORDER BY*/ "carrier", /*FROM*/ null, /*TO*/ null), // The query is invalid because it defines a range clause. @@ -173,7 +174,7 @@ /*UNIQUE*/ null, /*RESULT*/ null, /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, @@ -190,7 +191,7 @@ /*UNIQUE*/ Boolean.TRUE, /*RESULT*/ null, /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Insurance.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null,