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/16 18:36:47 UTC

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

Author: andyj
Date: Sun Jan 16 17:36:47 2011
New Revision: 1059619

URL: http://svn.apache.org/viewvc?rev=1059619&view=rev
Log:
fix expectations of AVG ... supposed to be double now

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/DefaultUnique.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=1059619&r1=1059618&r2=1059619&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 Sun Jan 16 17:36:47 2011
@@ -562,7 +562,7 @@ public class AggregateResult extends Que
         // AVG(double)
         new Double(25000.0),
         // AVG(BigDecimal)
-        new BigDecimal("99.999"),
+        new Double("99.999"),
         // AVG(lifetimeOrthoBenefit)
         null,
         // AVG(((FullTimeEmployee)manager).salary)

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/DefaultUnique.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/DefaultUnique.java?rev=1059619&r1=1059618&r2=1059619&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/DefaultUnique.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/DefaultUnique.java Sun Jan 16 17:36:47 2011
@@ -29,9 +29,6 @@ import org.apache.jdo.tck.query.QueryEle
 import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-
 /**
  *<B>Title:</B> Default Unique.
  *<BR>
@@ -224,13 +221,13 @@ public class DefaultUnique extends Query
                 "emp1", "emp2", "emp3", "emp4", "emp5"}),
         // results for aggregate queries
         new Long(5),
-        new BigDecimal("99.999"),
+        new Double("99.999"),
         new BigDecimal("2000.99"),
         new BigDecimal("2500000.99"),
         new BigDecimal("2552001.98"),
         // results for aggregate queries with grouping
         Arrays.asList(new Object[]{new Long(3), new Long(2)}),
-        Arrays.asList(new Object[]{new BigDecimal("99.999"), new BigDecimal("99.999")}),
+        Arrays.asList(new Object[]{new Double("99.999"), new Double("99.999")}),
         Arrays.asList(new Object[]{new BigDecimal("99.999"), new BigDecimal("99.999")}),
         Arrays.asList(new Object[]{new BigDecimal("99.999"), new BigDecimal("99.999")}),
         Arrays.asList(new Object[]{new BigDecimal("299.997"), new BigDecimal("199.998")})