Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 62593 invoked from network); 2 Dec 2005 23:28:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Dec 2005 23:28:25 -0000 Received: (qmail 52040 invoked by uid 500); 2 Dec 2005 23:26:49 -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 50848 invoked by uid 99); 2 Dec 2005 23:26:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2005 15:26:39 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 02 Dec 2005 14:37:43 -0800 Received: (qmail 74606 invoked by uid 65534); 2 Dec 2005 16:21:22 -0000 Message-ID: <20051202162122.74605.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r351768 [4/4] - in /incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query: ./ api/ delete/ jdoql/ jdoql/keywords/ jdoql/methods/ jdoql/operators/ jdoql/parameters/ jdoql/variables/ result/ sql/ Date: Fri, 02 Dec 2005 16:20:55 -0000 To: jdo-commits@db.apache.org From: brazil@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DefaultUnique.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DefaultUnique.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DefaultUnique.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DefaultUnique.java Fri Dec 2 08:19:42 2005 @@ -95,7 +95,7 @@ * The expected results of valid queries. */ private Object[] expectedResult = { - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{ "emp1", "emp2", "emp3", "emp4", "emp5"}), new Long(5), Arrays.asList(new Object[]{new Long(3), new Long(2)}) @@ -141,7 +141,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java Fri Dec 2 08:19:42 2005 @@ -88,11 +88,11 @@ * The expected results of valid queries. */ private Object[] expectedResult = { - addAll(getCompanyModelInstancesAsList(new String[]{ + addAll(getTransientCompanyModelInstancesAsList(new String[]{ "emp1", "emp2", "emp3", "emp4", "emp5"}), - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{ "emp1", "emp2", "emp3", "emp4", "emp5"})), - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{ "emp1", "emp2", "emp3", "emp4", "emp5"}) }; @@ -138,7 +138,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctQuery.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctQuery.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctQuery.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctQuery.java Fri Dec 2 08:19:42 2005 @@ -110,9 +110,9 @@ * The expected results of valid queries. */ private Object[] expectedResult = { - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{ "dept1", "dept1", "dept1", "dept2", "dept2"}), - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{ "dept1", "dept2"}), Arrays.asList(new Object[] { new Object[]{new Long(1),"Development"}, @@ -148,7 +148,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java Fri Dec 2 08:19:42 2005 @@ -93,8 +93,8 @@ */ private Object[] expectedResult = { Arrays.asList(new Object[] { - new Object[] {getCompanyModelInstance("dept1"), new Double(45000.0)}, - new Object[] {getCompanyModelInstance("dept2"), new Double(58000.0)}}) + new Object[] {getTransientCompanyModelInstance("dept1"), new Double(45000.0)}, + new Object[] {getTransientCompanyModelInstance("dept2"), new Double(58000.0)}}) }; /** @@ -129,7 +129,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Having.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Having.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Having.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Having.java Fri Dec 2 08:19:42 2005 @@ -89,9 +89,9 @@ */ private Object[] expectedResult = { Arrays.asList(new Object[] { - getCompanyModelInstance("dept1"), + getTransientCompanyModelInstance("dept1"), new Double(45000.0), - getCompanyModelInstance("dept2"), + getTransientCompanyModelInstance("dept2"), new Double(58000.0)}) }; @@ -127,7 +127,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java Fri Dec 2 08:19:42 2005 @@ -17,11 +17,11 @@ package org.apache.jdo.tck.query.result; import java.util.Collection; -import java.util.HashSet; import javax.jdo.PersistenceManager; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.mylib.PrimitiveTypes; import org.apache.jdo.tck.query.QueryTest; import org.apache.jdo.tck.util.BatchTestRunner; @@ -54,22 +54,8 @@ } /** */ - public void test() { - pm = getPM(); - - try { - loadPrimitiveTypes(pm); - runTest(pm); - } - finally { - cleanupDatabase(pm, PrimitiveTypes.class); - pm.close(); - pm = null; - } - } - - /** */ - void runTest(PersistenceManager pm) { + public void testPositive() { + PersistenceManager pm = getPM(); Transaction tx = pm.currentTransaction(); tx.begin(); @@ -181,5 +167,13 @@ "Method remove called on an iterator obtained " + "from a query result throws expected exception " + ex); } + } + + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + loadAndPersistPrimitiveTypes(getPM()); + addTearDownClass(PrimitiveTypes.class); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java Fri Dec 2 08:19:42 2005 @@ -114,7 +114,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NullResults.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NullResults.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NullResults.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NullResults.java Fri Dec 2 08:19:42 2005 @@ -97,7 +97,7 @@ private Object[] expectedResult = { null, Arrays.asList(new Object[]{null}), - getCompanyModelInstancesAsList(new String[]{"emp2", null}) + getTransientCompanyModelInstancesAsList(new String[]{"emp2", null}) }; /** @@ -140,7 +140,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java Fri Dec 2 08:19:42 2005 @@ -471,7 +471,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultExpressions.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultExpressions.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultExpressions.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultExpressions.java Fri Dec 2 08:19:42 2005 @@ -326,7 +326,7 @@ */ private Object[] expectedResult = { // this - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{ "emp1", "emp2", "emp3", "emp4", "emp5"}), // field Arrays.asList(new Object[]{new Long(1), new Long(2), @@ -334,7 +334,7 @@ // variable.field Arrays.asList(new Object[]{new Long(1)}), // variable - getCompanyModelInstancesAsList(new String[]{"proj1"}), + getTransientCompanyModelInstancesAsList(new String[]{"proj1"}), // COUNT(this) new Long(5), // COUNT(variable) @@ -360,9 +360,9 @@ // navigational expression field Arrays.asList(new Object[]{new Long(1)}), // parameter - getCompanyModelInstancesAsList(new String[]{"proj1"}), + getTransientCompanyModelInstancesAsList(new String[]{"proj1"}), // cast - getCompanyModelInstancesAsList(new String[]{"emp2"}) + getTransientCompanyModelInstancesAsList(new String[]{"emp2"}) }; /** @@ -455,7 +455,7 @@ /** */ public void testNavigationalExpressionParameter() { int index = 13; - Object[] parameters = getCompanyModelInstances(new String[]{"proj1"}); + Object[] parameters = getPersistentCompanyModelInstances(new String[]{"proj1"}); executeQuery(index, parameters); } @@ -468,7 +468,7 @@ /** */ public void testParameter() { int index = 15; - Object[] parameters = getCompanyModelInstances(new String[]{"proj1"}); + Object[] parameters = getPersistentCompanyModelInstances(new String[]{"proj1"}); executeQuery(index, parameters); } @@ -490,7 +490,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ShapeOfResult.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ShapeOfResult.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ShapeOfResult.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ShapeOfResult.java Fri Dec 2 08:19:42 2005 @@ -214,15 +214,15 @@ */ private Object[] expectedResult = { // result: null - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{ "emp1", "emp2", "emp3", "emp4", "emp5"}), // result: this AS C - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{ "emp1", "emp2", "emp3", "emp4", "emp5"}), // result: null, unique: true - getCompanyModelInstance("emp1"), + getTransientCompanyModelInstance("emp1"), // result: this AS C, unique: true - getCompanyModelInstance("emp1"), + getTransientCompanyModelInstance("emp1"), // result: expression of type T Arrays.asList(new Object[]{"emp1First", "emp2First", "emp3First", "emp4First", "emp5First"}), @@ -328,7 +328,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Unique.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Unique.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Unique.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Unique.java Fri Dec 2 08:19:42 2005 @@ -100,9 +100,9 @@ * The expected results of valid queries. */ private Object[] expectedResult = { - getCompanyModelInstance("emp1"), + getTransientCompanyModelInstance("emp1"), null, - getCompanyModelInstance("emp1") + getTransientCompanyModelInstance("emp1") }; /** @@ -141,7 +141,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/VariableInResult.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/VariableInResult.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/VariableInResult.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/VariableInResult.java Fri Dec 2 08:19:42 2005 @@ -85,7 +85,7 @@ */ private Object[] expectedResult = { // this - getCompanyModelInstancesAsList(new String[]{"proj1"}), + getTransientCompanyModelInstancesAsList(new String[]{"proj1"}), // Note: "orange" is not a bean name! Arrays.asList(new Object[]{new Object[]{new Long(1), "orange"}}) }; @@ -121,7 +121,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java Fri Dec 2 08:19:42 2005 @@ -73,12 +73,12 @@ * The expected results of valid SQL queries. */ private Object[] expectedResult = { - getMylibInstancesAsList(new String[]{ + getTransientMylibInstancesAsList(new String[]{ "primitiveTypesPositive", "primitiveTypesNegative", "primitiveTypesCharacterStringLiterals"}), - getCompanyModelInstancesAsList(new String[]{"dept1", "dept2"}), - getCompanyModelInstancesAsList(new String[]{ + getTransientCompanyModelInstancesAsList(new String[]{"dept1", "dept2"}), + getTransientCompanyModelInstancesAsList(new String[]{ "emp1", "emp2", "emp3", "emp4", "emp5"}), new Object[]{"emp1First", "emp1Last"}, Arrays.asList(new Object[]{ @@ -217,9 +217,9 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); - loadMylib(getPM(), MYLIB_TESTDATA); + loadAndPersistMylib(getPM()); addTearDownClass(MylibReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NewQuery.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NewQuery.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NewQuery.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NewQuery.java Fri Dec 2 08:19:42 2005 @@ -83,7 +83,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java Fri Dec 2 08:19:42 2005 @@ -93,7 +93,7 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); } } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java?rev=351768&r1=351767&r2=351768&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java Fri Dec 2 08:19:42 2005 @@ -79,11 +79,11 @@ */ private Object[] expectedResult = { // candidate class - getMylibInstancesAsList(new String[]{ + getTransientMylibInstancesAsList(new String[]{ "primitiveTypesPositive", "primitiveTypesNegative", "primitiveTypesCharacterStringLiterals"}), // candidate class, unique - getMylibInstance("primitiveTypesPositive"), + getTransientMylibInstance("primitiveTypesPositive"), // single column Arrays.asList(new Object[]{"emp1First", "emp2First", "emp3First", "emp4First", "emp5First"}), @@ -176,9 +176,9 @@ * @see JDO_Test#localSetUp() */ protected void localSetUp() { - loadCompanyModel(getPM(), COMPANY_TESTDATA); + loadAndPersistCompanyModel(getPM()); addTearDownClass(CompanyModelReader.getTearDownClasses()); - loadMylib(getPM(), MYLIB_TESTDATA); + loadAndPersistMylib(getPM()); addTearDownClass(MylibReader.getTearDownClasses()); } }