Author: andyj
Date: Thu Jan 24 03:54:43 2008
New Revision: 614854

URL: http://svn.apache.org/viewvc?rev=614854&view=rev
Log:
JDO-568 Fix API query to use same query as single-string query. Expectations match the single-string query

Modified:
    db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java

Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java?rev=614854&r1=614853&r2=614854&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java (original)
+++ db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java Thu Jan 24 03:54:43 2008
@@ -69,7 +69,7 @@
 
         // API query
         Query apiQuery = pm.newQuery(Employee.class);
-        apiQuery.setFilter("this.weeklyhours > emp.weeklyhours && emp.firstName == 'emp1First'");
+        apiQuery.setFilter("this.weeklyhours == emp.weeklyhours && emp.firstName == 'emp1First'");
         // null subquery parameter
         apiQuery.addSubquery(null, "Employee emp", null); 
         executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java?rev=614854&r1=614853&r2=614854&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java Thu Jan 24 03:54:43 2008
@@ -69,7 +69,7 @@
 
         // API query
         Query apiQuery = pm.newQuery(Employee.class);
-        apiQuery.setFilter("this.weeklyhours > emp.weeklyhours && emp.firstname == 'emp1First'");
+        apiQuery.setFilter("this.weeklyhours == emp.weeklyhours && emp.firstname == 'emp1First'");
         // null subquery parameter
         apiQuery.addSubquery(null, Employee.class.getName() + " emp", null); 
         executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL,