Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 11162 invoked from network); 7 Jan 2011 14:57:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jan 2011 14:57:21 -0000 Received: (qmail 21398 invoked by uid 500); 7 Jan 2011 14:57:20 -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 21391 invoked by uid 99); 7 Jan 2011 14:57:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jan 2011 14:57:19 +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; Fri, 07 Jan 2011 14:57:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 60CA123889E2; Fri, 7 Jan 2011 14:56:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1056341 - in /db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result: AggregateResult.java ResultExpressions.java Date: Fri, 07 Jan 2011 14:56:56 -0000 To: jdo-commits@db.apache.org From: andyj@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110107145656.60CA123889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andyj Date: Fri Jan 7 14:56:56 2011 New Revision: 1056341 URL: http://svn.apache.org/viewvc?rev=1056341&view=rev Log: JDO-643 Apply patch for AVG return type Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/AggregateResult.java db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ResultExpressions.java Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/AggregateResult.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/AggregateResult.java?rev=1056341&r1=1056340&r2=1056341&view=diff ============================================================================== --- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/AggregateResult.java (original) +++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/AggregateResult.java Fri Jan 7 14:56:56 2011 @@ -558,7 +558,7 @@ public class AggregateResult extends Que // MAX(((FullTimeEmployee)manager).salary) new Double(10000), // AVG(long) - new Long(3), + new Double(3), // AVG(double) new Double(25000.0), // AVG(BigDecimal) Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ResultExpressions.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ResultExpressions.java?rev=1056341&r1=1056340&r2=1056341&view=diff ============================================================================== --- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ResultExpressions.java (original) +++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ResultExpressions.java Fri Jan 7 14:56:56 2011 @@ -415,7 +415,7 @@ public class ResultExpressions extends Q // MAX new Long(5), // AVG - new Long(3), + new Double(3), // field expression Arrays.asList(new Object[]{new Long(2), new Long(3), new Long(4), new Long(5), new Long(6)}),