You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2006/02/21 18:40:24 UTC
svn commit: r379541 - in
/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query: api/ jdoql/
jdoql/keywords/ jdoql/parameters/
Author: clr
Date: Tue Feb 21 09:40:16 2006
New Revision: 379541
URL: http://svn.apache.org/viewcvs?rev=379541&view=rev
Log:
JDO-304 updated query checking to include query filter
Modified:
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/CompileQuery.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareImports.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareParameters.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/SetFilter.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/CompileQuery.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/CompileQuery.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/CompileQuery.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/CompileQuery.java Tue Feb 21 09:40:16 2006
@@ -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;
}
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareImports.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareImports.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareImports.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareImports.java Tue Feb 21 09:40:16 2006
@@ -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;
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareParameters.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareParameters.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareParameters.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/DeclareParameters.java Tue Feb 21 09:40:16 2006
@@ -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;
}
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQuery.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQuery.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQuery.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java Tue Feb 21 09:40:16 2006
@@ -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;
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java Tue Feb 21 09:40:16 2006
@@ -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;
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java Tue Feb 21 09:40:16 2006
@@ -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;
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/SetFilter.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/SetFilter.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/SetFilter.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/api/SetFilter.java Tue Feb 21 09:40:16 2006
@@ -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;
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java Tue Feb 21 09:40:16 2006
@@ -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();
}
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java Tue Feb 21 09:40:16 2006
@@ -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;
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java Tue Feb 21 09:40:16 2006
@@ -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");
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java?rev=379541&r1=379540&r2=379541&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java Tue Feb 21 09:40:16 2006
@@ -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");