From jdo-commits-return-2270-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Sun Jan 27 21:24:34 2008 Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 86934 invoked from network); 27 Jan 2008 21:24:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jan 2008 21:24:34 -0000 Received: (qmail 70888 invoked by uid 500); 27 Jan 2008 21:24:25 -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 70877 invoked by uid 99); 27 Jan 2008 21:24:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jan 2008 13:24:25 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jan 2008 21:24:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 070E71A9832; Sun, 27 Jan 2008 13:24:11 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r615657 - in /db/jdo/trunk: tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java Date: Sun, 27 Jan 2008 21:24:10 -0000 To: jdo-commits@db.apache.org From: andyj@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080127212411.070E71A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andyj Date: Sun Jan 27 13:24:09 2008 New Revision: 615657 URL: http://svn.apache.org/viewvc?rev=615657&view=rev Log: JDO-568 Fixed incorrectly spelled weeklyHours. Added missing parameter to runTestSubqueries02. Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java?rev=615657&r1=615656&r2=615657&view=diff ============================================================================== --- db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java (original) +++ db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java Sun Jan 27 13:24:09 2008 @@ -135,7 +135,7 @@ List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, - false, null, expectedResult, true); + false, new Object[] {hired}, expectedResult, true); // single String JDOQL Query singleStringQuery = pm.newQuery(singleStringJDOQL); @@ -160,7 +160,7 @@ sub.setResult("avg(this.weeklyhours)"); sub.setFilter("this.manager == :manager"); Query apiQuery = pm.newQuery(Employee.class); - apiQuery.setFilter("this.weeklyHours > averageWeeklyhours"); + apiQuery.setFilter("this.weeklyhours > averageWeeklyhours"); apiQuery.addSubquery(sub, "double averageWeeklyhours", null, "this.manager"); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java?rev=615657&r1=615656&r2=615657&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java Sun Jan 27 13:24:09 2008 @@ -136,7 +136,7 @@ List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, - false, null, expectedResult, true); + false, new Object[]{hired} , expectedResult, true); // single String JDOQL Query singleStringQuery = pm.newQuery(singleStringJDOQL); @@ -161,7 +161,7 @@ sub.setResult("avg(this.weeklyhours)"); sub.setFilter("this.manager == :manager"); Query apiQuery = pm.newQuery(Employee.class); - apiQuery.setFilter("this.weeklyHours > averageWeeklyhours"); + apiQuery.setFilter("this.weeklyhours > averageWeeklyhours"); apiQuery.addSubquery(sub, "double averageWeeklyhours", null, "this.manager"); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true);