svn commit: r930360 - in /db/jdo/trunk/tck2/src: conf/query.conf java/org/apache/jdo/tck/query/api/QueryCancel.java

[mb...@apache.org]

Author: mbo
Date: Fri Apr  2 19:44:59 2010
New Revision: 930360

URL: http://svn.apache.org/viewvc?rev=930360&view=rev
Log:
JDO-623: Query cancel support
Assertion seems to be untestable, thus I drop it from query.conf.

Modified:
    db/jdo/trunk/tck2/src/conf/query.conf
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryCancel.java

Modified: db/jdo/trunk/tck2/src/conf/query.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/query.conf?rev=930360&r1=930359&r2=930360&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/query.conf (original)
+++ db/jdo/trunk/tck2/src/conf/query.conf Fri Apr  2 19:44:59 2010
@@ -49,7 +49,6 @@ org.apache.jdo.tck.query.api.NewQueryWit
 org.apache.jdo.tck.query.api.NewQueryWithExtentAndFilter \
 org.apache.jdo.tck.query.api.NewQueryWithSpecifiedLanguageAndQuery \
 org.apache.jdo.tck.query.api.NewQuerySingleString \
-org.apache.jdo.tck.query.api.QueryCancel \
 org.apache.jdo.tck.query.api.QueryExtentions \
 org.apache.jdo.tck.query.api.SetCandidateCollection \
 org.apache.jdo.tck.query.api.SetCandidateExtent \

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryCancel.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryCancel.java?rev=930360&r1=930359&r2=930360&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryCancel.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryCancel.java Fri Apr  2 19:44:59 2010
@@ -47,6 +47,13 @@ These methods cancel a running query (or
 canceled will throw a JDOQueryInterruptedException.
 If cancel is not supported (most likely due to the underlying implementation not 
 supporting cancel) then JDOUnsupportedOptionException is thrown to the caller.
+
+REMARK:
+This assertion seems to be untestable with the current TCK, thus  
+I drop it from the query.conf configuration.
+
+Looks like Derby is evaluating the query on ResultSet.next() and 
+thus the actual query execution is too fast to be canceled.
  */
 
 public class QueryCancel extends QueryTest {