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 mb...@apache.org on 2012/11/18 21:49:08 UTC
svn commit: r1410988 - in /db/jdo/trunk: specification/OOO/
tck/src/java/org/apache/jdo/tck/query/jdoql/methods/
tck/src/java/org/apache/jdo/tck/query/result/
Author: mbo
Date: Sun Nov 18 20:49:06 2012
New Revision: 1410988
URL: http://svn.apache.org/viewvc?rev=1410988&view=rev
Log:
JDO-580, JDO-633, JDO-643, JDO-658: added assertions to spec and tck test cases
Modified:
db/jdo/trunk/specification/OOO/Ch14-Query.odt
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/MethodsInResult.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
Modified: db/jdo/trunk/specification/OOO/Ch14-Query.odt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/specification/OOO/Ch14-Query.odt?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
Binary files - no diff available.
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java Sun Nov 18 20:49:06 2012
@@ -35,7 +35,7 @@ import org.apache.jdo.tck.util.BatchTest
*<BR>
*<B>Keywords:</B> query
*<BR>
- *<B>Assertion ID:</B> A14.6.2-47.
+ *<B>Assertion ID:</B> A14.6.2-59.
*<BR>
*<B>Assertion Description: </B>
* New supported Enum methods:
@@ -48,7 +48,7 @@ public class EnumMethodOrdinal extends Q
/** */
private static final String ASSERTION_FAILED =
- "Assertion A14.6.2-47 (EnumMethodOrdinal) failed: ";
+ "Assertion A14.6.2-59 (EnumMethodOrdinal) failed: ";
/** */
private Object oidOfExpectedResult;
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java Sun Nov 18 20:49:06 2012
@@ -35,7 +35,7 @@ import org.apache.jdo.tck.util.BatchTest
*<BR>
*<B>Keywords:</B> query
*<BR>
- *<B>Assertion ID:</B> A14.6.2-47.
+ *<B>Assertion ID:</B> A14.6.2-59.
*<BR>
*<B>Assertion Description: </B>
* New supported Enum methods:
@@ -48,7 +48,7 @@ public class EnumMethodToString extends
/** */
private static final String ASSERTION_FAILED =
- "Assertion A14.6.2-47 (EnumMethodToString) failed: ";
+ "Assertion A14.6.2-59 (EnumMethodToString) failed: ";
/** */
private Object oidOfExpectedResult;
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java Sun Nov 18 20:49:06 2012
@@ -34,7 +34,7 @@ import org.apache.jdo.tck.util.BatchTest
*<BR>
*<B>Keywords:</B> query collection
*<BR>
- *<B>Assertion ID:</B> A14.6.2-44.
+ *<B>Assertion ID:</B> A14.6.2-45.
*<BR>
*<B>Assertion Description: </B>
* Supported collection methods:
@@ -49,7 +49,7 @@ public class SupportedCollectionMethods
/** */
private static final String ASSERTION_FAILED =
- "Assertion A14.6.2-36 (SupportedCollectionMethods) failed: ";
+ "Assertion A14.6.2-45 (SupportedCollectionMethods) failed: ";
/**
* The array of valid queries which may be executed as
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java Sun Nov 18 20:49:06 2012
@@ -29,7 +29,7 @@ import org.apache.jdo.tck.util.BatchTest
*<BR>
*<B>Keywords:</B> query
*<BR>
- *<B>Assertion ID:</B> A14.6.2-47.
+ *<B>Assertion ID:</B> A14.6.2-60.
*<BR>
*<B>Assertion Description: </B>
* New supported Date methods:
@@ -43,7 +43,7 @@ public class SupportedDateMethods extend
/** */
private static final String ASSERTION_FAILED =
- "Assertion A14.6.2-47 (SupportedDateMethods) failed: ";
+ "Assertion A14.6.2-60 (SupportedDateMethods) failed: ";
/**
* The array of valid queries which may be executed as
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java Sun Nov 18 20:49:06 2012
@@ -46,6 +46,7 @@ import org.apache.jdo.tck.util.BatchTest
* Supported JDOHelper methods:
* <ul>
* <li> JDOHelper.getObjectId(Object)
+ * <li> JDOHelper.getVersion(Object)
* </ul>
*/
public class SupportedJDOHelperMethods extends QueryTest {
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java Sun Nov 18 20:49:06 2012
@@ -34,12 +34,12 @@ import org.apache.jdo.tck.util.BatchTest
*<BR>
*<B>Keywords:</B> query list
*<BR>
- *<B>Assertion ID:</B> A14.6.????.
+ *<B>Assertion ID:</B> A14.6.2-58.
*<BR>
*<B>Assertion Description: </B>
* Supported list methods:
* <UL>
- * <LI>get</LI>
+ * <LI>get(int)</LI>
* </UL>
*/
@@ -47,7 +47,7 @@ public class SupportedListMethods extend
/** */
private static final String ASSERTION_FAILED =
- "Assertion A14.6.2-36 (SupportedListMethods) failed: ";
+ "Assertion A14.6.2-58 (SupportedListMethods) failed: ";
/**
* The array of valid queries which may be executed as
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java Sun Nov 18 20:49:06 2012
@@ -46,6 +46,8 @@ import org.apache.jdo.tck.util.BatchTest
* <li>Math.abs(numeric)</li>
* <li>Math.sqrt(numeric)</li>
* <li>Math.sin(numeric)</li>
+ * <li>Math.cos(numeric)</li>
+ * <li>Math.tan(numeric)</li>
* </ul>
*/
public class SupportedMathMethods extends QueryTest {
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/MethodsInResult.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/MethodsInResult.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/MethodsInResult.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/MethodsInResult.java Sun Nov 18 20:49:06 2012
@@ -35,15 +35,18 @@ import org.apache.jdo.tck.util.BatchTest
*<BR>
*<B>Keywords:</B> query result
*<BR>
- *<B>Assertion ID:</B>
+ *<B>Assertion ID:</B> A14.6.9-5.
*<BR>
- *<B>Assertion Description: </B>
+ *<B>Assertion Description: </B>
+ * The result expressions include:
+ * method expression: the value of an expression calling any of the methods allowed in
+ * queries applied to fields is returned.
*/
public class MethodsInResult extends QueryTest {
/** */
private static final String ASSERTION_FAILED =
- "Assertion (MethodsInResult) failed: ";
+ "Assertion A14.6.9-5 (MethodsInResult) failed: ";
/**
* The array of valid queries which may be executed as
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java?rev=1410988&r1=1410987&r2=1410988&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java Sun Nov 18 20:49:06 2012
@@ -33,20 +33,21 @@ import org.apache.jdo.tck.util.BatchTest
*<BR>
*<B>Keywords:</B> embedded query
*<BR>
- *<B>Assertion ID:</B> [None yet]
+ *<B>Assertion ID:</B> A14.6.9-9.
*<BR>
*<B>Assertion Description: </B>
-Section 14.6.9: Projected SCOs are never owned, projected FCOs are always
-managed. Modifying unowned SCOs never has an effect on the database.
-Modifying FCOs no matter how you get them always has an effect if the
-tx commits.
+ * If an SCO field is in the result, the projected field is not owned by any persistent
+ * instance, and modifying the SCO value has no effect on any persistent instance.
+ * If an FCO field is in the result, the projected field is a persistent instance, and
+ * modifications made to the instance are reflected as changes to the datastore per
+ * transaction requirements.
*/
public class ProjectedSCODoesNotTrackChanges extends JDO_Test {
/** */
private static final String ASSERTION_FAILED =
- "Assertion A?? (ProjectedSCODoesNotTrackChanges) failed: ";
+ "Assertion A14.6.9-3 (ProjectedSCODoesNotTrackChanges) failed: ";
private static final Date expectedDate = new Date(2007908); // pm