db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1845850 - in /db/jdo/trunk: api/src/main/java/javax/jdo/query/ copyjdorijars/ tck/ tck/src/main/java/org/apache/jdo/tck/query/ tck/src/main/java/org/apache/jdo/tck/query/jdoql/ tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/ tck/...
Date Mon, 05 Nov 2018 20:47:04 GMT
Author: mbo
Date: Mon Nov  5 20:47:04 2018
New Revision: 1845850

URL: http://svn.apache.org/viewvc?rev=1845850&view=rev
Log:
JDO-652: new DN Version, test case fixes, use of JDOQLTypedQuery.executeResultXXX w/o result class, new Expression method as(String alias)

Modified:
    db/jdo/trunk/api/src/main/java/javax/jdo/query/Expression.java
    db/jdo/trunk/copyjdorijars/pom.xml
    db/jdo/trunk/tck/pom.xml
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
    db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
    db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt

Modified: db/jdo/trunk/api/src/main/java/javax/jdo/query/Expression.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/main/java/javax/jdo/query/Expression.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/api/src/main/java/javax/jdo/query/Expression.java (original)
+++ db/jdo/trunk/api/src/main/java/javax/jdo/query/Expression.java Mon Nov  5 20:47:04 2018
@@ -76,4 +76,11 @@ public interface Expression<T>
      * @return The cast expression
      */
     Expression cast(Class cls);
+
+    /**
+     * Method to return an expression with the specified alias assigned to this expression.
+     * @param alias the alias for this expression
+     * @return the expression with an alias
+     */
+    Expression as(String alias);
 }
\ No newline at end of file

Modified: db/jdo/trunk/copyjdorijars/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/copyjdorijars/pom.xml?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/copyjdorijars/pom.xml (original)
+++ db/jdo/trunk/copyjdorijars/pom.xml Mon Nov  5 20:47:04 2018
@@ -93,20 +93,22 @@
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-core</artifactId>
-      <version>5.1.13-SNAPSHOT</version>
-      <!--<version>5.2.0-m2-SNAPSHOT</version>-->  
+      <version>5.2.0-m2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-rdbms</artifactId>
-      <version>5.1.12-SNAPSHOT</version>
-      <!--<version>5.2.0-m2-SNAPSHOT</version> -->  
+      <version>5.2.0-m2-SNAPSHOT</version> 
+    </dependency>
+    <dependency>
+      <groupId>org.datanucleus</groupId>
+      <artifactId>javax.jdo</artifactId>
+      <version>3.2.0-m10-SNAPSHOT</version>  
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-api-jdo</artifactId>
-      <version>5.1.10-SNAPSHOT</version>
-      <!--<version>5.2.0-m2-SNAPSHOT</version> -->  
+      <version>5.2.0-m2-SNAPSHOT</version>  
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
@@ -116,8 +118,7 @@
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-api-jpa</artifactId>
-      <version>5.1.10-SNAPSHOT</version>
-      <!--<version>5.2.0-m2-SNAPSHOT</version>-->  
+      <version>5.2.0-m2-SNAPSHOT</version>  
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Mon Nov  5 20:47:04 2018
@@ -126,8 +126,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-api-jdo</artifactId>
-	    <version>5.1.10-SNAPSHOT</version>
-            <!--<version>5.2.0-m2-SNAPSHOT</version>-->
+            <version>5.2.0-m2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java Mon Nov  5 20:47:04 2018
@@ -1081,7 +1081,7 @@ public abstract class QueryTest extends
      */
     protected void executeJDOQLTypedQuery(String assertion, QueryElementHolder queryElementHolder,
                                           Object expectedResult) {
-        executeJDOQLTypedQuery(assertion, queryElementHolder, null, expectedResult);
+        executeJDOQLTypedQuery(assertion, queryElementHolder, null, false, expectedResult);
     }
 
     /**
@@ -1089,10 +1089,12 @@ public abstract class QueryTest extends
      * @param assertion
      * @param queryElementHolder
      * @param resultClass
+     * @param resultClauseSpecified
      * @param expectedResult
      */
     protected void executeJDOQLTypedQuery(String assertion, QueryElementHolder queryElementHolder,
-                                          Class<?> resultClass, Object expectedResult) {
+                                          Class<?> resultClass, boolean resultClauseSpecified,
+                                          Object expectedResult) {
         String singleStringQuery = queryElementHolder.toString();
         getPM();
         Transaction tx = pm.currentTransaction();
@@ -1117,6 +1119,14 @@ public abstract class QueryTest extends
                         // result class specified and list result
                         result = query.executeResultList(resultClass);
                     }
+                } else if (resultClauseSpecified) {
+                    if (queryElementHolder.isUnique()) {
+                        // result class specified and unique result
+                        result = query.executeResultUnique();
+                    } else {
+                        // result class specified and list result
+                        result = query.executeResultList();
+                    }
                 } else {
                     if (queryElementHolder.isUnique()) {
                         // no result class and unique result

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java Mon Nov  5 20:47:04 2018
@@ -126,7 +126,7 @@ public class Having extends QueryTest {
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -164,7 +164,7 @@ public class Having extends QueryTest {
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
     
     /** */

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java Mon Nov  5 20:47:04 2018
@@ -120,6 +120,7 @@ public class IfElseInFilter extends Quer
         IfThenElseExpression<Double> ifExpr =
                 query.ifThenElse(cand.department.name.eq("Development"), 15000.0,25000.0);
         query.filter(cand.salary.gt(ifExpr));
+        query.orderBy(cand.personid.asc());
 
         QueryElementHolder holder = new QueryElementHolder(
                 /*UNIQUE*/      null,
@@ -152,6 +153,7 @@ public class IfElseInFilter extends Quer
         IfThenElseExpression<Long> ifExpr = query.ifThenElse(Long.class,
                 cand.manager.eq((Employee)null), cand.mentor.department.deptid, cand.manager.department.deptid);
         query.filter(ifExpr.eq(cand.department.deptid));
+        query.orderBy(cand.personid.asc());
 
         QueryElementHolder holder = new QueryElementHolder(
                 /*UNIQUE*/      null,
@@ -167,7 +169,7 @@ public class IfElseInFilter extends Quer
                 /*ORDER BY*/    "this.personid",
                 /*FROM*/        null,
                 /*TO*/          null,
-                /*JDOQLTyped*/  null,
+                /*JDOQLTyped*/  query,
                 /*paramValues*/ null);
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
@@ -187,6 +189,7 @@ public class IfElseInFilter extends Quer
         IfThenElseExpression<Integer> ifExpr =
                 query.ifThen(cond1, 1).ifThen(cond2, 2).ifThen(cond3, 3).elseEnd(4);
         query.filter(ifExpr.eq(2));
+        query.orderBy(cand.personid.asc());
 
         QueryElementHolder holder = new QueryElementHolder(
                 /*UNIQUE*/      null,

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java Mon Nov  5 20:47:04 2018
@@ -99,7 +99,7 @@ public class SupportedJDOHelperMethods e
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, oidClass, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java Mon Nov  5 20:47:04 2018
@@ -130,7 +130,7 @@ public class SupportedListMethods extend
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, MeetingRoom.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /**

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java Mon Nov  5 20:47:04 2018
@@ -114,7 +114,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -146,7 +146,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -177,7 +177,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -208,7 +208,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -239,7 +239,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -270,7 +270,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -301,7 +301,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -333,7 +333,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -365,7 +365,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -399,7 +399,7 @@ public class AggregateResult extends Que
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         // DataNucleus: UnsupportedOperationException: cast not yet supported
-        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -433,7 +433,7 @@ public class AggregateResult extends Que
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         // DataNucleus: UnsupportedOperationException: cast not yet supported
-        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -464,7 +464,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -495,7 +495,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -526,7 +526,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -558,7 +558,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -592,7 +592,7 @@ public class AggregateResult extends Que
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         // DataNucleus: UnsupportedOperationException: cast not yet supported
-        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
     /** */
     public void testMax0() {
@@ -622,7 +622,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -653,7 +653,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -684,7 +684,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -716,7 +716,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -750,7 +750,7 @@ public class AggregateResult extends Que
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         // DataNucleus: UnsupportedOperationException: cast not yet supported
-        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -781,7 +781,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -812,7 +812,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -843,7 +843,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -875,7 +875,7 @@ public class AggregateResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -909,7 +909,7 @@ public class AggregateResult extends Que
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         // DataNucleus: UnsupportedOperationException: cast not yet supported
-        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -943,7 +943,7 @@ public class AggregateResult extends Que
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         // DataNucleus: UnsupportedOperationException: cast not yet supported
-        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        //executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     public void testNegative() {

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java Mon Nov  5 20:47:04 2018
@@ -85,7 +85,7 @@ public class DistinctQuery extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Department.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -116,7 +116,7 @@ public class DistinctQuery extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Department.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -151,7 +151,7 @@ public class DistinctQuery extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -183,7 +183,7 @@ public class DistinctQuery extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
     /**
      * @see JDO_Test#localSetUp()

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java Mon Nov  5 20:47:04 2018
@@ -110,7 +110,7 @@ public class Grouping extends QueryTest
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java Mon Nov  5 20:47:04 2018
@@ -139,7 +139,7 @@ public class IfElseResult extends QueryT
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -173,7 +173,7 @@ public class IfElseResult extends QueryT
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -182,7 +182,7 @@ public class IfElseResult extends QueryT
 
         JDOQLTypedQuery<Project> query = getPM().newJDOQLTypedQuery(Project.class);
         QProject cand = QProject.candidate();
-        IfThenElseExpression<String> ifThenElse = query.ifThen(cand.reviewers.isEmpty(), "No Reviewer").
+        IfThenElseExpression<String> ifThenElse = query.ifThen(cand.reviewers.isEmpty(), "No reviewer").
                 ifThen(cand.reviewers.size().eq(1), "Single reviewer").elseEnd("Reviewer team");
         query.result(false, ifThenElse);
         query.orderBy(cand.projid.asc());
@@ -207,7 +207,7 @@ public class IfElseResult extends QueryT
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java Mon Nov  5 20:47:04 2018
@@ -86,7 +86,7 @@ public class MethodsInResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Integer.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     public void testMapSizeInResult() {
@@ -118,7 +118,7 @@ public class MethodsInResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Integer.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     public void testMaxAndSizeInResult() {
@@ -148,7 +148,7 @@ public class MethodsInResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Integer.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     public void testMapGetInResult() {
@@ -179,7 +179,7 @@ public class MethodsInResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     public void testSubstringInResult()  {
@@ -210,7 +210,7 @@ public class MethodsInResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     public void testIndexOfInResult() {
@@ -242,7 +242,7 @@ public class MethodsInResult extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Integer.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /**

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java Mon Nov  5 20:47:04 2018
@@ -86,7 +86,7 @@ public class NPEInResultExpr extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -118,7 +118,7 @@ public class NPEInResultExpr extends Que
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /**

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java Mon Nov  5 20:47:04 2018
@@ -83,7 +83,7 @@ public class NullResults extends QueryTe
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Employee.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -114,7 +114,7 @@ public class NullResults extends QueryTe
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Employee.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -144,7 +144,7 @@ public class NullResults extends QueryTe
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Employee.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /**

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java Mon Nov  5 20:47:04 2018
@@ -211,7 +211,7 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, true, expected);
     }
 
     /** */
@@ -241,7 +241,7 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, true, expected);
     }
 
     /** */
@@ -272,7 +272,7 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, BigDecimal.class, true, expected);
     }
 
     /** */
@@ -305,7 +305,7 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, java.util.Date.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, java.util.Date.class, true, expected);
     }
 
     /** */
@@ -318,7 +318,7 @@ public class ResultClassRequirements ext
         JDOQLTypedQuery<FullTimeEmployee> query = getPM().newJDOQLTypedQuery(FullTimeEmployee.class);
         QFullTimeEmployee cand = QFullTimeEmployee.candidate();
         // JDOQLTypedQuery API: Map Result
-        query.result(false, cand.personid, cand.lastname);
+        query.result(false, cand.personid.as("id"), cand.lastname.as("name"));
 
         QueryElementHolder holder = new QueryElementHolder(
                 /*UNIQUE*/      null,
@@ -339,7 +339,7 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Map.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Map.class, true, expected);
     }
 
     /** */
@@ -352,7 +352,7 @@ public class ResultClassRequirements ext
         JDOQLTypedQuery<FullTimeEmployee> query = getPM().newJDOQLTypedQuery(FullTimeEmployee.class);
         QFullTimeEmployee cand = QFullTimeEmployee.candidate();
         // JDOQLTypedQuery API: user defined class
-        query.result(false, cand.personid, cand.lastname);
+        query.result(false, cand.personid.as("l"), cand.lastname.as("s"));
 
         QueryElementHolder holder = new QueryElementHolder(
                 /*UNIQUE*/      null,
@@ -373,15 +373,15 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, LongString.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, LongString.class, true, expected);
     }
 
     /** */
     public void testConstructor() {
-        Object expected = Arrays.asList(new Object[]{
+        Object expected = Arrays.asList(
                 new LongString(1, "emp1Last"),
                 new LongString(2, "emp2Last"),
-                new LongString(5, "emp5Last")});
+                new LongString(5, "emp5Last"));
 
         JDOQLTypedQuery<FullTimeEmployee> query = getPM().newJDOQLTypedQuery(FullTimeEmployee.class);
         QFullTimeEmployee cand = QFullTimeEmployee.candidate();
@@ -407,15 +407,15 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, LongString.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, LongString.class, true, expected);
     }
 
     /** */
     public void testConstructorWithoutConstructorCall() {
-        Object expected = Arrays.asList(new Object[]{
+        Object expected = Arrays.asList(
                 new LongString(1, "emp1Last"),
                 new LongString(2, "emp2Last"),
-                new LongString(5, "emp5Last")});
+                new LongString(5, "emp5Last"));
 
         JDOQLTypedQuery<FullTimeEmployee> query = getPM().newJDOQLTypedQuery(FullTimeEmployee.class);
         QFullTimeEmployee cand = QFullTimeEmployee.candidate();
@@ -441,20 +441,20 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, LongString.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, LongString.class, true, expected);
     }
 
     /** */
     public void testFields() {
-        Object expected = Arrays.asList(new Object[]{
+        Object expected = Arrays.asList(
                 new PublicLongField(1),
                 new PublicLongField(2),
-                new PublicLongField(5)});
+                new PublicLongField(5));
 
         JDOQLTypedQuery<FullTimeEmployee> query = getPM().newJDOQLTypedQuery(FullTimeEmployee.class);
         QFullTimeEmployee cand = QFullTimeEmployee.candidate();
         // JDOQLTypedQuery API:
-        query.result(false, cand.personid);
+        query.result(false, cand.personid.as("l"));
 
         QueryElementHolder holder = new QueryElementHolder(
                 /*UNIQUE*/      null,
@@ -475,20 +475,20 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, PublicLongField.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, PublicLongField.class, true, expected);
     }
 
     /** */
     public void testPut() {
-        Object expected = Arrays.asList(new Object[]{
+        Object expected = Arrays.asList(
                 new PublicPutMethod(ConversionHelper.arrayToMap(publicPutMethod1)),
                 new PublicPutMethod(ConversionHelper.arrayToMap(publicPutMethod2)),
-                new PublicPutMethod(ConversionHelper.arrayToMap(publicPutMethod5))});
+                new PublicPutMethod(ConversionHelper.arrayToMap(publicPutMethod5)));
 
         JDOQLTypedQuery<FullTimeEmployee> query = getPM().newJDOQLTypedQuery(FullTimeEmployee.class);
         QFullTimeEmployee cand = QFullTimeEmployee.candidate();
         // JDOQLTypedQuery API: constructor
-        query.result(false, cand.personid, cand.lastname);
+        query.result(false, cand.personid.as("personid"), cand.lastname.as("lastname"));
 
         QueryElementHolder holder = new QueryElementHolder(
                 /*UNIQUE*/      null,
@@ -509,7 +509,7 @@ public class ResultClassRequirements ext
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, PublicPutMethod.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, PublicPutMethod.class, true, expected);
     }
 
     /** */
@@ -524,6 +524,7 @@ public class ResultClassRequirements ext
     /**
      * @see JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java Mon Nov  5 20:47:04 2018
@@ -195,7 +195,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -227,7 +227,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -259,7 +259,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Project.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -290,7 +290,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -323,7 +323,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -354,7 +354,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -385,7 +385,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -416,7 +416,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -447,7 +447,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Double.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -479,7 +479,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -511,7 +511,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -547,7 +547,7 @@ public class ResultExpressions extends Q
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
         // DataNucleus: wrong result: [Development, Development, Development, Development]
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -584,7 +584,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -616,7 +616,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Long.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */
@@ -653,7 +653,7 @@ public class ResultExpressions extends Q
 
         executeAPIQuery(ASSERTION_FAILED, holder, expectedResult);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Project.class, expectedResult);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expectedResult);
     }
 
     /** */

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java Mon Nov  5 20:47:04 2018
@@ -206,7 +206,7 @@ public class ShapeOfResult extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -238,7 +238,7 @@ public class ShapeOfResult extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, String.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -274,7 +274,7 @@ public class ShapeOfResult extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -306,7 +306,7 @@ public class ShapeOfResult extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -343,7 +343,7 @@ public class ShapeOfResult extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, FullName.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, FullName.class, true, expected);
     }
 
     /** */
@@ -376,7 +376,7 @@ public class ShapeOfResult extends Query
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, FullName.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, FullName.class, true, expected);
     }
     
     /**

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java Mon Nov  5 20:47:04 2018
@@ -98,7 +98,7 @@ public class VariableInResult extends Qu
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Employee.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -131,7 +131,7 @@ public class VariableInResult extends Qu
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -166,7 +166,7 @@ public class VariableInResult extends Qu
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -198,7 +198,7 @@ public class VariableInResult extends Qu
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Employee.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -231,7 +231,7 @@ public class VariableInResult extends Qu
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Employee.class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /**

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java Mon Nov  5 20:47:04 2018
@@ -129,7 +129,7 @@ public class VariableInResultMultipleNav
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -172,7 +172,7 @@ public class VariableInResultMultipleNav
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -215,7 +215,7 @@ public class VariableInResultMultipleNav
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /**

Modified: db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java (original)
+++ db/jdo/trunk/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java Mon Nov  5 20:47:04 2018
@@ -120,7 +120,7 @@ public class VariableInResultNavigation
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -160,7 +160,7 @@ public class VariableInResultNavigation
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -200,7 +200,7 @@ public class VariableInResultNavigation
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -238,7 +238,7 @@ public class VariableInResultNavigation
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
     /** */
@@ -278,7 +278,7 @@ public class VariableInResultNavigation
 
         executeAPIQuery(ASSERTION_FAILED, holder, expected);
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
-        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, Object[].class, expected);
+        executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
     /**
      * @see QueryTest#localSetUp()

Modified: db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt?rev=1845850&r1=1845849&r2=1845850&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt (original)
+++ db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt Mon Nov  5 20:47:04 2018
@@ -1857,6 +1857,7 @@ public interface javax.jdo.query.Express
     javax.jdo.query.NumericExpression countDistinct();
     javax.jdo.query.BooleanExpression instanceOf(Class cls);
     javax.jdo.query.Expression cast(Class cls);
+    javax.jdo.query.Expression as(String alias);
 }
 public interface javax.jdo.query.ListExpression extends javax.jdo.query.CollectionExpression
 {



Mime
View raw message