From jdo-commits-return-1442-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Thu Apr 20 11:53:11 2006 Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 40298 invoked from network); 20 Apr 2006 11:53:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Apr 2006 11:53:03 -0000 Received: (qmail 59985 invoked by uid 500); 20 Apr 2006 11:52:50 -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 59974 invoked by uid 99); 20 Apr 2006 11:52:50 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Apr 2006 04:52:50 -0700 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; Thu, 20 Apr 2006 04:52:47 -0700 Received: (qmail 39832 invoked by uid 65534); 20 Apr 2006 11:52:08 -0000 Message-ID: <20060420115208.39831.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r395567 - in /db/jdo/trunk/tck20/src: java/org/apache/jdo/tck/mapping/ java/org/apache/jdo/tck/pc/company/ orm/applicationidentity/org/apache/jdo/tck/pc/company/ orm/datastoreidentity/org/apache/jdo/tck/pc/company/ sql/derby/applicationiden... Date: Thu, 20 Apr 2006 11:50:48 -0000 To: jdo-commits@db.apache.org From: mbo@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mbo Date: Thu Apr 20 04:50:43 2006 New Revision: 395567 URL: http://svn.apache.org/viewcvs?rev=395567&view=rev Log: JDO-369 Completeness test doesn't clean up instances of persistent interfaces Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java Thu Apr 20 04:50:43 2006 @@ -47,6 +47,9 @@ /** */ private final boolean isTestToBePerformed = isTestToBePerformed(); + + /** */ + private CompanyModelReader reader; /** */ protected List rootOids; @@ -68,7 +71,11 @@ */ protected void localSetUp() { if (isTestToBePerformed) { - addTearDownClass(CompanyModelReader.getTearDownClasses()); + // register the default factory + CompanyFactoryRegistry.registerFactory(); + // get new obj graph to compare persistent graph with + reader = new CompanyModelReader(inputFilename); + addTearDownClass(reader.getTearDownClassesFromFactory()); getPM(); CompanyFactoryRegistry.registerFactory(pm); CompanyModelReader reader = new CompanyModelReader(inputFilename); @@ -89,10 +96,6 @@ /** */ public void test() { if (isTestToBePerformed) { - // register the default factory - CompanyFactoryRegistry.registerFactory(); - // get new obj graph to compare persistent graph with - CompanyModelReader reader = new CompanyModelReader(inputFilename); List rootList = reader.getRootList(); getPM(); Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java Thu Apr 20 04:50:43 2006 @@ -63,4 +63,5 @@ String first, String last, String middle, Date born, IAddress addr, Date hired, double wage); IProject newProject(long projid, String name, BigDecimal budget); + Class[] getTearDownClasses(); } Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java Thu Apr 20 04:50:43 2006 @@ -28,6 +28,14 @@ */ public class CompanyFactoryConcreteClass implements CompanyFactory { + /** */ + public static final Class[] tearDownClasses = new Class[] { + DentalInsurance.class, MedicalInsurance.class, + Person.class, Employee.class, + PartTimeEmployee.class, FullTimeEmployee.class, + Project.class, Department.class, Company.class + }; + public CompanyFactoryConcreteClass(PersistenceManager pm) { } @@ -130,5 +138,9 @@ public IProject newProject(long projid, String name, BigDecimal budget) { return new Project(projid, name, budget); + } + + public Class[] getTearDownClasses() { + return tearDownClasses; } } Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java Thu Apr 20 04:50:43 2006 @@ -27,6 +27,14 @@ public class CompanyFactoryPMClass extends CompanyFactoryAbstractImpl { + /** */ + public static final Class[] tearDownClasses = new Class[] { + DentalInsurance.class, IMedicalInsurance.class, + Person.class, Employee.class, + PartTimeEmployee.class, FullTimeEmployee.class, + Project.class, Department.class, Company.class + }; + /** * Creates a new instance of CompanyFactoryPMInterface */ @@ -66,4 +74,7 @@ return (IProject)pm.newInstance(Project.class); } + public Class[] getTearDownClasses() { + return tearDownClasses; + } } Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java Thu Apr 20 04:50:43 2006 @@ -27,6 +27,14 @@ public class CompanyFactoryPMInterface extends CompanyFactoryAbstractImpl { + /** */ + public static final Class[] tearDownClasses = new Class[] { + IDentalInsurance.class, IMedicalInsurance.class, + IPerson.class, IEmployee.class, + IPartTimeEmployee.class, IFullTimeEmployee.class, + IProject.class, IDepartment.class, ICompany.class + }; + /** * Creates a new instance of CompanyFactoryPMInterface */ @@ -66,4 +74,7 @@ return (IProject)pm.newInstance(IProject.class); } + public Class[] getTearDownClasses() { + return tearDownClasses; + } } Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java Thu Apr 20 04:50:43 2006 @@ -47,24 +47,9 @@ */ public static final String BEAN_FACTORY_NAME = "companyFactory"; - /** All classes in the model - */ - private static final Class[] allClasses = new Class[] { - Address.class, Company.class, - DentalInsurance.class, Department.class, Employee.class, - FullTimeEmployee.class, Insurance.class, - MedicalInsurance.class, PartTimeEmployee.class, Person.class, - Project.class - }; - - /** All classes in the model - */ - private static final Class[] tearDownClasses = new Class[] { - DentalInsurance.class, MedicalInsurance.class, - Person.class, Employee.class, PartTimeEmployee.class, FullTimeEmployee.class, - Project.class, Department.class, Company.class - }; - + /** The company factory instance. */ + private CompanyFactory companyFactory; + /** * Create a CompanyModelReader for the specified resourceName. * @param resourceName the name of the resource @@ -112,7 +97,8 @@ CustomDateEditor dateEditor = new CustomDateEditor(formatter, true); registerCustomEditor(Date.class, dateEditor); - addSingleton(BEAN_FACTORY_NAME, CompanyFactoryRegistry.getInstance()); + companyFactory = CompanyFactoryRegistry.getInstance(); + addSingleton(BEAN_FACTORY_NAME, companyFactory); } // Convenience methods @@ -249,17 +235,20 @@ return (Project)getBean(name, Project.class); } - public static Class[] getAllClasses() { - return allClasses; + /** + * @return Returns the tearDownClasses. + */ + public Class[] getTearDownClassesFromFactory() { + return companyFactory.getTearDownClasses(); } /** * @return Returns the tearDownClasses. */ public static Class[] getTearDownClasses() { - return tearDownClasses; + return CompanyFactoryConcreteClass.tearDownClasses; } - + public static Date stringToUtilDate(String value) { return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York", Locale.US, value); } Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original) +++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm Thu Apr 20 04:50:43 2006 @@ -10,6 +10,9 @@ + + + @@ -29,6 +32,9 @@ + + + @@ -144,6 +150,9 @@ + + + @@ -164,6 +173,9 @@ + + + @@ -183,6 +195,9 @@ + + + @@ -298,6 +313,9 @@ + + + Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original) +++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm Thu Apr 20 04:50:43 2006 @@ -11,6 +11,9 @@ + + + @@ -43,6 +46,9 @@ + + + @@ -149,6 +155,9 @@ + + + @@ -168,6 +177,9 @@ + + + @@ -188,6 +200,9 @@ + + + @@ -306,6 +321,9 @@ + + + Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql (original) +++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql Thu Apr 20 04:50:43 2006 @@ -182,6 +182,7 @@ STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), + DISCRIMINATOR VARCHAR(255), CONSTRAINT COMPS_PK PRIMARY KEY (ID) ); @@ -190,6 +191,7 @@ NAME VARCHAR(32) NOT NULL, EMP_OF_THE_MONTH INTEGER, COMPANYID INTEGER REFERENCES companies, + DISCRIMINATOR VARCHAR(255), CONSTRAINT DEPTS_PK PRIMARY KEY (ID) ); @@ -232,6 +234,7 @@ PROJID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, BUDGET DECIMAL(11,2) NOT NULL, + DISCRIMINATOR VARCHAR(255), CONSTRAINT PROJS_PK PRIMARY KEY (PROJID) ); Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql?rev=395567&r1=395566&r2=395567&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql (original) +++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql Thu Apr 20 04:50:43 2006 @@ -130,6 +130,7 @@ STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), + DISCRIMINATOR VARCHAR(255), CONSTRAINT COMPS_PK PRIMARY KEY (DATASTORE_IDENTITY) ); @@ -139,6 +140,7 @@ NAME VARCHAR(32) NOT NULL, EMP_OF_THE_MONTH INTEGER, COMPANYID INTEGER REFERENCES companies, + DISCRIMINATOR VARCHAR(255), CONSTRAINT DEPTS_PK PRIMARY KEY (DATASTORE_IDENTITY) ); @@ -185,6 +187,7 @@ PROJID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, BUDGET DECIMAL(11,2) NOT NULL, + DISCRIMINATOR VARCHAR(255), CONSTRAINT PROJS_UK UNIQUE (PROJID), CONSTRAINT PROJS_PK PRIMARY KEY (DATASTORE_IDENTITY) );