You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2011/01/07 15:56:56 UTC

svn commit: r1056341 - in /db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result: AggregateResult.java ResultExpressions.java

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)}),