db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r615642 - in /db/jdo/trunk: tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/ tck2-legacy/src/testdata/org/apache/jdo/tck/pc/company/ tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/ tck2/src/testdata/org/apache/jdo/tc...
Date Sun, 27 Jan 2008 20:41:07 GMT
Author: mbo
Date: Sun Jan 27 12:41:06 2008
New Revision: 615642

URL: http://svn.apache.org/viewvc?rev=615642&view=rev
Log:
JDO-568: changed the expected result of CorrelatedSubqueriesWithParameters.runTestSubqueries01runTestSubqueries01
and fixed an inconsistency in the subquery test data

Modified:
    db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
    db/jdo/trunk/tck2-legacy/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
    db/jdo/trunk/tck2/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml

Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java?rev=615642&r1=615641&r2=615642&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
(original)
+++ db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
Sun Jan 27 12:41:06 2008
@@ -71,7 +71,7 @@
      */
     void runTestSubqueries01(PersistenceManager pm) {
         List expectedResult = getTransientCompanyModelInstancesAsList(
-            new String[]{"emp2", "emp6"});
+            new String[]{"emp2", "emp6", "emp9"});
         
         // Select employees who work more than the average of the employees 
         // in their department having the same manager

Modified: db/jdo/trunk/tck2-legacy/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml?rev=615642&r1=615641&r2=615642&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
(original)
+++ db/jdo/trunk/tck2-legacy/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
Sun Jan 27 12:41:06 2008
@@ -224,7 +224,7 @@
         <constructor-arg index="7" type="double"><value>24000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
         <property name="department"><ref bean="dept2"/></property>
-        <property name="manager"><ref bean="emp2"/></property>
+        <property name="manager"><ref bean="emp1"/></property>
         <property name="team"><set/></property>
     </bean>
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java?rev=615642&r1=615641&r2=615642&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
Sun Jan 27 12:41:06 2008
@@ -71,7 +71,7 @@
      */
     void runTestSubqueries01(PersistenceManager pm) {
         List expectedResult = getTransientCompanyModelInstancesAsList(
-            new String[]{"emp2", "emp6"});
+            new String[]{"emp2", "emp6", "emp9"});
         
         // Select employees who work more than the average of the employees 
         // in their department having the same manager

Modified: db/jdo/trunk/tck2/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml?rev=615642&r1=615641&r2=615642&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
(original)
+++ db/jdo/trunk/tck2/src/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
Sun Jan 27 12:41:06 2008
@@ -224,7 +224,7 @@
         <constructor-arg index="7" type="double"><value>24000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
         <property name="department"><ref bean="dept2"/></property>
-        <property name="manager"><ref bean="emp2"/></property>
+        <property name="manager"><ref bean="emp1"/></property>
         <property name="team"><set/></property>
     </bean>
 



Mime
View raw message