Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 43566 invoked from network); 31 May 2005 16:01:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 May 2005 16:01:36 -0000 Received: (qmail 59119 invoked by uid 500); 31 May 2005 16:01:36 -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 59106 invoked by uid 99); 31 May 2005 16:01:35 -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; Tue, 31 May 2005 09:01:30 -0700 Received: (qmail 43038 invoked by uid 65534); 31 May 2005 16:00:23 -0000 Message-ID: <20050531160023.43037.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r179227 - in /incubator/jdo/trunk/tck20: maven.xml project.properties project.xml test/java/org/apache/jdo/tck/enhancement/FieldAccessModified.java.fix test/java/org/apache/jdo/tck/enhancement/ImplementsPersistenceCapable.java.fix Date: Tue, 31 May 2005 16:00:22 -0000 To: jdo-commits@db.apache.org From: mcaisse@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mcaisse Date: Tue May 31 09:00:20 2005 New Revision: 179227 URL: http://svn.apache.org/viewcvs?rev=3D179227&view=3Drev Log: JDO-1 Enhancer tests now compile. Fix by M. Watzek Modified: incubator/jdo/trunk/tck20/maven.xml incubator/jdo/trunk/tck20/project.properties incubator/jdo/trunk/tck20/project.xml incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/enhancement/Fiel= dAccessModified.java.fix incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/enhancement/Impl= ementsPersistenceCapable.java.fix Modified: incubator/jdo/trunk/tck20/maven.xml URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev= =3D179227&r1=3D179226&r2=3D179227&view=3Ddiff =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/maven.xml (original) +++ incubator/jdo/trunk/tck20/maven.xml Tue May 31 09:00:20 2005 @@ -416,6 +416,8 @@ + + =20 Modified: incubator/jdo/trunk/tck20/project.properties URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.proper= ties?rev=3D179227&r1=3D179226&r2=3D179227&view=3Ddiff =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/project.properties (original) +++ incubator/jdo/trunk/tck20/project.properties Tue May 31 09:00:20 2005 @@ -60,6 +60,8 @@ log4j.jarfile =3D ${pom.getDependencyPath('log4j')} derby.jarfile =3D ${pom.getDependencyPath('derby:derby')} derbytools.jarfile =3D ${pom.getDependencyPath('derby:derbytools')} +core20.jarfile =3D ${pom.getDependencyPath('apache-jdo:jdo2-core')} +enhancer20.jarfile =3D ${pom.getDependencyPath('apache-jdo:jdo2-enhancer')} xmlparser =3D =20 # JDORI enhancer Modified: incubator/jdo/trunk/tck20/project.xml URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.xml?re= v=3D179227&r1=3D179226&r2=3D179227&view=3Ddiff =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/project.xml (original) +++ incubator/jdo/trunk/tck20/project.xml Tue May 31 09:00:20 2005 @@ -94,6 +94,16 @@ derbytools 10.0.2.1 + + apache-jdo + jdo2-enhancer + SNAPSHOT + + + apache-jdo + jdo2-core + SNAPSHOT + Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/enhancemen= t/FieldAccessModified.java.fix URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/= apache/jdo/tck/enhancement/FieldAccessModified.java.fix?rev=3D179227&r1=3D1= 79226&r2=3D179227&view=3Ddiff =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/enhancement/Fiel= dAccessModified.java.fix (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/enhancement/Fiel= dAccessModified.java.fix Tue May 31 09:00:20 2005 @@ -1,107 +0,0 @@ -/* - * 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.enhancement; - -import java.io.PrintWriter; -import java.util.Arrays; -import java.util.List; - -import org.apache.jdo.impl.enhancer.util.AnnotationTest; -import org.apache.jdo.tck.util.BatchTestRunner; - -/** - *Title: FieldAccessModified - *
- *Keywords: enhancement - *
- *Assertion ID: . - *
- *Assertion Description: -The enhancer modifies field accesses to guarantee that the values of fields -are retrieved from the data store prior to application usage. -
    -
  1. For any field access that reads the value of a field, the getfield byt= e code -is replaced with a call to a generated local method, jdoGetXXX
    2. -
  2. For any field access that stores the new value of a field, the putfield -byte code is replaced with a call to a generated local method, -jdoSetXXX
    3. -
- - */ - -public class FieldAccessModified extends EnhancerTest { - - /** */ - private static final String ASSERTION_FAILED =3D=20 - "Assertion (FieldAccessModified) 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(FieldAccessModified.class); - } - - =20 - /** */ - public void test() { - if (debug) - logger.debug("org.apache.jdo.tck.enhancement.FieldAccessModifi= ed.run"); - PMFPropertiesObject =3D loadProperties(PMFProperties); // will exi= t here if no properties - runTestAllPackages(); - cleanup(); - } - - /** */ - protected void runTestOnePackage (String packageName, List classNames)= { - if (debug) - logger.debug("FieldAccessModified.testOnePackage: " +=20 - packageName + " classes " + classNames); - =20 - PrintWriter out =3D new PrintWriter(System.out); - final AnnotationTest test =3D new AnnotationTest(out, out); - final String classpath =3D System.getProperty("java.class.path"); - final String jdoPropertiesFileName =3D=20 - packageName.replace ('.', '/') + "/jdoTest.properties"; //NOI1= 8N =20 - final String[] args =3D new String[classNames.size() + 6]; - int index =3D 0; - // init arguments for AnnotationTest.run call - // specify properties file - args[index++] =3D "--properties"; - args[index++] =3D jdoPropertiesFileName; - // specify jdo path to find the properties file - args[index++] =3D "-j"; - args[index++] =3D classpath; - // specify source path to find the classes - args[index++] =3D "-s"; - args[index++] =3D classpath; - // add class names - for (java.util.Iterator i =3D classNames.iterator(); i.hasNext();)= { - args[index++] =3D (String)i.next(); - } - if (debug) - logger.debug ("Run AnnotationTest with args " + Arrays.asList(= args)); - int errors =3D test.run(args); - if (errors > 0) { - fail(ASSERTION_FAILED, - "AnnotationTest with args " + Arrays.asList(args) + - " results in " + errors + " errors."); - } - } -} Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/enhancemen= t/ImplementsPersistenceCapable.java.fix URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/= apache/jdo/tck/enhancement/ImplementsPersistenceCapable.java.fix?rev=3D1792= 27&r1=3D179226&r2=3D179227&view=3Ddiff =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/enhancement/Impl= ementsPersistenceCapable.java.fix (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/enhancement/Impl= ementsPersistenceCapable.java.fix Tue May 31 09:00:20 2005 @@ -1,100 +0,0 @@ -/* - * 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.enhancement; - -import java.io.PrintWriter; -import java.util.Arrays; -import java.util.List; - -import org.apache.jdo.impl.enhancer.util.AugmentationTest; -import org.apache.jdo.tck.util.BatchTestRunner; - -/** - *Title: Implements PersistenceCapable Added - *
- *Keywords: enhancement - *
- *Assertion ID: A20.3-0. - *
- *Assertion Description: -The Reference Enhancer makes the following change -to persistence-capable classes: -it adds "implements javax.jdo.PersistenceCapable" -to the class definition. - - */ - -public class ImplementsPersistenceCapable extends EnhancerTest { - - /** */ - private static final String ASSERTION_FAILED =3D=20 - "Assertion A20.3-0 (ImplementsPersistenceCapable) 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(ImplementsPersistenceCapable.class); - } - - /** */ - public void test() { - if (debug) - logger.debug("org.apache.jdo.tck.enhancement.ImplementsPersist= enceCapable.run"); - runTestAllPackages(); - cleanup(); - } - - /** */ - protected void runTestOnePackage (String packageName, List classNames)= { - if (debug)=20 - logger.debug("ImplementsPersistenceCapable.testOnePackage: " +=20 - packageName + " classes " + classNames); - =20 - PrintWriter out =3D new PrintWriter(System.out); - final AugmentationTest test =3D new AugmentationTest(out, out); - final String classpath =3D System.getProperty("java.class.path"); - final String jdoPropertiesFileName =3D=20 - packageName.replace ('.', '/') + "/jdoTest.properties"; //NOI1= 8N =20 - final String[] args =3D new String[classNames.size() + 6]; - int index =3D 0; - // init arguments for AugmentationTest.run call - // specify properties file - args[index++] =3D "--properties"; - args[index++] =3D jdoPropertiesFileName; - // specify jdo path to find the properties file - args[index++] =3D "-j"; - args[index++] =3D classpath; - // specify source path to find the classes - args[index++] =3D "-s"; - args[index++] =3D classpath; - // add class names - for (java.util.Iterator i =3D classNames.iterator(); i.hasNext();)= { - args[index++] =3D (String)i.next(); - } - if (debug) - logger.debug ("Run AugmentationTest with args " + Arrays.asLis= t(args)); - int errors =3D test.run(args); - if (errors > 0) { - fail(ASSERTION_FAILED, - "AugmentationTest with args " + Arrays.asList(args) + - " results in " + errors + " errors."); - } - } -}