Return-Path: Delivered-To: apmail-db-jdo-dev-archive@www.apache.org Received: (qmail 57331 invoked from network); 5 Aug 2005 15:35:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Aug 2005 15:35:45 -0000 Received: (qmail 66376 invoked by uid 500); 5 Aug 2005 15:35:44 -0000 Mailing-List: contact jdo-dev-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-dev@db.apache.org Received: (qmail 66309 invoked by uid 99); 5 Aug 2005 15:35:44 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Aug 2005 08:35:44 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [212.224.30.66] (HELO service-01.spree.de) (212.224.30.66) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Aug 2005 08:35:32 -0700 Received: from [172.16.1.19] (rio.spree.de [172.16.1.19]) (authenticated bits=0) by service-01.spree.de (8.13.4/8.13.4/Debian-3) with ESMTP id j75FZcLC003076 for ; Fri, 5 Aug 2005 17:35:38 +0200 Message-ID: <42F387B3.5060804@spree.de> Date: Fri, 05 Aug 2005 17:37:23 +0200 From: Michael Watzek Organization: Tech@Spree GmbH User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: jdo-dev@db.apache.org Subject: Patch for relationship tests Content-Type: multipart/mixed; boundary="------------040201010208010906000406" X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --------------040201010208010906000406 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, please find the patch for relationship tests attached. The patch is too big to send it in one file. For this reason, I broke it up into two files: - relationship.patch-1of2 - relationship.patch-2of2 I'll send the second file in a separate mail. The patch adds 6 configurations to the build process, one for each relationship type: - test/conf/companyNoRelationships.conf - test/conf/companyEmbedded.conf - test/conf/company1-1Relationships.conf - test/conf/company1-MRelationships.conf - test/conf/companyM-MRelationships.conf - test/conf/companyAllRelationships.conf The first configuration file (companyNoRelationships.conf) equals configuration cfg2.conf. I removed the latter. All of these configurations are added to the configuration list. That's why the TCK runs 14 configurations after you applied the patch (7 for each identity type). Moreover, the patch adds XML testdata files for each relationship configuration. The completeness test has been changed to get the XML testdata file as a system property. There is a slight change in both schema files because the type of a column (INSURANCEPLANS.LIFETIME_ORTHO_BENEFIT DECIMAL(22,3)) needed to be adapted to the testdata. Below you find the results of relationship tests: Datastore identity: NoRelationships: Error due to JDO-93 Embedded: Error due to JDO-93 1:1: Failure comparing stored/expected data 1:M: Failure comparing stored/expected data M:M: Error during pm.makePersistentAll All: Error during pm.makePersistentAll Application identity: NoRelationships: Error due to JDO-93 Embedded: Error due to JDO-93 1:1: Error due to java.lang.ClassCastException in Employee.jdoReplaceField 1:M: Failure comparing stored/expected data M:M: Error due to JDO-93 All: Failure comparing stored/expected data I have not filed bugs for the new errors/failures yet. Below you find the outcome of "svn status" in my local workspace. After you apply the patch, please call "svn add" on new files and "svn remove" on removed files. Regards, Michael .../tck20>svn status M test/sql/derby/datastoreidentity/schema.sql M test/sql/derby/applicationidentity/schema.sql M test/java/org/apache/jdo/tck/mapping/CompletenessTest.java A test/conf/companyAllRelationships.conf A test/conf/companyNoRelationships.conf M test/conf/configurations.list A test/conf/companyEmbedded.conf D test/conf/cfg2.conf A test/conf/companyM-MRelationships.conf A test/conf/company1-MRelationships.conf A test/conf/company1-1Relationships.conf A test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml A test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml A test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml D test/testdata/org/apache/jdo/tck/pc/company/company.xml M test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml A test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml A test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml -- ------------------------------------------------------------------- Michael Watzek Tech@Spree Engineering GmbH mailto:mwa.tech@spree.de Buelowstr. 66 Tel.: ++49/30/235 520 36 10783 Berlin - Germany Fax.: ++49/30/217 520 12 http://www.spree.de/ ------------------------------------------------------------------- --------------040201010208010906000406 Content-Type: text/plain; name="relationship.patch-1of2" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="relationship.patch-1of2" Index: test/sql/derby/datastoreidentity/schema.sql =================================================================== --- test/sql/derby/datastoreidentity/schema.sql (revision 230478) +++ test/sql/derby/datastoreidentity/schema.sql (working copy) @@ -134,7 +134,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, INSID INTEGER, CARRIER VARCHAR(64) NOT NULL, - LIFETIME_ORTHO_BENEFIT DECIMAL, + LIFETIME_ORTHO_BENEFIT DECIMAL(22,3), PLANTYPE VARCHAR(8), DISCRIMINATOR varchar(64) NOT NULL, EMPLOYEE INTEGER REFERENCES persons, Index: test/sql/derby/applicationidentity/schema.sql =================================================================== --- test/sql/derby/applicationidentity/schema.sql (revision 230478) +++ test/sql/derby/applicationidentity/schema.sql (working copy) @@ -187,7 +187,7 @@ CREATE TABLE insuranceplans ( INSID INTEGER NOT NULL, CARRIER VARCHAR(64) NOT NULL, - LIFETIME_ORTHO_BENEFIT DECIMAL, + LIFETIME_ORTHO_BENEFIT DECIMAL(22,3), PLANTYPE VARCHAR(8), DISCRIMINATOR varchar(64) NOT NULL, EMPLOYEE INTEGER REFERENCES persons, Index: test/java/org/apache/jdo/tck/mapping/CompletenessTest.java =================================================================== --- test/java/org/apache/jdo/tck/mapping/CompletenessTest.java (revision 230478) +++ test/java/org/apache/jdo/tck/mapping/CompletenessTest.java (working copy) @@ -21,7 +21,6 @@ import java.util.List; import org.apache.jdo.tck.JDO_Test; -import org.apache.jdo.tck.pc.company.Company; import org.apache.jdo.tck.pc.company.CompanyModelReader; import org.apache.jdo.tck.util.BatchTestRunner; import org.apache.jdo.tck.util.DeepEquality; @@ -48,8 +47,8 @@ /** */ protected List rootOids; - // todo: get filename from property - protected String inputFilename = "org/apache/jdo/tck/pc/company/companyNoRelationships.xml"; + /** */ + protected String inputFilename = System.getProperty("jdo.tck.testdata"); /** * The main is called when the class Index: test/conf/companyAllRelationships.conf =================================================================== --- test/conf/companyAllRelationships.conf (revision 0) +++ test/conf/companyAllRelationships.conf (revision 0) @@ -0,0 +1,5 @@ +jdo.tck.description = Completeness test with standard mapping, basic testdata with all relationships \ +and embedded objects. +jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest +jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml +jdo.tck.mapping = 0 Property changes on: test/conf/companyAllRelationships.conf ___________________________________________________________________ Name: svn:executable + * Index: test/conf/companyNoRelationships.conf =================================================================== --- test/conf/companyNoRelationships.conf (revision 0) +++ test/conf/companyNoRelationships.conf (revision 0) @@ -0,0 +1,4 @@ +jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships. +jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest +jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyNoRelationships.xml +jdo.tck.mapping = 0 Property changes on: test/conf/companyNoRelationships.conf ___________________________________________________________________ Name: svn:executable + * Index: test/conf/configurations.list =================================================================== --- test/conf/configurations.list (revision 230478) +++ test/conf/configurations.list (working copy) @@ -1,3 +1,8 @@ -jdo.tck.cfglist = \ - alltests.conf \ - cfg2.conf +jdo.tck.cfglist = \ + alltests.conf \ + companyNoRelationships.conf \ + companyEmbedded.conf \ + company1-1Relationships.conf \ + company1-MRelationships.conf \ + companyM-MRelationships.conf \ + companyAllRelationships.conf Index: test/conf/companyEmbedded.conf =================================================================== --- test/conf/companyEmbedded.conf (revision 0) +++ test/conf/companyEmbedded.conf (revision 0) @@ -0,0 +1,5 @@ +jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships \ +and embedded objects. +jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest +jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyEmbedded.xml +jdo.tck.mapping = 0 Property changes on: test/conf/companyEmbedded.conf ___________________________________________________________________ Name: svn:executable + * Index: test/conf/cfg2.conf =================================================================== --- test/conf/cfg2.conf (revision 230478) +++ test/conf/cfg2.conf (working copy) @@ -1,4 +0,0 @@ -jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships. -jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest -jdo.tck.testdata = org.apache.jdo.tck.pc.company.companyNoRelationships.xml -jdo.tck.mapping = 0 Index: test/conf/companyM-MRelationships.conf =================================================================== --- test/conf/companyM-MRelationships.conf (revision 0) +++ test/conf/companyM-MRelationships.conf (revision 0) @@ -0,0 +1,4 @@ +jdo.tck.description = Completeness test with standard mapping, basic testdata with M-M relationships. +jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest +jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyM-MRelationships.xml +jdo.tck.mapping = 0 Property changes on: test/conf/companyM-MRelationships.conf ___________________________________________________________________ Name: svn:executable + * Index: test/conf/company1-MRelationships.conf =================================================================== --- test/conf/company1-MRelationships.conf (revision 0) +++ test/conf/company1-MRelationships.conf (revision 0) @@ -0,0 +1,4 @@ +jdo.tck.description = Completeness test with standard mapping, basic testdata with 1-M relationships. +jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest +jdo.tck.testdata = org/apache/jdo/tck/pc/company/company1-MRelationships.xml +jdo.tck.mapping = 0 Property changes on: test/conf/company1-MRelationships.conf ___________________________________________________________________ Name: svn:executable + * Index: test/conf/company1-1Relationships.conf =================================================================== --- test/conf/company1-1Relationships.conf (revision 0) +++ test/conf/company1-1Relationships.conf (revision 0) @@ -0,0 +1,4 @@ +jdo.tck.description = Completeness test with standard mapping, basic testdata with 1-1 relationships. +jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest +jdo.tck.testdata = org/apache/jdo/tck/pc/company/company1-1Relationships.xml +jdo.tck.mapping = 0 Property changes on: test/conf/company1-1Relationships.conf ___________________________________________________________________ Name: svn:executable + * --------------040201010208010906000406--