From jdo-commits-return-1217-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Tue Jan 03 23:57:41 2006 Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 63024 invoked from network); 3 Jan 2006 23:57:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Jan 2006 23:57:41 -0000 Received: (qmail 55470 invoked by uid 500); 3 Jan 2006 23:57:40 -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 55458 invoked by uid 99); 3 Jan 2006 23:57:40 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2006 15:57:40 -0800 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; Tue, 03 Jan 2006 15:57:39 -0800 Received: (qmail 62816 invoked by uid 65534); 3 Jan 2006 23:57:19 -0000 Message-ID: <20060103235719.62815.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r365775 - in /db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query: jdoql/variables/VariablesAndFields.java result/Grouping.java Date: Tue, 03 Jan 2006 23:57:19 -0000 To: jdo-commits@db.apache.org From: clr@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: clr Date: Tue Jan 3 15:57:17 2006 New Revision: 365775 URL: http://svn.apache.org/viewcvs?rev=365775&view=rev Log: JDO-271 changed candidate class from Employee to FullTimeEmployee Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java?rev=365775&r1=365774&r2=365775&view=diff ============================================================================== --- db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java (original) +++ db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java Tue Jan 3 15:57:17 2006 @@ -113,7 +113,7 @@ /*UNIQUE*/ null, /*RESULT*/ null, /*INTO*/ null, - /*FROM*/ Person.class, + /*FROM*/ Employee.class, /*EXCLUDE*/ null, /*WHERE*/ "team.contains(manager) & " + "manager.firstname == 'emp1First'", Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java?rev=365775&r1=365774&r2=365775&view=diff ============================================================================== --- db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java (original) +++ db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java Tue Jan 3 15:57:17 2006 @@ -20,7 +20,7 @@ import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.company.CompanyModelReader; -import org.apache.jdo.tck.pc.company.Employee; +import org.apache.jdo.tck.pc.company.FullTimeEmployee; import org.apache.jdo.tck.query.QueryElementHolder; import org.apache.jdo.tck.query.QueryTest; import org.apache.jdo.tck.util.BatchTestRunner; @@ -55,7 +55,7 @@ /*UNIQUE*/ null, /*RESULT*/ "department, SUM(salary)", /*INTO*/ null, - /*FROM*/ Employee.class, + /*FROM*/ FullTimeEmployee.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, @@ -76,7 +76,7 @@ /*UNIQUE*/ null, /*RESULT*/ "department, salary", /*INTO*/ null, - /*FROM*/ Employee.class, + /*FROM*/ FullTimeEmployee.class, /*EXCLUDE*/ null, /*WHERE*/ null, /*VARIABLES*/ null, @@ -93,8 +93,8 @@ */ private Object[] expectedResult = { Arrays.asList(new Object[] { - new Object[] {getTransientCompanyModelInstance("dept1"), new Double(45000.0)}, - new Object[] {getTransientCompanyModelInstance("dept2"), new Double(58000.0)}}) + new Object[] {getTransientCompanyModelInstance("dept1"), new Double(30000.0)}, + new Object[] {getTransientCompanyModelInstance("dept2"), new Double(45000.0)}}) }; /**