From jdo-commits-return-2265-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Wed Jan 23 20:26:26 2008 Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 250 invoked from network); 23 Jan 2008 20:26:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Jan 2008 20:26:26 -0000 Received: (qmail 8352 invoked by uid 500); 23 Jan 2008 20:26:16 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 8341 invoked by uid 99); 23 Jan 2008 20:26:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2008 12:26:16 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2008 20:25:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2621C1A9832; Wed, 23 Jan 2008 12:26:05 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r614649 - in /db/jdo/trunk: tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/ tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/ Date: Wed, 23 Jan 2008 20:26:03 -0000 To: jdo-commits@db.apache.org From: mbo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080123202605.2621C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mbo Date: Wed Jan 23 12:26:00 2008 New Revision: 614649 URL: http://svn.apache.org/viewvc?rev=614649&view=rev Log: JDO-568: add helper method returning all persistent employees Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java?rev=614649&r1=614648&r2=614649&view=diff ============================================================================== --- db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java (original) +++ db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java Wed Jan 23 12:26:00 2008 @@ -78,7 +78,7 @@ false, null, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); 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=614649&r1=614648&r2=614649&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 Wed Jan 23 12:26:00 2008 @@ -92,7 +92,7 @@ false, null, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); @@ -130,7 +130,7 @@ false, new Object[] {hired}, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); @@ -163,7 +163,7 @@ false, null, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java?rev=614649&r1=614648&r2=614649&view=diff ============================================================================== --- db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java (original) +++ db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java Wed Jan 23 12:26:00 2008 @@ -86,7 +86,7 @@ false, null, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); @@ -123,7 +123,7 @@ false, new Object[]{hired}, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java?rev=614649&r1=614648&r2=614649&view=diff ============================================================================== --- db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java (original) +++ db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java Wed Jan 23 12:26:00 2008 @@ -17,7 +17,13 @@ package org.apache.jdo.tck.query.jdoql.subqueries; +import java.util.List; + +import javax.jdo.PersistenceManager; +import javax.jdo.Transaction; + import org.apache.jdo.tck.query.QueryTest; +import org.apache.jdo.tck.pc.company.Employee; /** * Superclass for all subquery test classes. @@ -34,5 +40,24 @@ */ protected String getCompanyTestDataResource() { return SUBQUERIES_TEST_COMPANY_TESTDATA; + } + + /** + * Helper method retuning all Employee instances. + * @param pm the PersistenceManager + * @return a List including all persistent Employee instances + */ + protected List getAllEmployees(PersistenceManager pm) { + Transaction tx = pm.currentTransaction(); + try { + tx.begin(); + List allEmployees = (List)pm.newQuery(Employee.class).execute(); + tx.commit(); + return allEmployees; + } finally { + if ((tx != null) && tx.isActive()) { + tx.rollback(); + } + } } } Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java?rev=614649&r1=614648&r2=614649&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java Wed Jan 23 12:26:00 2008 @@ -78,7 +78,7 @@ false, null, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); 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=614649&r1=614648&r2=614649&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 Wed Jan 23 12:26:00 2008 @@ -92,7 +92,7 @@ false, null, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); @@ -130,7 +130,7 @@ false, new Object[] {hired}, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); @@ -163,7 +163,7 @@ false, null, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java?rev=614649&r1=614648&r2=614649&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java Wed Jan 23 12:26:00 2008 @@ -86,7 +86,7 @@ false, null, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); @@ -123,7 +123,7 @@ false, new Object[]{hired}, expectedResult, true); // API query against memory model - List allEmployees = (List)pm.newQuery(Employee.class).execute(); + List allEmployees = getAllEmployees(pm); apiQuery.setCandidates(allEmployees); executeJDOQuery(ASSERTION_FAILED, apiQuery, singleStringJDOQL, false, null, expectedResult, true); Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java?rev=614649&r1=614648&r2=614649&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java Wed Jan 23 12:26:00 2008 @@ -17,7 +17,13 @@ package org.apache.jdo.tck.query.jdoql.subqueries; +import java.util.List; + +import javax.jdo.PersistenceManager; +import javax.jdo.Transaction; + import org.apache.jdo.tck.query.QueryTest; +import org.apache.jdo.tck.pc.company.Employee; /** * Superclass for all subquery test classes. @@ -34,5 +40,24 @@ */ protected String getCompanyTestDataResource() { return SUBQUERIES_TEST_COMPANY_TESTDATA; + } + + /** + * Helper method retuning all Employee instances. + * @param pm the PersistenceManager + * @return a List including all persistent Employee instances + */ + protected List getAllEmployees(PersistenceManager pm) { + Transaction tx = pm.currentTransaction(); + try { + tx.begin(); + List allEmployees = (List)pm.newQuery(Employee.class).execute(); + tx.commit(); + return allEmployees; + } finally { + if ((tx != null) && tx.isActive()) { + tx.rollback(); + } + } } }