From 28d921e092150888d7accea231185e3ce772932a Mon Sep 17 00:00:00 2001 From: Tilmann Date: Mon, 17 Nov 2025 22:43:12 +0100 Subject: [PATCH] Clean up README.md --- README.md | 10 ++-------- .../src/main/java/org/apache/jdo/exectck/RunTCK.java | 2 -- tck/src/main/resources/conf/cancel.conf | 1 - .../main/resources/conf/companyListWithoutJoin.conf | 1 - tck/src/main/resources/conf/companyMapWithoutJoin.conf | 1 - tck/src/main/resources/conf/converter.conf | 1 - tck/src/main/resources/conf/detach.conf | 1 - tck/src/main/resources/conf/embeddedInheritance.conf | 1 - tck/src/main/resources/conf/enhancement.conf | 1 - tck/src/main/resources/conf/extents.conf | 1 - tck/src/main/resources/conf/fetchgroup.conf | 1 - tck/src/main/resources/conf/fetchplan.conf | 1 - tck/src/main/resources/conf/instancecallbacks.conf | 1 - tck/src/main/resources/conf/jdohelper.conf | 1 - tck/src/main/resources/conf/jdoql.conf | 1 - tck/src/main/resources/conf/jdoql1.conf | 1 - tck/src/main/resources/conf/lifecycle.conf | 1 - tck/src/main/resources/conf/models.conf | 1 - tck/src/main/resources/conf/models1.conf | 1 - tck/src/main/resources/conf/pm.conf | 1 - tck/src/main/resources/conf/pmf.conf | 1 - tck/src/main/resources/conf/query.conf | 1 - tck/src/main/resources/conf/runonce.conf | 1 - tck/src/main/resources/conf/security.conf | 1 - tck/src/main/resources/conf/transactions.conf | 1 - 25 files changed, 2 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 9ecbaca6f..bbe2e57ad 100644 --- a/README.md +++ b/README.md @@ -144,14 +144,9 @@ The *jdo-exectck* Maven plugin has the following options ### Examples -Example 1 : Installs the database schema for datastore identity for all supported databases. +This example runs the test configurations specified in `alltests.conf` and `cfg1.conf` on the JDORI, using all supported identity types and databases. - mvn -Djdo.tck.identitytypes=datastoreidentity jdo-exectck:installSchema - - -Example 2 : Runs the test configurations specified in `alltests.conf` and `cfg1.conf` on the JDORI, using all supported identity types and databases. - - mvn -Djdo.tck.cfglist="alltests.conf cfg1.conf" jdo-exectck:runtck + mvn -Djdo.tck.cfglist="alltests.conf cfg1.conf" install @@ -164,7 +159,6 @@ While running the TCK, maven uses the following configuration files in src/conf: * jdo.tck.testdescription : An optional string describing the purpose of these tests * jdo.tck.classes : A list of one or more test classes (required) * jdo.tck.testdata : The fully qualified file name of the xml test data file(optional) - * jdo.tck.standarddata : The fully qualified file name of the xml test data file(optional) * jdo.tck.mapping : The file designator that maven.xml uses to build a javax.jdo.option.Mapping value and corresponding schema name (required) * exclude.list : A list of test classes NOT to execute during a TCK test run diff --git a/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java b/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java index eb0f05fa0..0b5e17320 100644 --- a/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java +++ b/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java @@ -461,8 +461,6 @@ private List getCfgProps( List cfgPropsString = new ArrayList<>(); cfgPropsString.addAll(idPropsString); cfgPropsString.add("-Djdo.tck.testdata=" + getTrimmedPropertyValue(props, "jdo.tck.testdata")); - cfgPropsString.add( - "-Djdo.tck.standarddata=" + getTrimmedPropertyValue(props, "jdo.tck.standarddata")); cfgPropsString.add( "-Djdo.tck.mapping.companyfactory=" + getTrimmedPropertyValue(props, "jdo.tck.mapping.companyfactory")); diff --git a/tck/src/main/resources/conf/cancel.conf b/tck/src/main/resources/conf/cancel.conf index 40bf79a5a..365eb95f8 100644 --- a/tck/src/main/resources/conf/cancel.conf +++ b/tck/src/main/resources/conf/cancel.conf @@ -16,7 +16,6 @@ jdo.tck.description = All query tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/companyListWithoutJoin.conf b/tck/src/main/resources/conf/companyListWithoutJoin.conf index c01d89885..270ebc359 100644 --- a/tck/src/main/resources/conf/companyListWithoutJoin.conf +++ b/tck/src/main/resources/conf/companyListWithoutJoin.conf @@ -16,7 +16,6 @@ jdo.tck.description = Completeness test with companyListWithoutJoin model. jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyListWithoutJoin.CompanyFactoryPMClass jdo.tck.testdata = org/apache/jdo/tck/pc/companyListWithoutJoin/companyListWithoutJoin.xml -jdo.tck.standarddata = jdo.tck.mapping = 10 jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTestList jdo.tck.requiredOptions = diff --git a/tck/src/main/resources/conf/companyMapWithoutJoin.conf b/tck/src/main/resources/conf/companyMapWithoutJoin.conf index cf59e08b7..0bb2275f4 100644 --- a/tck/src/main/resources/conf/companyMapWithoutJoin.conf +++ b/tck/src/main/resources/conf/companyMapWithoutJoin.conf @@ -16,7 +16,6 @@ jdo.tck.description = Completeness test with companyMapWithoutJoin model. jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyMapWithoutJoin.CompanyFactoryPMClass jdo.tck.testdata = org/apache/jdo/tck/pc/companyMapWithoutJoin/companyMapWithoutJoin.xml -jdo.tck.standarddata = jdo.tck.mapping = 9 jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTestMap jdo.tck.requiredOptions = diff --git a/tck/src/main/resources/conf/converter.conf b/tck/src/main/resources/conf/converter.conf index a5897257b..27e76b413 100644 --- a/tck/src/main/resources/conf/converter.conf +++ b/tck/src/main/resources/conf/converter.conf @@ -16,7 +16,6 @@ jdo.tck.description = Converter test, standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/detach.conf b/tck/src/main/resources/conf/detach.conf index bc3b56a61..aafe55c3c 100644 --- a/tck/src/main/resources/conf/detach.conf +++ b/tck/src/main/resources/conf/detach.conf @@ -16,7 +16,6 @@ jdo.tck.description = Detachment tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 8 jdo.tck.classes = \ org.apache.jdo.tck.api.jdohelper.IsDetached \ diff --git a/tck/src/main/resources/conf/embeddedInheritance.conf b/tck/src/main/resources/conf/embeddedInheritance.conf index dc863ab49..a3be278a3 100644 --- a/tck/src/main/resources/conf/embeddedInheritance.conf +++ b/tck/src/main/resources/conf/embeddedInheritance.conf @@ -16,7 +16,6 @@ jdo.tck.description = Detachment tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 12 jdo.tck.classes = \ org.apache.jdo.tck.models.embedded.EmbeddedInheritance diff --git a/tck/src/main/resources/conf/enhancement.conf b/tck/src/main/resources/conf/enhancement.conf index a71024dc1..05c639cab 100644 --- a/tck/src/main/resources/conf/enhancement.conf +++ b/tck/src/main/resources/conf/enhancement.conf @@ -16,7 +16,6 @@ jdo.tck.description = All enhancement, persistencecapable tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/extents.conf b/tck/src/main/resources/conf/extents.conf index 3d24368b9..669fc7a1b 100644 --- a/tck/src/main/resources/conf/extents.conf +++ b/tck/src/main/resources/conf/extents.conf @@ -16,7 +16,6 @@ jdo.tck.description = All extent tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/fetchgroup.conf b/tck/src/main/resources/conf/fetchgroup.conf index 2a7b7cc04..f90690b4c 100644 --- a/tck/src/main/resources/conf/fetchgroup.conf +++ b/tck/src/main/resources/conf/fetchgroup.conf @@ -16,7 +16,6 @@ jdo.tck.description = FetchGroup test. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/fetchplan.conf b/tck/src/main/resources/conf/fetchplan.conf index 67e1acbc3..2dcc06c95 100644 --- a/tck/src/main/resources/conf/fetchplan.conf +++ b/tck/src/main/resources/conf/fetchplan.conf @@ -16,7 +16,6 @@ jdo.tck.description = All pm tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/instancecallbacks.conf b/tck/src/main/resources/conf/instancecallbacks.conf index 44c3e7f38..0cf3fbb40 100644 --- a/tck/src/main/resources/conf/instancecallbacks.conf +++ b/tck/src/main/resources/conf/instancecallbacks.conf @@ -16,7 +16,6 @@ jdo.tck.description = All instancecallback tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/jdohelper.conf b/tck/src/main/resources/conf/jdohelper.conf index 3446c45d9..3cf97a530 100644 --- a/tck/src/main/resources/conf/jdohelper.conf +++ b/tck/src/main/resources/conf/jdohelper.conf @@ -16,7 +16,6 @@ jdo.tck.description = All jdohelper tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/jdoql.conf b/tck/src/main/resources/conf/jdoql.conf index 2306bf08c..c28b738a8 100644 --- a/tck/src/main/resources/conf/jdoql.conf +++ b/tck/src/main/resources/conf/jdoql.conf @@ -16,7 +16,6 @@ jdo.tck.description = All jdoql tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/jdoql1.conf b/tck/src/main/resources/conf/jdoql1.conf index 4a438ffde..1c40735b6 100644 --- a/tck/src/main/resources/conf/jdoql1.conf +++ b/tck/src/main/resources/conf/jdoql1.conf @@ -16,7 +16,6 @@ jdo.tck.description = Special jdoql test with mapping 1 which maps Enums to integer columns jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 1 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/lifecycle.conf b/tck/src/main/resources/conf/lifecycle.conf index 953d70892..7a4ade658 100644 --- a/tck/src/main/resources/conf/lifecycle.conf +++ b/tck/src/main/resources/conf/lifecycle.conf @@ -16,7 +16,6 @@ jdo.tck.description = All lifecycle tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/models.conf b/tck/src/main/resources/conf/models.conf index 1d8ea575b..0bc42844a 100644 --- a/tck/src/main/resources/conf/models.conf +++ b/tck/src/main/resources/conf/models.conf @@ -16,7 +16,6 @@ jdo.tck.description = All model tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/models1.conf b/tck/src/main/resources/conf/models1.conf index 901f79934..6441f43a4 100644 --- a/tck/src/main/resources/conf/models1.conf +++ b/tck/src/main/resources/conf/models1.conf @@ -16,7 +16,6 @@ jdo.tck.description = All model tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 1 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/pm.conf b/tck/src/main/resources/conf/pm.conf index 0573a5f8e..e57822d88 100644 --- a/tck/src/main/resources/conf/pm.conf +++ b/tck/src/main/resources/conf/pm.conf @@ -16,7 +16,6 @@ jdo.tck.description = All pm tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/pmf.conf b/tck/src/main/resources/conf/pmf.conf index 0814e056b..6547ec6e5 100644 --- a/tck/src/main/resources/conf/pmf.conf +++ b/tck/src/main/resources/conf/pmf.conf @@ -16,7 +16,6 @@ jdo.tck.description = All pmf tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/query.conf b/tck/src/main/resources/conf/query.conf index 263809401..6739fa74f 100644 --- a/tck/src/main/resources/conf/query.conf +++ b/tck/src/main/resources/conf/query.conf @@ -16,7 +16,6 @@ jdo.tck.description = All query tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/runonce.conf b/tck/src/main/resources/conf/runonce.conf index 29d8bdb13..8f29568b4 100644 --- a/tck/src/main/resources/conf/runonce.conf +++ b/tck/src/main/resources/conf/runonce.conf @@ -15,7 +15,6 @@ jdo.tck.description = Verification of the JDO API classes and interfaces jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = # The runOnce flag must only be set in this configuration and no others diff --git a/tck/src/main/resources/conf/security.conf b/tck/src/main/resources/conf/security.conf index 414d92bc4..583250ade 100644 --- a/tck/src/main/resources/conf/security.conf +++ b/tck/src/main/resources/conf/security.conf @@ -17,7 +17,6 @@ jdo.tck.security = true jdo.tck.description = All pmf tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \ diff --git a/tck/src/main/resources/conf/transactions.conf b/tck/src/main/resources/conf/transactions.conf index dd47f7184..081473ee3 100644 --- a/tck/src/main/resources/conf/transactions.conf +++ b/tck/src/main/resources/conf/transactions.conf @@ -16,7 +16,6 @@ jdo.tck.description = All transaction tests with standard mapping, no testdata. jdo.tck.mapping.companyfactory = jdo.tck.testdata = -jdo.tck.standarddata = jdo.tck.mapping = 0 jdo.tck.requiredOptions = jdo.tck.classes = \