Index: src/java/org/apache/jdo/tck/query/api/DeclareImports.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/DeclareImports.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/DeclareImports.java	(working copy)
@@ -88,7 +88,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "y == param", 
+                    results, expected);
  
             tx.commit();
             tx = null;
Index: src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java	(working copy)
@@ -90,7 +90,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == param",
+                    results, expected);
             tx.commit();
             tx = null;
             if (debug) logger.debug("Test ExecuteQueryWithMap01 - Passed\n");
@@ -124,7 +125,9 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, 
+                    "x == param1 && y == param2",
+                    results, expected);
             tx.commit();
             tx = null;
             if (debug) logger.debug("Test ExecuteQueryWithMap02 - Passed\n");
Index: src/java/org/apache/jdo/tck/query/api/DeclareParameters.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/DeclareParameters.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/DeclareParameters.java	(working copy)
@@ -82,7 +82,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == param",
+                    results, expected);
             tx.commit();
             tx = null;
         }
@@ -112,7 +113,9 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, 
+                    "x == param1 && y == param2",
+                    results, expected);
             tx.commit();
             tx = null;
         }
@@ -141,7 +144,8 @@
             expected.add(p);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == a && y == b",
+                    results, expected);
             tx.commit();
             tx = null;
         }
Index: src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java	(working copy)
@@ -89,7 +89,7 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == param", results, expected);
             
             tx.commit();
             tx = null;
@@ -122,7 +122,9 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED,
+                    "x == param1 && y == param2", 
+                    results, expected);
             tx.commit();
             tx = null;
             if (debug) logger.debug ("Test ExecuteQueryWithArray02 - Passed\n");
Index: src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java	(working copy)
@@ -72,7 +72,8 @@
             expected.add(pcp1);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 1",
+                    results, expected);
 
             tx.commit();
             tx = null;
Index: src/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java	(working copy)
@@ -71,7 +71,8 @@
             expected.add(pcp1);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 1",
+                    results, expected);
 
             tx.commit();
             tx = null;
Index: src/java/org/apache/jdo/tck/query/api/SetFilter.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/SetFilter.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/SetFilter.java	(working copy)
@@ -77,7 +77,8 @@
             expected.add(new PCPoint(2, 2));
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 2",
+                    results, expected);
 
             tx.commit();
             tx = null;
Index: src/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java	(working copy)
@@ -104,7 +104,8 @@
             expected.add(p4);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 3", 
+                    results, expected);
             if (debug)
                 logger.debug("Test NewQueryFromRestoredSerializedQuery01(): Passed");
 
Index: src/java/org/apache/jdo/tck/query/api/CompileQuery.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/CompileQuery.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/CompileQuery.java	(working copy)
@@ -78,7 +78,8 @@
             expected = getFromInserted(expected);
             printOutput(results, expected);
             
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == param", 
+                    results, expected);
             tx.commit();
             tx = null;
         }
Index: src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java	(working copy)
@@ -70,7 +70,8 @@
             expected.add(pc1);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x ==2",
+                    results, expected);
             
             tx.commit();
             tx = null;
Index: src/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
===================================================================
--- src/java/org/apache/jdo/tck/query/api/ExecuteQuery.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/api/ExecuteQuery.java	(working copy)
@@ -85,7 +85,8 @@
             expected.add(p5);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 4",
+                    results, expected);
             tx.commit();
             tx = null;
             if (debug) logger.debug ("Test ExecuteQuery01 - Passed\n");
@@ -115,7 +116,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == param",
+                    results, expected);
             tx.commit();
             tx = null;
             if (debug) logger.debug("Test ExecuteQuery02 - Passed\n");
@@ -145,7 +147,9 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, 
+                    "x == param1 && y == param2", 
+                    results, expected);
             tx.commit();
             tx = null;
             if (debug) logger.debug("Test ExecuteQuery03 - Passed\n");
Index: src/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
===================================================================
--- src/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java	(working copy)
@@ -92,7 +92,8 @@
         expected.add(new PCPoint(3, 3));
         expected.add(new PCPoint(4, 4));
         expected = getFromInserted(expected);
-        checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+        checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 0",
+                results, expected);
         
         // execute second query
         Object results2 = query2.execute();
@@ -101,7 +102,8 @@
         List expected2 = new ArrayList();
         expected2.add(new PCPoint(0, 0));
         expected2 = getFromInserted(expected2);
-        checkQueryResultWithoutOrder(ASSERTION_FAILED, results2, expected2);
+        checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 0",
+                results2, expected2);
         pm.currentTransaction().commit();
     }
 
Index: src/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
===================================================================
--- src/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java	(working copy)
@@ -92,7 +92,8 @@
             expected.add(p5);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == x", 
+                    results, expected);
             if (debug) 
                 logger.debug("\nTest ParameterDeclaredWithSameNameAsFieldOfCandidateClass - Passed");
 
@@ -133,7 +134,8 @@
             expected.add(p5);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "y == y",
+                    results, expected);
             if (debug) 
                 logger.debug("\nTest ParameterDeclaredWithSameNameAsFieldOfCandidateClass - Passed");
             
Index: src/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
===================================================================
--- src/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java	(working copy)
@@ -154,7 +154,8 @@
         query.declareParameters("Department d");
         query.setFilter("department == d");
         result = query.execute(dept1);
-        checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
+        checkQueryResultWithoutOrder(ASSERTION_FAILED, "department == d",
+                result, expected);
 
         // Import Department explictly and per type-import-on-demand
         query = pm.newQuery(Employee.class);
@@ -162,7 +163,8 @@
         query.declareParameters("Department d");
         query.setFilter("department == d");
         result = query.execute(dept1);
-        checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
+        checkQueryResultWithoutOrder(ASSERTION_FAILED, "department == d",
+                result, expected);
 
         // type-import-on-demand twice
         query = pm.newQuery(Employee.class);
@@ -170,7 +172,8 @@
         query.declareParameters("Department d");
         query.setFilter("department == d");
         result = query.execute(dept1);
-        checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
+        checkQueryResultWithoutOrder(ASSERTION_FAILED, "department == d",
+                result, expected);
 
         tx.commit();
         tx = null;
Index: src/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
===================================================================
--- src/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java	(working copy)
@@ -91,7 +91,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == (1 + 1)",
+                    results, expected);
             if(debug) 
                 logger.debug("Test ParenthesesMarkOperatorPrecedence01 - Passed");
 
@@ -125,7 +126,8 @@
             expected.add(p5);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == (1 + 1) * 2",
+                    results, expected);
             if(debug) 
                 logger.debug("Test ParenthesesMarkOperatorPrecedence02 - Passed");
             
@@ -159,7 +161,9 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, 
+                    "x == (9 - 1) * (3 + 5) / 32",
+                    results, expected);
             if(debug)
                 logger.debug("Test ParenthesesMarkOperatorPrecedence03 - Passed");
             
@@ -193,7 +197,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 2 && y == 2",
+                    results, expected);
             if(debug)
                 logger.debug("Test ParenthesesMarkOperatorPrecedence04 - Passed");
 
@@ -228,7 +233,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, 
+                    "x == (1 + 1) || y == (1002 - 1000)", results, expected);
             if(debug)
                 logger.debug("Test ParenthesesMarkOperatorPrecedence05 - Passed");
 
@@ -262,7 +268,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, 
+                    "x == (1 * 2) && true", results, expected);
             if(debug)
                 logger.debug("Test ParenthesesMarkOperatorPrecedence06 - Passed");
 
@@ -295,7 +302,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, 
+                    "x == (10000 / 5000) || false", results, expected);
             if(debug) logger.debug("Test ParenthesesMarkOperatorPrecedence07 - Passed");
 
             tx.commit();
@@ -328,7 +336,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "(x == 2) == true",
+                    results, expected);
             if(debug) logger.debug("Test ParenthesesMarkOperatorPrecedence08 - Passed");
 
             tx.commit();
@@ -361,7 +370,9 @@
             expected.add(p4);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, 
+                    "(x == ((21 - 1/1)/10 + 1)) | (false && true)",
+                    results, expected);
             if(debug)
                 logger.debug("Test ParenthesesMarkOperatorPrecedence09 - Passed");
 
Index: src/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
===================================================================
--- src/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java	(working copy)
@@ -84,7 +84,8 @@
             expected.add(p3);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "this.x == x",
+                    results, expected);
             if (debug)
                 logger.debug("Test UseOfThisToAcessHiddenField01(): Passed");
 
@@ -119,7 +120,8 @@
             expected.add(p4);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "this.y == y",
+                    results, expected);
             if (debug)
                 logger.debug("Test UseOfThisToAcessHiddenField02(): Passed");
 
Index: src/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
===================================================================
--- src/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java	(working copy)
@@ -123,7 +123,8 @@
             query.setFilter(filter);
             results = (Collection) query.execute();
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, 
+                    results, expected);
             if (debug)
                 logger.debug("Test WhiteSpaceIsACharacterAndIgnored01(\"" +
                              filter + "\"): Passed");
Index: src/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
===================================================================
--- src/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java	(working copy)
@@ -92,7 +92,7 @@
 
             // check query result
             printOutput(results, inserted);
-            checkQueryResultWithOrder(ASSERTION_FAILED, results, inserted);
+            checkQueryResultWithOrder(ASSERTION_FAILED, "null", results, inserted);
             if(debug) 
                 logger.debug("Test OrderingSpecification01(): Passed");
             
@@ -130,7 +130,7 @@
             }
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithOrder(ASSERTION_FAILED, "null", results, expected);
             if(debug) 
                 logger.debug("Test OrderingSpecification02(): Passed");
 
Index: src/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
===================================================================
--- src/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java	(revision 377013)
+++ src/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java	(working copy)
@@ -116,7 +116,8 @@
             expected.add(p2);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 1",
+                    results, expected);
             if (debug)
                 logger.debug("Test QueryResultPassedToAnotherQuery01: Passed");
 
@@ -148,7 +149,8 @@
             expected.add(p2);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 1",
+                    results, expected);
             if (debug) 
                 logger.debug("Test QueryResultPassedToAnotherQuery02: Passed");
             
@@ -179,7 +181,8 @@
             expected.add(p2);
             expected = getFromInserted(expected);
             printOutput(results, expected);
-            checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+            checkQueryResultWithoutOrder(ASSERTION_FAILED, "x == 1",
+                    results, expected);
             if (debug)
                 logger.debug("Test QueryResultPassedToAnotherQuery03: Passed");