Index: src/java/org/apache/jdo/tck/query/QueryTest.java
===================================================================
--- src/java/org/apache/jdo/tck/query/QueryTest.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/QueryTest.java	(working copy)
@@ -436,7 +436,7 @@
         if (debug)
             logger.debug("execute '" + filter + "' returns " +  results.size() +
                          " instance(s)");
-        checkQueryResultWithoutOrder(assertion, results, expected);
+        checkQueryResultWithoutOrder(assertion, filter, results, expected);
     }
 
     /**
@@ -458,22 +458,24 @@
         if (debug)
             logger.debug("execute '" + filter + "' with param '" + paramValue +
                          "' returns " +  results.size() + " instance(s)");
-        checkQueryResultWithoutOrder(assertion, results, expected);
+        checkQueryResultWithoutOrder(assertion, filter, results, expected);
     }
 
     // Helper methods to check query result
     
     /** */
     protected void checkQueryResultWithOrder(String assertion, 
+                                             String query,
                                              Object result, 
                                              Object expected) {
         if (!equals(result, expected)) {
-            queryFailed(assertion, result, expected);
+            queryFailed(assertion, query, result, expected);
         }
     }
     
     /** */
     protected void checkQueryResultWithoutOrder(String assertion, 
+                                                String query,
                                                 Object result, 
                                                 Object expected) {
         // We need to explicitly check on collections passed as parameters
@@ -482,16 +484,16 @@
         // for queries without an ordering specification.
         if (result instanceof Collection && expected instanceof Collection) {
             if (!equalsCollection((Collection)result, (Collection)expected)) {
-                queryFailed(assertion, result, expected);
+                queryFailed(assertion, query, result, expected);
             }
         } else {
             if (!equals(result, expected)) {
-                queryFailed(assertion, result, expected);
+                queryFailed(assertion, query, result, expected);
             }
         }
     }
     
-    private void queryFailed(String assertion, Object result, Object expected) {
+    private void queryFailed(String assertion, String query, Object result, Object expected) {
         String lf = System.getProperty("line.separator");
         result = 
             ConversionHelper.convertObjectArrayElements(result);
@@ -499,6 +501,7 @@
             ConversionHelper.convertObjectArrayElements(expected);
         fail(assertion,
              "Wrong query result: " + lf +
+             "query: " + query + lf +
              "expected: " + expected + lf +
              "got:      " + result);
     }
@@ -1185,10 +1188,10 @@
     
                 if (positive) {
                     if (hasOrdering) {
-                        checkQueryResultWithOrder(assertion, result, 
+                        checkQueryResultWithOrder(assertion, singleStringQuery, result, 
                                 expectedResult);
                     } else {
-                        checkQueryResultWithoutOrder(assertion, result, 
+                        checkQueryResultWithoutOrder(assertion, singleStringQuery, result, 
                                 expectedResult);
                     }
                 } else {