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);