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/01/04 00:57:19 UTC
svn commit: r365775 - in
/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query:
jdoql/variables/VariablesAndFields.java result/Grouping.java
Author: clr
Date: Tue Jan 3 15:57:17 2006
New Revision: 365775
URL: http://svn.apache.org/viewcvs?rev=365775&view=rev
Log:
JDO-271 changed candidate class from Employee to FullTimeEmployee
Modified:
db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java
Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java?rev=365775&r1=365774&r2=365775&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java (original)
+++ db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java Tue Jan 3 15:57:17 2006
@@ -113,7 +113,7 @@
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
- /*FROM*/ Person.class,
+ /*FROM*/ Employee.class,
/*EXCLUDE*/ null,
/*WHERE*/ "team.contains(manager) & " +
"manager.firstname == 'emp1First'",
Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java?rev=365775&r1=365774&r2=365775&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java (original)
+++ db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java Tue Jan 3 15:57:17 2006
@@ -20,7 +20,7 @@
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.company.CompanyModelReader;
-import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.pc.company.FullTimeEmployee;
import org.apache.jdo.tck.query.QueryElementHolder;
import org.apache.jdo.tck.query.QueryTest;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -55,7 +55,7 @@
/*UNIQUE*/ null,
/*RESULT*/ "department, SUM(salary)",
/*INTO*/ null,
- /*FROM*/ Employee.class,
+ /*FROM*/ FullTimeEmployee.class,
/*EXCLUDE*/ null,
/*WHERE*/ null,
/*VARIABLES*/ null,
@@ -76,7 +76,7 @@
/*UNIQUE*/ null,
/*RESULT*/ "department, salary",
/*INTO*/ null,
- /*FROM*/ Employee.class,
+ /*FROM*/ FullTimeEmployee.class,
/*EXCLUDE*/ null,
/*WHERE*/ null,
/*VARIABLES*/ null,
@@ -93,8 +93,8 @@
*/
private Object[] expectedResult = {
Arrays.asList(new Object[] {
- new Object[] {getTransientCompanyModelInstance("dept1"), new Double(45000.0)},
- new Object[] {getTransientCompanyModelInstance("dept2"), new Double(58000.0)}})
+ new Object[] {getTransientCompanyModelInstance("dept1"), new Double(30000.0)},
+ new Object[] {getTransientCompanyModelInstance("dept2"), new Double(45000.0)}})
};
/**