Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 67808 invoked from network); 4 Apr 2005 19:44:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Apr 2005 19:44:00 -0000 Received: (qmail 81803 invoked by uid 500); 4 Apr 2005 19:43:59 -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 81788 invoked by uid 99); 4 Apr 2005 19:43:59 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 04 Apr 2005 12:43:58 -0700 Received: (qmail 67717 invoked by uid 65534); 4 Apr 2005 19:43:57 -0000 Message-ID: <20050404194357.67711.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Mon, 04 Apr 2005 19:43:57 -0000 Subject: svn commit: r160090 [43/63] - in incubator/jdo/trunk: ./ tck20/ tck20/assertions/ tck20/iut_jars/ tck20/test/ tck20/test/conf/ tck20/test/java/ tck20/test/java/org/ tck20/test/java/org/apache/ tck20/test/java/org/apache/jdo/ tck20/test/java/org/apache/jdo/tck/ tck20/test/java/org/apache/jdo/tck/api/ tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/ tck20/test/java/org/apache/jdo/tck/api/jdohelper/ tck20/test/java/org/apache/jdo/tck/api/persistencemanager/ tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/ tck20/test/java/org/apache/jdo/tck/api/persistencemanager/close/ tck20/test/java/org/apache/jdo/tck/api/persistencemanager/extent/ tck20/test/java/org/apache/jdo/tck/api/persistencemanager/flags/ tck20/test/java/org/apache/jdo/tck/api/persistencemanager/getobject/ tck20/test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/ tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ tck20/test/java/org/apache/jdo/tck/enhancement/ tck20/test/java/org/apache/jdo/tck/extents/ tck20/test/java/org/apache/jdo/tck/lifecycle/ tck20/test/java/org/apache/jdo/tck/lifecycle/nontransactional/ tck20/test/java/org/apache/jdo/tck/models/ tck20/test/java/org/apache/jdo/tck/models/embedded/ tck20/test/java/org/apache/jdo/tck/models/fieldtypes/ tck20/test/java/org/apache/jdo/tck/models/inheritance/ tck20/test/java/org/apache/jdo/tck/pc/ tck20/test/java/org/apache/jdo/tck/pc/company/ tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ tck20/test/java/org/apache/jdo/tck/pc/inheritance/ tck20/test/java/org/apache/jdo/tck/pc/instancecallbacks/ tck20/test/java/org/apache/jdo/tck/pc/lifecycle/ tck20/test/java/org/apache/jdo/tck/pc/mylib/ tck20/test/java/org/apache/jdo/tck/query/ tck20/test/java/org/apache/jdo/tck/query/operators/ tck20/test/java/org/apache/jdo/tck/transactions/ tck20/test/java/org/apache/jdo/tck/util/ tck20/test/jdo/ tck20/test/jdo/applicationidentity/ tck20/test/jdo/applicationidentity/org/ tck20/test/jdo/applicationidentity/org/apache/ tck20/test/jdo/applicationidentity/org/apache/jdo/ tck20/test/jdo/applicationidentity/org/apache/jdo/tck/ tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/ tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ tck20/test/jdo/datastoreidentity/ tck20/test/jdo/datastoreidentity/org/ tck20/test/jdo/datastoreidentity/org/apache/ tck20/test/jdo/datastoreidentity/org/apache/jdo/ tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/ tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/ tck20/test/orm/ tck20/test/orm/applicationidentity/ tck20/test/orm/applicationidentity/org/ tck20/test/orm/applicationidentity/org/apache/ tck20/test/orm/applicationidentity/org/apache/jdo/ tck20/test/orm/applicationidentity/org/apache/jdo/tck/ tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/ tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/ tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/ tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/ tck20/test/orm/datastoreidentity/ tck20/test/orm/datastoreidentity/org/ tck20/test/orm/datastoreidentity/org/apache/ tck20/test/orm/datastoreidentity/org/apache/jdo/ tck20/test/orm/datastoreidentity/org/apache/jdo/tck/ tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/ tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/ tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/ tck20/test/sql/ tck20/test/sql/derby/ To: jdo-commits@db.apache.org From: mcaisse@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Propchange: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/op= erators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java ---------------------------------------------------------------------------= --- svn:executable =3D * Added: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operato= rs/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/= apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenPrimitivesAndWr= apperInstances.java?view=3Dauto&rev=3D160090 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/= EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java (added) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/= EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java Mon Apr 4 = 12:41:23 2005 @@ -0,0 +1,111 @@ +/* + * Copyright 2005 The Apache Software Foundation. + *=20 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at=20 + *=20 + * http://www.apache.org/licenses/LICENSE-2.0 + *=20 + * Unless required by applicable law or agreed to in writing, software=20 + * distributed under the License is distributed on an "AS IS" BASIS,=20 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied= .=20 + * See the License for the specific language governing permissions and=20 + * limitations under the License. + */ +=20 +package org.apache.jdo.tck.query.operators; + +import java.util.Collection; +import java.util.HashSet; + +import javax.jdo.PersistenceManager; +import javax.jdo.Transaction; + +import org.apache.jdo.tck.query.QueryTest; +import org.apache.jdo.tck.pc.mylib.PrimitiveTypes; +import org.apache.jdo.tck.util.BatchTestRunner; + +/** + *Title: Equality and Comparisons Between Primitives and Wrapper + Instances + *
+ *Keywords: query + *
+ *Assertion ID: A14.6.2-3. + *
+ *Assertion Description: Equality and ordering comparisons between=20 + * primitives and instances of wrapper classes are valid in a Query<= /code> + * filter. + */ + +public class EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances=20 + extends QueryTest { + + /** */ + private static final String ASSERTION_FAILED =3D=20 + "Assertion A14.6.2-3 (EqualityAndComparisonsBetweenPrimitivesAndWr= apperInstances) failed: "; + =20 + /** + * The main is called when the class + * is directly executed from the command line. + * @param args The arguments passed to the program. + */ + public static void main(String[] args) { + BatchTestRunner.run(EqualityAndComparisonsBetweenPrimitivesAndWrap= perInstances.class); + } + + /** */ + public void test() { + pm =3D getPM(); + + try { + loadPrimitiveTypes(pm); + runTest(pm); + } + finally { + cleanupDatabase(pm, PrimitiveTypes.class); + pm.close(); + pm =3D null; + } + } + =20 + /** */ + void runTest(PersistenceManager pm) { + Transaction tx =3D pm.currentTransaction(); + tx.begin(); + + Collection instance9 =3D (Collection)pm.newQuery( + PrimitiveTypes.class, "id =3D=3D 9").execute(); + Collection instancesLess3 =3D (Collection)pm.newQuery( + PrimitiveTypes.class, "id < 3").execute(); + Collection allOddInstances =3D (Collection)pm.newQuery( + PrimitiveTypes.class, "booleanNull").execute(); + Collection allInstances =3D (Collection)pm.newQuery( + PrimitiveTypes.class, "true").execute(); + Collection empty =3D new HashSet(); + =20 + // case Integer =3D=3D int + runSimplePrimitiveTypesQuery("intNull =3D=3D 9",=20 + pm, instance9, ASSERTION_FAILED);=20 + =20 + // case Integer =3D=3D long + runSimplePrimitiveTypesQuery("intNull =3D=3D 9L",=20 + pm, instance9, ASSERTION_FAILED);=20 + =20 + // case char =3D=3D Character + runSimplePrimitiveTypesQuery("'O' =3D=3D charNull",=20 + pm, allOddInstances, ASSERTION_FAILED= );=20 + =20 + // case int <=3D Integer + runParameterPrimitiveTypesQuery( + "intNotNull <=3D param", "java.lang.Integer param", new Intege= r(2), + pm, instancesLess3, ASSERTION_FAILED);=20 + =20 + // case Double > double + runSimplePrimitiveTypesQuery("doubleNull > 0.0",=20 + pm, allInstances, ASSERTION_FAILED);=20 + =20 + tx.commit(); + } +} Propchange: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/op= erators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java ---------------------------------------------------------------------------= --- svn:executable =3D * Added: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operato= rs/EqualityAndComparisonsBetweenStringFieldsAndParameters.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/= apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAnd= Parameters.java?view=3Dauto&rev=3D160090 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/= EqualityAndComparisonsBetweenStringFieldsAndParameters.java (added) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/= EqualityAndComparisonsBetweenStringFieldsAndParameters.java Mon Apr 4 12:4= 1:23 2005 @@ -0,0 +1,114 @@ +/* + * Copyright 2005 The Apache Software Foundation. + *=20 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at=20 + *=20 + * http://www.apache.org/licenses/LICENSE-2.0 + *=20 + * Unless required by applicable law or agreed to in writing, software=20 + * distributed under the License is distributed on an "AS IS" BASIS,=20 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied= .=20 + * See the License for the specific language governing permissions and=20 + * limitations under the License. + */ + +package org.apache.jdo.tck.query.operators; + +import java.util.Collection; +import java.util.HashSet; + +import javax.jdo.PersistenceManager; +import javax.jdo.Query; +import javax.jdo.Transaction; + +import org.apache.jdo.tck.query.QueryTest; +import org.apache.jdo.tck.pc.company.Employee; +import org.apache.jdo.tck.pc.company.CompanyModelReader; +import org.apache.jdo.tck.util.BatchTestRunner; + +/** + *Title: Equality and Comparisons Between String Fields and Paramet= ers + *
+ *Keywords: query + *
+ *Assertion ID: A14.6.2-5. + *
+ *Assertion Description: +Equality and ordering comparisons of String fields and +String parameters are valid. +The comparison is done lexicographically. + */ + +public class EqualityAndComparisonsBetweenStringFieldsAndParameters=20 + extends QueryTest { + + /** */ + private static final String ASSERTION_FAILED =3D=20 + "Assertion A14.6.2-5 (EqualityAndComparisonsBetweenStringFieldsAnd= Parameters) failed: "; + =20 + /** + * The main is called when the class + * is directly executed from the command line. + * @param args The arguments passed to the program. + */ + public static void main(String[] args) { + BatchTestRunner.run(EqualityAndComparisonsBetweenStringFieldsAndPa= rameters.class); + } + =20 + /** */ + public void test() { + pm =3D getPM(); + =20 + try { + // read test data + CompanyModelReader reader =3D=20 + loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml= "); + runTest(pm, reader); + } + finally { + cleanupCompanyModel(pm); + pm.close(); + pm =3D null; + } + } + =20 + /** */ + void runTest(PersistenceManager pm, CompanyModelReader reader) { + Query q; + Object result; + Collection expected; + =20 + Transaction tx =3D pm.currentTransaction(); + tx.begin(); + + // string field =3D=3D string parameter + q =3D pm.newQuery(Employee.class, "firstname =3D=3D param"); + q.declareParameters("java.lang.String param"); + result =3D q.execute("emp1First"); + expected =3D new HashSet(); + expected.add(reader.getFullTimeEmployee("emp1")); + checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected); + =20 + // string field >=3D string parameter + q =3D pm.newQuery(Employee.class, "firstname >=3D param"); + q.declareParameters("java.lang.String param"); + result =3D q.execute("emp1First"); + expected =3D new HashSet(); + expected.add(reader.getFullTimeEmployee("emp1")); + expected.add(reader.getFullTimeEmployee("emp2")); + expected.add(reader.getPartTimeEmployee("emp3")); + checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected); + =20 + // string parameter < stringe field + q =3D pm.newQuery(Employee.class, "param < firstname"); + q.declareParameters("java.lang.String param"); + result =3D q.execute("emp2First"); + expected =3D new HashSet(); + expected.add(reader.getPartTimeEmployee("emp3")); + checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected); + + tx.commit(); + } +} \ No newline at end of file Propchange: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/op= erators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java ---------------------------------------------------------------------------= --- svn:executable =3D *