db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r193203 [1/5] - in /incubator/jdo/trunk/tck20: ./ test/conf/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/util/ test/sql/derby/ test/sql/derby/applicationidentity/ test/sql/derby/datastoreidentity/ test/testdata/applicationide...
Date Thu, 23 Jun 2005 19:16:36 GMT
Author: mcaisse
Date: Thu Jun 23 12:16:32 2005
New Revision: 193203

URL: http://svn.apache.org/viewcvs?rev=193203&view=rev
Log:
JDO-6 TestRunner project - maven runs tests on all supported identity types, databases

Added:
    incubator/jdo/trunk/tck20/test/conf/alltests.conf   (with props)
    incubator/jdo/trunk/tck20/test/conf/cfg2.conf   (with props)
    incubator/jdo/trunk/tck20/test/conf/configurations.list   (with props)
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql   (with props)
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql   (with props)
    incubator/jdo/trunk/tck20/test/testdata/org/
    incubator/jdo/trunk/tck20/test/testdata/org/apache/
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company.xml
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
Removed:
    incubator/jdo/trunk/tck20/test/conf/alltests.list
    incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
    incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
    incubator/jdo/trunk/tck20/test/testdata/applicationidentity/
    incubator/jdo/trunk/tck20/test/testdata/datastoreidentity/
Modified:
    incubator/jdo/trunk/tck20/maven.xml
    incubator/jdo/trunk/tck20/project.properties
    incubator/jdo/trunk/tck20/test/conf/jdori.properties
    incubator/jdo/trunk/tck20/test/conf/logging.properties
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/JDO_Test.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchResultPrinter.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchTestRunner.java

Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev=193203&r1=193202&r2=193203&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Thu Jun 23 12:16:32 2005
@@ -19,6 +19,7 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
+    xmlns:u="jelly:util"
     >
 
     <!-- ==================== -->
@@ -31,7 +32,9 @@
 
     <goal name="build">
         <attainGoal name="default"/>
-        <attainGoal name="runtck.jdori"/>
+        <attainGoal name="setProps"/>
+        <attainGoal name="privateInstallSchema"/>
+        <attainGoal name="privateRuntck.jdori"/>
     </goal>
 
     <goal name="rebuild">
@@ -46,306 +49,358 @@
     </goal>
 
     <!-- ================== -->
-    <!-- Running test cases -->
+    <!-- Set properties     -->
     <!-- ================== -->
 
-    <goal name="runtck" prereqs="java:compile, enhance, testrunner.set, database, copyprops">
-        <echo>Run JDO TCK on the IUT with configuration ${jdo.tck.configuration}</echo>
-        <java fork="yes" dir="${jdo.tck.testdir}" 
-              classname="${jdo.tck.testrunnerclass}">
-            <classpath refid="project.class.path"/>
-            <sysproperty key="ResultPrinterClass" value="${jdo.tck.resultprinterclass}"/>
-            <sysproperty key="verbose" value="${verbose}"/>
-            <sysproperty key="PMFProperties" value="${iut.runtck.properties}"/>
-            <sysproperty key="PMF2Properties" value="${iut.runtck.properties}"/>
-            <jvmarg line="${iut.runtck.sysproperties}"/>
-            <arg line="${jdo.tck.testclasses}"/>
-        </java>
+    <goal name="setProps">
+        <echo>setProps:</echo>
+
+        <j:set var="zeroval" value="0"/>
+
+        <!-- Get configuration list -->
+        <j:choose>
+            <j:when test="${configuration == null}">
+                <u:properties file="${basedir}/test/conf/configurations.list"/>
+            </j:when>
+            <j:otherwise>
+                <j:set var="jdo.tck.cfglist" value="${configuration}"/>
+            </j:otherwise>
+        </j:choose>
+
+        <u:tokenize var="jdo.tck.cfglist" delim=" ">
+            ${jdo.tck.cfglist}
+        </u:tokenize>
+
+        <echo>Databases for this run are ${jdo.tck.dblist}</echo>
+        <u:tokenize var="jdo.tck.dblist" delim=" ">
+            ${jdo.tck.dblist}
+        </u:tokenize>
+
+        <echo>Identity types for this run are ${jdo.tck.identitytypes}</echo>
+        <u:tokenize var="jdo.tck.identitytypes" delim=" ">
+            ${jdo.tck.identitytypes}
+        </u:tokenize>
+
     </goal>
 
-    <!-- Run a single tck test. The property testcase defines the name of -->
-    <!-- the tck test class w/o the prefix org.apache.jdo.tck, e.g.       --> 
-    <!--   maven -Dtest=api.jdohelper.GetObjectId runtck.single       -->
-    <goal name="runtck.single" prereqs="java:compile, enhance, testrunner.set, copyprops">
-        <echo>Run TCK test org.apache.jdo.tck.${test} on the IUT with configuration ${jdo.tck.configuration}</echo>
-        <java fork="yes" dir="${jdo.tck.testdir}" 
-              classname="org.apache.jdo.tck.${test}">
-            <classpath refid="project.class.path"/>
-            <sysproperty key="ResultPrinterClass" value="${jdo.tck.resultprinterclass}"/>
-            <sysproperty key="verbose" value="${verbose}"/>
-            <sysproperty key="PMFProperties" value="${iut.runtck.properties}"/>
-            <sysproperty key="PMF2Properties" value="${iut.runtck.properties}"/>
-            <jvmarg line="${iut.runtck.sysproperties}"/>
-        </java>
+    <!-- ================== -->
+    <!-- Install schema     -->
+    <!-- ================== -->
+
+    <goal name="installSchema" prereqs="setProps">
+        <attainGoal name="privateInstallSchema"/>
     </goal>
 
-    <goal name="runtck.jdori" prereqs="java:compile, jdorienhance, database, copyprops">
-        <echo>Run JDO TCK on the RI with configuration ${jdo.tck.configuration}</echo>
-        <j:set var="jdo.tck.testrunnerclass" value="org.apache.jdo.tck.util.BatchTestRunner"/>
-        <java fork="yes" dir="${jdo.tck.testdir}" 
-              classname="${jdo.tck.testrunnerclass}">
-            <classpath refid="jdori.class.path"/>
-            <sysproperty key="ResultPrinterClass" value="${jdo.tck.resultprinterclass}"/>
-            <sysproperty key="verbose" value="${verbose}"/>
-            <sysproperty key="PMFProperties" value="${basedir}/test/conf/jdori.properties"/>
-            <sysproperty key="PMF2Properties" value="${basedir}/test/conf/jdori.properties"/>
-            <jvmarg line="${database.runtck.sysproperties}"/>
-            <jvmarg line="${jdo.runtck.sysproperties}"/>
-            <arg line="${jdo.tck.alltests}"/>
+    <goal name="privateInstallSchema">
+        <!-- load mappings into a HashSet to unique them -->
+        <j:new var="uniqueMappings" className="java.util.HashSet"/>
+        <j:forEach var="cfg" items="${jdo.tck.cfglist}">
+            <u:properties file="${basedir}/test/conf/${cfg}"/>
+            <j:set var="mapping" value="${jdo.tck.mapping}"/>
+            <expr value="${uniqueMappings.add(mapping)}"/>
+        </j:forEach>
+
+        <j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
+            <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+                <j:forEach var="nextMapping"
+                           items="${uniqueMappings.iterator()}">
+                    <attainGoal name="doInstallSchema"/>
+                </j:forEach>
+            </j:forEach>
+        </j:forEach>
+    </goal>
+
+    <goal name="doInstallSchema">
+        <!-- Set schema name from mapping designator -->
+        <j:choose>
+            <j:when test="${nextMapping == zeroval}">
+                <j:set var="jdo.tck.schema" value="schema.sql"/>
+            </j:when>
+            <j:otherwise>
+                <j:set var="jdo.tck.schema" value="schema${nextMapping}.sql"/>
+            </j:otherwise>
+        </j:choose>
+
+        <mkdir dir="${jdo.tck.testdir}/database/${jdo.tck.database}"/>
+        <copy todir="${jdo.tck.testdir}/database/${jdo.tck.database}">
+            <fileset dir="${basedir}/test/conf">
+               <include name="${jdo.tck.database}.properties"/>
+            </fileset>
+        </copy>
+
+        <echo>Install schema: ${jdo.tck.schema}
+              for db ${jdo.tck.database} id ${jdo.tck.identitytype}</echo>
+        <!-- todo: abstract the command line below for other databases -->
+        <java classname="org.apache.derby.tools.ij" fork="true">
+              <classpath>
+                  <pathelement location="${derbytools.jarfile}"/>
+                  <pathelement location="${derby.jarfile}"/>
+              </classpath>
+              <arg value="${basedir}/test/sql/${jdo.tck.database}/${jdo.tck.identitytype}/${jdo.tck.schema}"/>
+              <sysproperty key="derby.system.home"
+                      value="${jdo.tck.testdir}/database/${jdo.tck.database}"/>
         </java>
     </goal>
 
-    <!-- Run a single tck test. The property testcase defines the name of -->
-    <!-- the tck test class w/o the prefix org.apache.jdo.tck, e.g.       --> 
-    <!--   maven -Dtest=api.jdohelper.GetObjectId runtck.single       -->
-    <goal name="runtck.jdorisingle" prereqs="java:compile, jdorienhance, copyprops">
-        <echo>Run TCK test org.apache.jdo.tck.${test} on the RI with configuration ${jdo.tck.configuration}</echo>
-        <java fork="yes" dir="${jdo.tck.testdir}"
-              classname="org.apache.jdo.tck.${test}">
-            <classpath refid="jdori.class.path"/>
-            <sysproperty key="ResultPrinterClass" value="${jdo.tck.resultprinterclass}"/>
-            <sysproperty key="verbose" value="${verbose}"/>
-            <sysproperty key="PMFProperties" value="${basedir}/test/conf/jdori.properties"/>
-            <sysproperty key="PMF2Properties" value="${basedir}/test/conf/jdori.properties"/>
-            <jvmarg line="${database.runtck.sysproperties}"/>
-            <arg line="${jdo.tck.alltests}"/>
-        </java>
+    <!-- ================== -->
+    <!-- Run test cases     -->
+    <!-- ================== -->
+
+    <goal name="runtck.iut" prereqs="setProps">
+        <attainGoal name="privateRuntck.iut"/>
     </goal>
-    
-    <!-- ================ -->
-    <!-- Debug            -->
-    <!-- ================ -->
-    
-    <goal name="debug.runtck" prereqs="java:compile, enhance, testrunner.set, database, copyprops">
-        <echo>Debug JDO TCK on the IUT with configuration ${jdo.tck.configuration}</echo>
-        <ant:nbjpdastart name="runtck" addressproperty="jpda.address" transport="dt_socket"/>
-        <java fork="yes" dir="${jdo.tck.testdir}" 
+
+    <goal name="privateRuntck.iut"
+          prereqs="java:compile, testrunner.set, copyprops, doEnhance.iut, package.iut">
+        <!-- Run tests for all databases, identity types, and configurations -->
+        <echo>Run all configurations on iut</echo>
+        <j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
+            <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+                <j:forEach var="jdo.tck.cfg" items="${jdo.tck.cfglist}">
+                    <!-- get jdo.tck.classes (list of testclasses),
+                         jdo.tck.testdata, jdo.tck.mapping -->
+                    <u:properties file="${basedir}/test/conf/${jdo.tck.cfg}"/>
+                    <j:new var="schemaname" className="java.lang.String"/>
+                    <j:set var="id" value="${jdo.tck.identitytype}"/>
+                    <j:set var="mapping" value="${jdo.tck.mapping}"/>
+                    <j:set var="schemaname">
+                        <j:expr value="${schemaname.concat(id)}"/>
+                        <j:expr value="${schemaname.concat(mapping)}"/>
+                    </j:set>
+                    <attainGoal name="doRuntck.iut"/>
+                </j:forEach>
+            </j:forEach>
+        </j:forEach>
+    </goal>
+
+    <goal name="runtck.jdori" prereqs="setProps">
+        <attainGoal name="privateRuntck.jdori"/>
+    </goal>
+
+    <goal name="privateRuntck.jdori"
+          prereqs="java:compile, testrunner.set, copyprops, doEnhance.jdori, package.jdori">
+        <!-- Run tests for all databases, identity types, and configurations -->
+        <echo>Run all configurations on jdori</echo>
+        <j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
+            <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+                <j:forEach var="jdo.tck.cfg" items="${jdo.tck.cfglist}">
+                    <u:properties file="${basedir}/test/conf/${jdo.tck.cfg}"/>
+                    <j:new var="schemaname" className="java.lang.String"/>
+                    <j:set var="id" value="${jdo.tck.identitytype}"/>
+                    <j:set var="mapping" value="${jdo.tck.mapping}"/>
+                    <j:set var="schemaname">
+                        <j:expr value="${schemaname.concat(id)}"/>
+                        <j:expr value="${schemaname.concat(mapping)}"/>
+                    </j:set>
+                    <attainGoal name="doRuntck.jdori"/>
+                </j:forEach>
+            </j:forEach>
+        </j:forEach>
+    </goal>
+
+    <goal name="doRuntck.iut">
+        <echo>Run JDO TCK on the IUT with configuration ${jdo.tck.configuration}</echo>
+        <path id="this.project.class.path">
+            <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
+            <path refid="project.class.path"/>
+        </path>
+        <j:set var="jdo.tck.testrunnerclass"
+             value="org.apache.jdo.tck.util.BatchTestRunner"/>
+        <java fork="yes" dir="${jdo.tck.testdir}"
               classname="${jdo.tck.testrunnerclass}">
-            <classpath refid="project.class.path"/>
-            <sysproperty key="ResultPrinterClass" value="${jdo.tck.resultprinterclass}"/>
+            <classpath refid="this.project.class.path"/>
+            <sysproperty key="ResultPrinterClass"
+                         value="${jdo.tck.resultprinterclass}"/>
             <sysproperty key="verbose" value="${verbose}"/>
             <sysproperty key="PMFProperties" value="${iut.runtck.properties}"/>
             <sysproperty key="PMF2Properties" value="${iut.runtck.properties}"/>
+            <sysproperty key="jdo.tck.testdata" value="${jdo.tck.testdata}"/>
+            <sysproperty key="jdo.tck.standarddata"
+                         value="${jdo.tck.standarddata}"/>
+            <sysproperty key="jdo.tck.description"
+                         value="${jdo.tck.description}"/>
+            <sysproperty key="jdo.tck.identitytype"
+                         value="${jdo.tck.identitytype}"/>
+            <sysproperty key="jdo.tck.database"
+                         value="${jdo.tck.database}"/>
+            <sysproperty key="jdo.tck.cfg"
+                         value="${jdo.tck.cfg}"/>
+            <sysproperty key="jdo.tck.excludelist"
+                         value="${jdo.tck.excludelist}"/>
+            <sysproperty key="javax.jdo.option.Mapping"
+                         value="${jdo.tck.mapping}"/>
+            <sysproperty key="org.jpox.identifier.defaultSchemaName"
+                         value="${schemaname}"/>
+            <jvmarg line="${iut.runtck.sysproperties}"/>
             <jvmarg line="${iut.runtck.sysproperties}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-            <arg line="${jdo.tck.testclasses}"/>
+            <arg line="${jdo.tck.classes}"/>
         </java>
     </goal>
-    
-    <!-- ================ -->
-    <!-- Enhancer support -->
-    <!-- ================ -->
 
-    <goal name="enhance">
-        <attainGoal name="enhance.applicationidentity"/> 
-        <attainGoal name="enhance.datastoreidentity"/>
+    <goal name="doRuntck.jdori">
+        <path id="this.jdori.class.path">
+            <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
+            <path refid="jdori.class.path"/>
+        </path>
+        <j:set var="jdo.tck.testrunnerclass"
+               value="org.apache.jdo.tck.util.BatchTestRunner"/>
+        <java fork="yes" dir="${jdo.tck.testdir}"
+               classname="${jdo.tck.testrunnerclass}">
+            <classpath refid="this.jdori.class.path"/>
+            <sysproperty key="ResultPrinterClass"
+                         value="${jdo.tck.resultprinterclass}"/>
+            <sysproperty key="verbose" value="${verbose}"/>
+            <sysproperty key="PMFProperties"
+                         value="${basedir}/test/conf/jdori.properties"/>
+            <sysproperty key="PMF2Properties"
+                         value="${basedir}/test/conf/jdori.properties"/>
+            <sysproperty key="jdo.tck.testdata" value="${jdo.tck.testdata}"/>
+            <sysproperty key="jdo.tck.standarddata"
+                         value="${jdo.tck.standarddata}"/>
+            <sysproperty key="jdo.tck.description"
+                         value="${jdo.tck.description}"/>
+            <sysproperty key="jdo.tck.identitytype"
+                         value="${jdo.tck.identitytype}"/>
+            <sysproperty key="jdo.tck.database"
+                         value="${jdo.tck.database}"/>
+            <sysproperty key="jdo.tck.cfg"
+                         value="${jdo.tck.cfg}"/>
+            <sysproperty key="jdo.tck.excludelist"
+                         value="${jdo.tck.excludelist}"/>
+            <sysproperty key="javax.jdo.option.Mapping"
+                         value="${jdo.tck.Mapping}"/>
+            <sysproperty key="org.jpox.identifier.defaultSchemaName"
+                         value="${schemaname}"/>
+            <jvmarg line="${database.runtck.sysproperties}"/>
+            <jvmarg line="${jdo.runtck.sysproperties}"/>
+            <arg line="${jdo.tck.classes}"/>
+        </java>
     </goal>
 
-    <preGoal name="enhance.applicationidentity">
-        <condition property="enhancement.required">
-            <and>
-                <istrue value="${iut.applicationidentity.supported}"/>
-                <not>
-                    <uptodate targetfile="${iut.enhanced.dir}/applicationidentity.jar">
-                        <srcfiles dir="${basedir}/test/jdo/applicationidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.jdo, 
-                                            org/apache/jdo/tck/pc/**/jdoTest.properties"/>
-                        <srcfiles dir="${basedir}/test/orm/applicationidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.orm"/>
-                        <srcfiles dir="${basedir}/test/testdata/applicationidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.xml"/>
-                        <srcfiles dir="${basedir}/test/java"
-                                  includes="${jdo.tck.pcclasses.sources}
-                                            ${jdo.tck.paclasses.sources}"/>
-                    </uptodate>
-                </not>
-           </and>
-        </condition>
-    </preGoal>
+    <!-- ================== -->
+    <!-- Enhance PC classes -->
+    <!-- ================== -->
+
+    <goal name="enhance.jdori" prereqs="setProps">
+        <attainGoal name="doEnhance.jdori"/>
+    </goal>
 
-    <goal name="enhance.applicationidentity">
-        <j:if test="${enhancement.required}">
-            <j:set var="identitytype" value="applicationidentity"/>
-            <attainGoal name="enhance.run"/>
-        </j:if>
+    <goal name="enhance.iut" prereqs="setProps">
+        <attainGoal name="doEnhance.iut"/>
     </goal>
 
-    <preGoal name="enhance.datastoreidentity">
+    <goal name="enhance.check">
         <condition property="enhancement.required">
-            <and>
-                <istrue value="${iut.datastoreidentity.supported}"/>
-                <not>
-                    <uptodate targetfile="${iut.enhanced.dir}/datastoreidentity.jar">
-                        <srcfiles dir="${basedir}/test/jdo/datastoreidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.jdo, 
-                                            org/apache/jdo/tck/pc/**/jdoTest.properties"/>
-                        <srcfiles dir="${basedir}/test/orm/datastoreidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.orm"/>
-                        <srcfiles dir="${basedir}/test/testdata/datastoreidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.xml"/>
-                        <srcfiles dir="${basedir}/test/java"
-                                  includes="${jdo.tck.pcclasses.sources}
-                                            ${jdo.tck.paclasses.sources}"/>
-                    </uptodate>
-                </not>
-           </and>
+            <not>
+                <uptodate targetfile="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar">
+                    <srcfiles dir="${basedir}/test/jdo/${jdo.tck.identitytype}"
+                          includes="org/apache/jdo/tck/pc/**/*.jdo, 
+                                    org/apache/jdo/tck/pc/**/jdoTest.properties"/>
+                    <srcfiles dir="${basedir}/test/java"
+                          includes="${jdo.tck.pcclasses.sources},
+                                    ${jdo.tck.paclasses.sources}"/>
+                </uptodate>
+            </not>
         </condition>
-    </preGoal>
-
-    <goal name="enhance.datastoreidentity">
-        <j:if test="${enhancement.required}">
-            <j:set var="identitytype" value="datastoreidentity"/>
-            <attainGoal name="enhance.run"/>
-        </j:if>
     </goal>
 
-    <preGoal name="enhance.run">
+    <goal name="enhance.prepare">
         <!-- copy metadata -->
-        <copy todir="${iut.enhanced.dir}">
-            <fileset dir="${basedir}/test/jdo/${identitytype}"
+        <mkdir dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}" />
+        <copy todir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}">
+            <fileset dir="${basedir}/test/jdo/${jdo.tck.identitytype}"
                      includes="**/*.jdo, **/jdoTest.properties"/>
-            <fileset dir="${basedir}/test/orm/${identitytype}"
-                     includes="**/*.orm"/>
-            <fileset dir="${basedir}/test/testdata/${identitytype}"
-                     includes="**/*.xml"/>
         </copy>
         <!-- compile pc and pa classes -->
         <javac srcdir="${basedir}/test/java"
            includes="${jdo.tck.pcclasses.sources} ${jdo.tck.paclasses.sources}"
-           destdir="${iut.enhanced.dir}"
+           destdir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"
            debug="on"
            classpathref="project.class.path">
         </javac>
-    </preGoal>
+        <!-- classpath -->
+        <path id="this.enhance.class.path">
+            <path refid="enhance.class.path"/>
+            <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"/>
+        </path>
 
-    <goal name="enhance.run">
-        <echo>Run IUT enhancer</echo>
-        <java fork="yes" failonerror="yes" 
-              dir="${iut.enhanced.dir}"
-              classname="${iut.enhancer.main}"
-              classpathref="enhance.class.path">
-             <jvmarg line="${iut.enhancer.sysproperties}"/>
-             <arg line="${iut.enhancer.options}"/>
-             <arg line="${iut.enhancer.args}"/>
-        </java>
     </goal>
 
-    <postGoal name="enhance.run">
-        <delete file="${iut.enhanced.dir}/${identitytype}.jar"/>
-        <jar jarfile="${iut.enhanced.dir}/${identitytype}.jar">
-            <fileset dir="${iut.enhanced.dir}" 
-                 includes="**/*.class, **/*.jdo, **/*.orm, **/*.xml, **/jdoTest.properties"/>
-        </jar>
-        <delete dir="${iut.enhanced.dir}/org"/>
-    </postGoal>
-
-    <goal name="jdorienhance">
-        <attainGoal name="jdorienhance.applicationidentity"/> 
-        <attainGoal name="jdorienhance.datastoreidentity"/>
+    <goal name="doEnhance.iut">
+        <j:set var="jdo.tck.enhanced.dir" value="${iut.enhanced.dir}"/>
+        <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+            <attainGoal name="enhance.check"/>
+            <j:if test="${enhancement.required}">
+                <attainGoal name="enhance.prepare"/>
+                <j:set var="iut.enhanced.dir"
+                       value="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"/>
+                <echo>Run IUT enhancer for ${jdo.tck.identitytype}</echo>
+                <java fork="yes" failonerror="yes" 
+                      dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"
+                      classname="${iut.enhancer.main}"
+                      classpathref="this.enhance.class.path">
+                     <jvmarg line="${iut.enhancer.sysproperties}"/>
+                     <arg line="${iut.enhancer.options}"/>
+                     <arg line="${iut.enhancer.args}"/>
+                </java>
+            </j:if>
+            <attainGoal name="package.iut"/>
+        </j:forEach>
+    </goal>
+
+    <goal name="doEnhance.jdori">
+        <j:set var="jdo.tck.enhanced.dir" value="${jdo.enhanced.dir}"/>
+        <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+            <attainGoal name="enhance.check"/>
+            <j:if test="${enhancement.required}">
+                <echo>Run JDORI enhancer for ${jdo.tck.identitytype}</echo>
+                <attainGoal name="enhance.prepare"/>
+                <j:set var="jdo.enhanced.dir"
+                       value="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"/>
+                <java fork="yes" failonerror="yes" 
+                      dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"
+                      classname="${jdo.enhancer.main}"
+                      classpathref="this.enhance.class.path">
+                     <jvmarg line="${jdo.enhancer.sysproperties}"/>
+                     <arg line="${jdo.enhancer.options}"/>
+                     <arg line="${jdo.enhancer.args}"/>
+                </java>
+            </j:if>
+            <attainGoal name="package.jdori"/>
+        </j:forEach>
     </goal>
 
-    <preGoal name="jdorienhance.applicationidentity">
-        <condition property="jdorienhancement.required">
-            <not>
-                <uptodate targetfile="${jdo.enhanced.dir}/applicationidentity.jar">
-                    <srcfiles dir="${basedir}/test/jdo/applicationidentity"
-                              includes="org/apache/jdo/tck/pc/**/*.jdo, 
-                                        org/apache/jdo/tck/pc/**/jdoTest.properties"/>
-                    <srcfiles dir="${basedir}/test/orm/applicationidentity"
-                              includes="org/apache/jdo/tck/pc/**/*.orm"/>
-                        <srcfiles dir="${basedir}/test/testdata/applicationidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.xml"/>
-                    <srcfiles dir="${basedir}/test/java"
-                              includes="${jdo.tck.pcclasses.sources}
-                                        ${jdo.tck.paclasses.sources}"/>
-                </uptodate>
-            </not>
-        </condition>
-    </preGoal>
+    <!-- ========= -->
+    <!-- Package   -->
+    <!-- ========= -->
 
-    <goal name="jdorienhance.applicationidentity">
-        <j:if test="${jdorienhancement.required}">
-            <j:set var="identitytype" value="applicationidentity"/>
-            <attainGoal name="jdorienhance.run"/>
-        </j:if>
+    <goal name="package.iut">
+        <attainGoal name="package"/>
     </goal>
 
-    <preGoal name="jdorienhance.datastoreidentity">
-        <condition property="jdorienhancement.required">
-            <not>
-                <uptodate targetfile="${jdo.enhanced.dir}/datastoreidentity.jar">
-                    <srcfiles dir="${basedir}/test/jdo/datastoreidentity"
-                              includes="org/apache/jdo/tck/pc/**/*.jdo, 
-                                        org/apache/jdo/tck/pc/**/jdoTest.properties"/>
-                        <srcfiles dir="${basedir}/test/orm/datastoreidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.orm"/>
-                        <srcfiles dir="${basedir}/test/testdata/datastoreidentity"
-                                  includes="org/apache/jdo/tck/pc/**/*.xml"/>
-                    <srcfiles dir="${basedir}/test/java"
-                              includes="${jdo.tck.pcclasses.sources}
-                                        ${jdo.tck.paclasses.sources}"/>
-                </uptodate>
-            </not>
-        </condition>
-    </preGoal>
-
-    <goal name="jdorienhance.datastoreidentity">
-        <j:if test="${jdorienhancement.required}">
-            <j:set var="identitytype" value="datastoreidentity"/>
-            <attainGoal name="jdorienhance.run"/>
-        </j:if>
+    <goal name="package.jdori">
+        <attainGoal name="package"/>
     </goal>
 
-    <preGoal name="jdorienhance.run">
-        <mkdir dir="${jdo.enhanced.dir}" />
-        <!-- copy metadata -->
-        <copy todir="${jdo.enhanced.dir}">
-            <fileset dir="${basedir}/test/jdo/${identitytype}"
-                     includes="**/*.jdo, **/jdoTest.properties"/>
-            <fileset dir="${basedir}/test/orm/${identitytype}"
+    <goal name="package">
+        <copy todir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}">
+            <fileset dir="${basedir}/test/orm/${jdo.tck.identitytype}"
                      includes="**/*.orm"/>
-            <fileset dir="${basedir}/test/testdata/${identitytype}"
+            <fileset dir="${basedir}/test/testdata"
                      includes="**/*.xml"/>
         </copy>
-        <!-- compile pc and pa classes -->
-        <javac srcdir="${basedir}/test/java"
-           includes="${jdo.tck.pcclasses.sources} ${jdo.tck.paclasses.sources}"
-           destdir="${jdo.enhanced.dir}"
-           debug="on"
-           classpathref="project.class.path">
-        </javac>
-    </preGoal>
-
-    <goal name="jdorienhance.run">
-        <echo>Run JDORI enhancer</echo>
-        <java fork="yes" failonerror="yes" 
-              dir="${jdo.enhanced.dir}"
-              classname="${jdo.enhancer.main}"
-              classpathref="enhance.class.path">
-             <jvmarg line="${jdo.enhancer.sysproperties}"/>
-             <arg line="${jdo.enhancer.options}"/>
-             <arg line="${jdo.enhancer.args}"/>
-        </java>
-    </goal>
-
-    <postGoal name="jdorienhance.run">
-        <delete file="${jdo.enhanced.dir}/${identitytype}.jar"/>
-        <jar jarfile="${jdo.enhanced.dir}/${identitytype}.jar">
-            <fileset dir="${jdo.enhanced.dir}" 
+        <delete file="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
+        <jar jarfile="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar">
+            <fileset dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}" 
                  includes="**/*.class, **/*.jdo, **/*.orm, **/*.xml, **/jdoTest.properties"/>
         </jar>
-        <delete dir="${jdo.enhanced.dir}/org"/>
-    </postGoal>
+    </goal>
 
     <!-- ========= -->
     <!-- Classpath -->
     <!-- ========= -->
 
     <ant:property file="${basedir}/test/conf/alltests.list"/>
-    <ant:property file="${jdo.tck.configuration}"/>
 
     <path id="test_iut_jars" >
         <fileset dir="iut_jars" includes="*.jar"/>
@@ -355,9 +410,10 @@
     added bcel.jarfile, log4j.jarfile(for jpox enhancer) -->
     <path id="project.class.path">
         <!-- Directory where enhanced class files are located  -->
-        <pathelement location="${iut.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
+        <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}/${jdo.tck.identitytype}.jar"/>
         <!-- Directory where JDOTCK class files are located  -->
-        <pathelement location="${jdo.tck.testclasses.dir}"/>
+        <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"/>
+        <!-- <pathelement location="${jdo.tck.testclasses.dir}"/> -->
         <!-- JDO jar file  -->
         <pathelement location="${jdo.jdoapi.jarfile}"/>
         <!-- Jar files for the implementation to be tested -->
@@ -378,7 +434,7 @@
     </path>
 
     <!-- Paths needed for enhancement.  Must not include
-        "${iut.enhanced.dir}/${jdo.tck.identitytype}.jar"  -->
+        "${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"  -->
     <path id="enhance.class.path">
         <!-- Directory where JDOTCK class files are located  -->
         <pathelement location="${jdo.tck.testclasses.dir}"/>
@@ -398,8 +454,6 @@
     </path>
 
     <path id="jdori.class.path">
-        <!-- Directory where jdori enhanced class files are located  -->
-        <pathelement location="${jdo.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
         <!-- Directory where JDOTCK class files are located  -->
         <pathelement location="${jdo.tck.testclasses.dir}"/>
         <!-- JDO jar file  -->
@@ -431,26 +485,8 @@
     <!-- Misc -->
     <!-- ==== -->
 
-    <goal name="database">
-<!--        <delete dir="${jdo.tck.testdir}/database/${jdo.tck.database}"/> -->
-        <mkdir dir="${jdo.tck.testdir}/database/${jdo.tck.database}"/>
-        <copy todir="${jdo.tck.testdir}/database/${jdo.tck.database}">
-            <fileset dir="${basedir}/test/conf">
-               <include name="derby.properties"/>
-            </fileset>
-        </copy>
-        <java classname="org.apache.derby.tools.ij" fork="true">
-              <classpath>
-                  <pathelement location="${derbytools.jarfile}"/>
-                  <pathelement location="${derby.jarfile}"/>
-              </classpath>
-              <arg value="${basedir}/test/sql/${jdo.tck.database}/${jdo.tck.schema}"/>
-              <sysproperty key="derby.system.home"
-                           value="${jdo.tck.testdir}/database/${jdo.tck.database}"/>
-        </java>
-    </goal>
-
     <goal name="testrunner.set">
+       <echo>testrunner.set:</echo>
        <condition property="jdo.tck.testrunnerclass" 
                   value="org.apache.jdo.tck.util.SwingTestRunner">
            <istrue value="${gui}"/>
@@ -462,6 +498,7 @@
     </goal>
 
     <goal name="copyprops">
+       <echo>copyprops:</echo>
         <copy todir="${jdo.tck.testclasses.dir}" >
             <fileset dir="${basedir}/test/conf">
                <include name="commons-logging.properties"/>

Modified: incubator/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?rev=193203&r1=193202&r2=193203&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Thu Jun 23 12:16:32 2005
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and 
 # limitations under the License.
 
+# exclude list - tests listed here will not be executed
+jdo.tck.excludelist = ${basedir}/test/conf/exclude.list
+
 # iut properties file
 iut.runtck.properties = ${basedir}/test/conf/jdori.properties
 iut.runtck.sysproperties = -Dderby.system.home=${jdo.tck.testdir}/database/${jdo.tck.database} -Dlog4j.configuration=file:${basedir}/test/conf/logging.properties
@@ -22,14 +25,13 @@
 iut.datastoreidentity.supported = yes
 
 # The IUT enhancer, defaults to JPOX enhancer
-iut.enhanced.dir = ${maven.build.dir}/enhanced
+iut.enhanced.dir = ${maven.build.dir}/enhanced/iut
 iut.enhancer.main = ${jdo.enhancer.main}
 iut.enhancer.options = -v -d "${iut.enhanced.dir}"
 iut.enhancer.args = ${jdo.tck.jdometadata.files}
-iut.enhancer.sysproperties = 
-jdo.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${log4j.jarfile}
-jdo.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
-jdo.enhancer.sysproperties = -Dlog4j.configuration=file:${basedir}/test/conf/logging.properties
+iut.enhancer.sysproperties = -Dlog4j.configuration=file:${basedir}/test/conf/logging.properties
+iut.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${log4j.jarfile}
+iut.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}${path.separator}${jdo.tck.testclasses.dir}
 
 # JUnit settings
 # Start new JVM for junit tests
@@ -39,14 +41,13 @@
 PMFProperties = ${basedir}/test/conf/jdori.properties
 
 # JDO TCK settings
-#jdo.tck.configuration = ${basedir}/test/conf/datastoreidentity.conf
-jdo.tck.configuration = ${basedir}/test/conf/applicationidentity.conf
+jdo.tck.dblist=derby
+jdo.tck.identitytypes=applicationidentity datastoreidentity
 jdo.tck.testclasses.dir = ${maven.build.dir}/classes
 jdo.tck.testdir = ${maven.build.dir}
 jdo.tck.resultprinterclass = org.apache.jdo.tck.util.BatchResultPrinter
 database.runtck.sysproperties = -Dderby.system.home=${jdo.tck.testdir}/database/${jdo.tck.database} -Dlog4j.configuration=file:${basedir}/test/conf/logging.properties
 jdo.runtck.sysproperties = -Xmx512m
-jdo.tck.database=derby
 
 # dependencies
 jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-api')}
@@ -63,13 +64,6 @@
 core20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
 enhancer20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-enhancer')}
 xmlparser =
-# connection pooling dependencies
-jpox.dbcp.jarfile = ${pom.getDependencyPath('jpox:jpox-dbcp')}
-jpox.c3p0.jarfile = ${pom.getDependencyPath('jpox:jpox-c3p0')}
-c3p0.jarfile = ${pom.getDependencyPath('c3p0')}
-dbcp.jarfile = ${pom.getDependencyPath('commons-dbcp')}
-pool.jarfile = ${pom.getDependencyPath('commons-pool')}
-collections.jarfile = ${pom.getDependencyPath('commons-collections')}
 
 # JDORI enhancer
 jdo.enhanced.dir = ${maven.build.dir}/enhanced/jdori
@@ -78,6 +72,14 @@
 jdo.enhancer.args = ${jdo.tck.jdometadata.files}
 jdo.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${log4j.jarfile}
 jdo.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}${path.separator}${jdo.tck.testclasses.dir}
+
+# connection pooling dependencies
+jpox.dbcp.jarfile = ${pom.getDependencyPath('jpox:jpox-dbcp')}
+jpox.c3p0.jarfile = ${pom.getDependencyPath('jpox:jpox-c3p0')}
+c3p0.jarfile = ${pom.getDependencyPath('c3p0')}
+dbcp.jarfile = ${pom.getDependencyPath('commons-dbcp')}
+pool.jarfile = ${pom.getDependencyPath('commons-pool')}
+collections.jarfile = ${pom.getDependencyPath('commons-collections')}
 
 jdo.tck.pcclasses.sources = \
     org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java \

Added: incubator/jdo/trunk/tck20/test/conf/alltests.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/alltests.conf?rev=193203&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/alltests.conf (added)
+++ incubator/jdo/trunk/tck20/test/conf/alltests.conf Thu Jun 23 12:16:32 2005
@@ -0,0 +1,348 @@
+jdo.tck.description = All standard tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.classes = \
+org.apache.jdo.tck.api.instancecallbacks.AccessOtherInstancesInPrestore \
+org.apache.jdo.tck.api.instancecallbacks.AccessingFieldsInPredelete \
+org.apache.jdo.tck.api.instancecallbacks.CallingJdoPostload \
+org.apache.jdo.tck.api.instancecallbacks.CallingJdoPreclear \
+org.apache.jdo.tck.api.instancecallbacks.CallingJdoPredelete \
+org.apache.jdo.tck.api.instancecallbacks.CallingJdoPrestore \
+org.apache.jdo.tck.api.instancecallbacks.ModificationOfNontransactionalNonpersistentFields \
+org.apache.jdo.tck.api.instancecallbacks.NoAccessToFieldsAfterPredelete \
+org.apache.jdo.tck.api.jdohelper.GetObjectId \
+org.apache.jdo.tck.api.jdohelper.GetObjectIdForNull \
+org.apache.jdo.tck.api.jdohelper.GetObjectIdForTransient \
+org.apache.jdo.tck.api.jdohelper.GetObjectIdNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.GetPersistenceManager \
+org.apache.jdo.tck.api.jdohelper.GetPersistenceManagerForNull \
+org.apache.jdo.tck.api.jdohelper.GetPersistenceManagerForTransient \
+org.apache.jdo.tck.api.jdohelper.GetPersistenceManagerNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.GetTransactionalObjectId \
+org.apache.jdo.tck.api.jdohelper.GetTransactionalObjectIdForNull \
+org.apache.jdo.tck.api.jdohelper.GetTransactionalObjectIdForTransient \
+org.apache.jdo.tck.api.jdohelper.GetTransactionalObjectIdNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsDeleted \
+org.apache.jdo.tck.api.jdohelper.IsDeletedFalse \
+org.apache.jdo.tck.api.jdohelper.IsDeletedForNull \
+org.apache.jdo.tck.api.jdohelper.IsDeletedForTransient \
+org.apache.jdo.tck.api.jdohelper.IsDeletedNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsDirty \
+org.apache.jdo.tck.api.jdohelper.IsDirtyFalse \
+org.apache.jdo.tck.api.jdohelper.IsDirtyForNull \
+org.apache.jdo.tck.api.jdohelper.IsDirtyForTransient \
+org.apache.jdo.tck.api.jdohelper.IsDirtyNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsNew \
+org.apache.jdo.tck.api.jdohelper.IsNewFalse \
+org.apache.jdo.tck.api.jdohelper.IsNewForNull \
+org.apache.jdo.tck.api.jdohelper.IsNewForTransient \
+org.apache.jdo.tck.api.jdohelper.IsNewNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsPersistent \
+org.apache.jdo.tck.api.jdohelper.IsPersistentFalse \
+org.apache.jdo.tck.api.jdohelper.IsPersistentForNull \
+org.apache.jdo.tck.api.jdohelper.IsPersistentForTransient \
+org.apache.jdo.tck.api.jdohelper.IsPersistentNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsTransactional \
+org.apache.jdo.tck.api.jdohelper.IsTransactionalFalse \
+org.apache.jdo.tck.api.jdohelper.IsTransactionalForNull \
+org.apache.jdo.tck.api.jdohelper.IsTransactionalForTransient \
+org.apache.jdo.tck.api.jdohelper.IsTransactionalNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.MakeDirty \
+org.apache.jdo.tck.api.jdohelper.MakeDirtyForNull \
+org.apache.jdo.tck.api.jdohelper.MakeDirtyForTransient \
+org.apache.jdo.tck.api.jdohelper.MakeDirtyNotPersistenceCapable \
+org.apache.jdo.tck.api.persistencemanager.close.AfterCloseAllMethodsThrowException \
+org.apache.jdo.tck.api.persistencemanager.cache.CallingEvictAllWithCollectionContainingNulls \
+org.apache.jdo.tck.api.persistencemanager.cache.CallingRefreshAllWithCollectionContainingNulls \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithNoParameters \
+org.apache.jdo.tck.api.persistencemanager.ChangingObjectIdHasNoEffectOnInstance \
+org.apache.jdo.tck.api.persistencemanager.close.CloseThrowsExceptionWhenActiveTx \
+org.apache.jdo.tck.api.persistencemanager.ConcurrentPersistenceManagers \
+org.apache.jdo.tck.api.persistencemanager.ConcurrentPersistenceManagersSameClasses \
+org.apache.jdo.tck.api.persistencemanager.CurrentTransaction \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistent \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistentAllFails \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistentFailsIfInstanceIsTransient \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistentHasNoEffectOnDeletedInstances \
+org.apache.jdo.tck.api.persistencemanager.cache.EvictAllWithNoParameters \
+org.apache.jdo.tck.api.persistencemanager.cache.EvictingCollectionOfInstancesSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.EvictingWithRestoreValuesFalse \
+org.apache.jdo.tck.api.persistencemanager.cache.EvictingWithRetainValuesFalse \
+org.apache.jdo.tck.api.persistencemanager.extent.GetExtentWithInstancesMadePersistentViaReachability \
+org.apache.jdo.tck.api.persistencemanager.extent.GetExtentWithNoSubclasses \
+org.apache.jdo.tck.api.persistencemanager.extent.GetExtentWithSubclasses \
+org.apache.jdo.tck.api.persistencemanager.flags.GetIgnoreCache \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectById \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceInCache \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceInCacheNoStateChange \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceNotInCache \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceNotInCacheNoTx \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceNotInDatastore \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNotResolved \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdWithValidationInstanceInCache \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdWithValidationInstanceInCacheNotInDatastore \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectId \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectIdClass \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectIdClassForAbstractOrNonPersistenceCapableClass \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectIdForNullOrNotPersistent \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectIdWithApplicationModifyingIdentity \
+org.apache.jdo.tck.api.persistencemanager.GetPersistenceManagerFactory \
+org.apache.jdo.tck.api.persistencemanager.GetSetUserObject \
+org.apache.jdo.tck.api.persistencemanager.GetTransactionalObjectIdWhenObjectIdBeingChanged \
+org.apache.jdo.tck.api.persistencemanager.GetTransactionalObjectIdWithNoTransaction \
+org.apache.jdo.tck.api.persistencemanager.close.IsClosedIsFalseUponConstruction \
+org.apache.jdo.tck.api.persistencemanager.close.IsClosedIsFalseUponRetrievalFromPool \
+org.apache.jdo.tck.api.persistencemanager.close.IsClosedIsTrueAfterClose \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalAllFails \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalDirtyInstance \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalIsImmediate \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalPersistentCleanInstance \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalTransientCleanInstance \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentAllFails \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentAndInstancesNotReachable \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentAssignsObjectId \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentFailsIfInstanceManagedByAnotherPersistenceManager \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentHasNoEffectOnPersistentInstances \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactional \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalANontransactionalPersistentInstance \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalAllFails \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalIsImmediate \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalPriorToTransactionRolledback \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalWithinTransactionRolledback \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransient \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientAllFails \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientCausesLossOfIdentity \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientFailsWithDirtyInstance \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientFieldsPreservedUnchanged \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientHasNoEffectOnTransientInstances \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientNotSubjectToRollback \
+org.apache.jdo.tck.api.persistencemanager.NoPersistenceManagerIfTransient \
+org.apache.jdo.tck.api.persistencemanager.ObjectIdUniqueAmongInstances \
+org.apache.jdo.tck.api.persistencemanager.OneInstanceOfObjectPerPersistenceManager \
+org.apache.jdo.tck.api.persistencemanager.OnePersistenceManagerIfPersistentOrTransactional \
+org.apache.jdo.tck.api.persistencemanager.OptimisticFailure \
+org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToEvictAllThrowsException \
+org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToEvictHasNoEffect \
+org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToRefreshAllThrowsException \
+org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToRefreshHasNoEffect \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllNoParameterSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithArraySideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithCollectionSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.Retrieve \
+org.apache.jdo.tck.api.persistencemanager.SameTransactionInstanceForAllCallsToCurrentTransaction \
+org.apache.jdo.tck.api.persistencemanager.flags.SetIgnoreCacheToFalse \
+org.apache.jdo.tck.api.persistencemanager.flags.SetIgnoreCacheToTrue \
+org.apache.jdo.tck.api.persistencemanager.flags.SetMultithreadedFalse \
+org.apache.jdo.tck.api.persistencemanager.flags.SetMultithreadedTrue \
+org.apache.jdo.tck.api.persistencemanager.flags.SettingFlagsWithTransactionInstance \
+org.apache.jdo.tck.api.persistencemanager.ThreadSafe \
+org.apache.jdo.tck.api.persistencemanager.TransientTransactionalInstanceRetainsValuesAtCommit \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterCloseGetPMThrowsException \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterCloseSetMethodsThrowException \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterGetPersistenceManagerNoSetMethodsSucceed \
+org.apache.jdo.tck.api.persistencemanagerfactory.Close \
+org.apache.jdo.tck.api.persistencemanagerfactory.CloseFailsIfTransactionActive \
+org.apache.jdo.tck.api.persistencemanagerfactory.CloseWithoutPermissionThrowsSecurityException \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManager \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerFactoryByPropertiesInstance \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerForUser \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetProperties \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetConnectionPassword \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetConnectionURL \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetConnectionUserName \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetIgnoreCache \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetMultithreaded \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetNonTransactionalRead \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetNonTransactionalWrite \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetOptimistic \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetRetainValues \
+org.apache.jdo.tck.api.persistencemanagerfactory.SupportedOptions \
+org.apache.jdo.tck.extents.CloseAll \
+org.apache.jdo.tck.extents.CloseOfExtentIteratorIsIteratorSpecific \
+org.apache.jdo.tck.extents.GetCandidateClass \
+org.apache.jdo.tck.extents.GetPersistenceManager \
+org.apache.jdo.tck.extents.HasSubclassesFalse \
+org.apache.jdo.tck.extents.HasSubclassesTrue \
+org.apache.jdo.tck.extents.InstancesDeletedPriorToIterationNotReturned \
+org.apache.jdo.tck.extents.InstancesPersistedPriorToIterationReturned \
+org.apache.jdo.tck.extents.IteratorHasNextFalseAfterExtentClose \
+org.apache.jdo.tck.extents.IteratorMutatingMethods \
+org.apache.jdo.tck.extents.IteratorNextAfterExtentClose \
+org.apache.jdo.tck.extents.IteratorNextAfterExtentCloseAll \
+org.apache.jdo.tck.extents.Iterators \
+org.apache.jdo.tck.lifecycle.HollowInstanceMaintainsPK \
+org.apache.jdo.tck.lifecycle.MultiplePMsReturnInstancesRepresentingSamePC \
+org.apache.jdo.tck.lifecycle.ObjectIdNotModifiedWhenObjectIdInstanceModified \
+org.apache.jdo.tck.lifecycle.PMReturnsIdenticalInstancesForEqualObjIds \
+org.apache.jdo.tck.lifecycle.PMsCanSharePCClassesButNotPCInstances \
+org.apache.jdo.tck.lifecycle.StateTransitions \
+org.apache.jdo.tck.lifecycle.TransientTransactionalStateCommit \
+org.apache.jdo.tck.lifecycle.TransientTransactionalStateRollback \
+org.apache.jdo.tck.lifecycle.nontransactional.ModificationOfNontransactionalInstanceOutsideTransaction \
+org.apache.jdo.tck.mapping.CompletenessTest \
+org.apache.jdo.tck.models.embedded.SecondClassObjectsTrackTheirChanges  \
+org.apache.jdo.tck.models.fieldtypes.TestArrayCollections \
+org.apache.jdo.tck.models.fieldtypes.TestArrayListCollections \
+org.apache.jdo.tck.models.fieldtypes.TestCollectionCollections \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfBigDecimal \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfBigInteger \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfBoolean \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfByte \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfCharacter \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfDate \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfDouble \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfFloat \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfInteger \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfLocale \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfLong \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfObject \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitiveboolean \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivebyte \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivechar \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivedouble \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivefloat \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitiveint \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivelong \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitiveshort \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfShort \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfSimpleClass \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfSimpleInterface \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfString \
+org.apache.jdo.tck.models.fieldtypes.TestHashMapStringKeyCollections \
+org.apache.jdo.tck.models.fieldtypes.TestHashMapStringValueCollections \
+org.apache.jdo.tck.models.fieldtypes.TestHashSetCollections \
+org.apache.jdo.tck.models.fieldtypes.TestHashtableStringKeyCollections \
+org.apache.jdo.tck.models.fieldtypes.TestHashtableStringValueCollections \
+org.apache.jdo.tck.models.fieldtypes.TestLinkedListCollections \
+org.apache.jdo.tck.models.fieldtypes.TestListCollections \
+org.apache.jdo.tck.models.fieldtypes.TestMapStringKeyCollections \
+org.apache.jdo.tck.models.fieldtypes.TestMapStringValueCollections \
+org.apache.jdo.tck.models.fieldtypes.TestSetCollections \
+org.apache.jdo.tck.models.fieldtypes.TestTreeMapStringKeyCollections \
+org.apache.jdo.tck.models.fieldtypes.TestTreeMapStringValueCollections \
+org.apache.jdo.tck.models.fieldtypes.TestTreeSetCollections \
+org.apache.jdo.tck.models.fieldtypes.TestVectorCollections \
+org.apache.jdo.tck.models.inheritance.FieldWithSameNameInSuperclass \
+org.apache.jdo.tck.models.inheritance.NonPersistentFieldsAreNonPersistentInSubclasses \
+org.apache.jdo.tck.models.inheritance.NonpersistentSuperClass \
+org.apache.jdo.tck.models.inheritance.PersistenceCapableFlexibilityInInheritanceHierarchy \
+org.apache.jdo.tck.models.inheritance.PersistentFieldsArePersistentInSubClasses \
+org.apache.jdo.tck.models.inheritance.TransactionalFieldsAreTransactionalInSubclasses \
+org.apache.jdo.tck.query.AssignmentPrePostIncrementDecrementNotSupported \
+org.apache.jdo.tck.query.BoundParameterCheck \
+org.apache.jdo.tck.query.Cast \
+org.apache.jdo.tck.query.Close \
+org.apache.jdo.tck.query.CloseAll \
+org.apache.jdo.tck.query.ComparingCollectionFieldToNull \
+org.apache.jdo.tck.query.ComparingPersistentAndNonPersistentInstance \
+org.apache.jdo.tck.query.CompileQuery \
+org.apache.jdo.tck.query.DeclareImports \
+org.apache.jdo.tck.query.DeclareParameters \
+org.apache.jdo.tck.query.DeclareVariables \
+org.apache.jdo.tck.query.DenoteUniquenessInFilter \
+org.apache.jdo.tck.query.ExecuteQuery \
+org.apache.jdo.tck.query.ExecuteQueryWhenPersistenceManagerIsClosed \
+org.apache.jdo.tck.query.ExecuteQueryWithArray \
+org.apache.jdo.tck.query.ExecuteQueryWithMap \
+org.apache.jdo.tck.query.ExecutingMultipleQueriesSimultaneouslyIsThreadSafe \
+org.apache.jdo.tck.query.ExecutingQueryWhenNoTransactionNoNontransactionalRead \
+org.apache.jdo.tck.query.GetIgnoreCache \
+org.apache.jdo.tck.query.GetPersistenceManager \
+org.apache.jdo.tck.query.GetPersistenceManagerFromRestoredSerializedQuery \
+org.apache.jdo.tck.query.IgnoreCacheFalse \
+org.apache.jdo.tck.query.ImmutableQueryResult \
+org.apache.jdo.tck.query.MethodsAndObjectConstructionNotSupported \
+org.apache.jdo.tck.query.MultipleActiveQueryInstanceInSamePersistenceManager \
+org.apache.jdo.tck.query.MultipleIdenticalImports \
+org.apache.jdo.tck.query.NamespaceOfIdentifiers \
+org.apache.jdo.tck.query.NavigationThroughACollectionField \
+org.apache.jdo.tck.query.NavigationThroughANullValuedField \
+org.apache.jdo.tck.query.NavigationThroughReferencesUsesDotOperator \
+org.apache.jdo.tck.query.NewQueryFromExistingQueryBoundToPMFromSameVendor \
+org.apache.jdo.tck.query.NewQueryFromRestoredSerializedQuery \
+org.apache.jdo.tck.query.NewQueryWithCandidateClass \
+org.apache.jdo.tck.query.NewQueryWithCandidateClassAndCollection \
+org.apache.jdo.tck.query.NewQueryWithCandidateClassAndExtent \
+org.apache.jdo.tck.query.NewQueryWithCandidateClassAndFilter \
+org.apache.jdo.tck.query.NewQueryWithCandidateClassCollectionFilter \
+org.apache.jdo.tck.query.NewQueryWithExtent \
+org.apache.jdo.tck.query.NewQueryWithExtentAndFilter \
+org.apache.jdo.tck.query.NewQueryWithSpecifiedLanguageAndQuery \
+org.apache.jdo.tck.query.NullCollectionsAndContainsMethod \
+org.apache.jdo.tck.query.NullCollectionsAndIsEmpty \
+org.apache.jdo.tck.query.OrderingSpecification \
+org.apache.jdo.tck.query.ParameterBoundToDifferentPM \
+org.apache.jdo.tck.query.ParameterDeclaredWithSameNameAsFieldOfCandidateClass \
+org.apache.jdo.tck.query.ParenthesesMarkOperatorPrecedence \
+org.apache.jdo.tck.query.QueryIsSerializable \
+org.apache.jdo.tck.query.QueryResultPassedToAnotherQuery \
+org.apache.jdo.tck.query.QueryWithNoFilter \
+org.apache.jdo.tck.query.PrimitiveParameterPassedAsNull \
+org.apache.jdo.tck.query.RestoredSerializedQueryInstanceLosesAssociationWithPM \
+org.apache.jdo.tck.query.SeparateNamespaceForTypeNames \
+org.apache.jdo.tck.query.SetCandidateCollection \
+org.apache.jdo.tck.query.SetCandidateExtent \
+org.apache.jdo.tck.query.SetFilter \
+org.apache.jdo.tck.query.SetIgnoreCache \
+org.apache.jdo.tck.query.SetOrdering \
+org.apache.jdo.tck.query.SetterReplacePreviousValues \
+org.apache.jdo.tck.query.StartsWithAndEndsWith \
+org.apache.jdo.tck.query.SupportedCollectionMethods \
+org.apache.jdo.tck.query.ThisIsReservedWordForElementOfCollection \
+org.apache.jdo.tck.query.UseOfThisToAcessHiddenField \
+org.apache.jdo.tck.query.VariableDeclaredWithSameNameAsFieldOfCandidateClass \
+org.apache.jdo.tck.query.WhiteSpaceIsACharacterAndIgnored \
+org.apache.jdo.tck.query.operators.BinaryAddition \
+org.apache.jdo.tck.query.operators.BinarySubtraction \
+org.apache.jdo.tck.query.operators.BitwiseComplement \
+org.apache.jdo.tck.query.operators.BooleanLogicalAND \
+org.apache.jdo.tck.query.operators.BooleanLogicalOR \
+org.apache.jdo.tck.query.operators.ConditionalAND \
+org.apache.jdo.tck.query.operators.ConditionalOR \
+org.apache.jdo.tck.query.operators.Division \
+org.apache.jdo.tck.query.operators.Equality \
+org.apache.jdo.tck.query.operators.EqualityAndComparisonsBetweenDateFieldsAndParameters \
+org.apache.jdo.tck.query.operators.EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances \
+org.apache.jdo.tck.query.operators.EqualityAndComparisonsBetweenStringFieldsAndParameters \
+org.apache.jdo.tck.query.operators.GreaterThan \
+org.apache.jdo.tck.query.operators.GreaterThanOrEqual \
+org.apache.jdo.tck.query.operators.LessThan \
+org.apache.jdo.tck.query.operators.LessThanOrEqual \
+org.apache.jdo.tck.query.operators.LogicalComplement \
+org.apache.jdo.tck.query.operators.Multiplication \
+org.apache.jdo.tck.query.operators.NotEquals \
+org.apache.jdo.tck.query.operators.PromotionOfNumericOperands \
+org.apache.jdo.tck.query.operators.SignInversion \
+org.apache.jdo.tck.query.operators.StringConcatenation \
+org.apache.jdo.tck.query.operators.UnaryPlus \
+org.apache.jdo.tck.transactions.AfterCompletionMethodCalledWhenCommitted \
+org.apache.jdo.tck.transactions.AfterCompletionMethodCalledWhenRolledback \
+org.apache.jdo.tck.transactions.BeforeCompletionMethodCalled \
+org.apache.jdo.tck.transactions.BeforeCompletionMethodNotCalledBeforeRollback \
+org.apache.jdo.tck.transactions.Commit \
+org.apache.jdo.tck.transactions.GetOptimistic \
+org.apache.jdo.tck.transactions.GetPersistenceManager \
+org.apache.jdo.tck.transactions.GetRetainValues \
+org.apache.jdo.tck.transactions.GetSynchronization \
+org.apache.jdo.tck.transactions.IsActive \
+org.apache.jdo.tck.transactions.IsActiveUntilAfterCompletionMethodCalled \
+org.apache.jdo.tck.transactions.Rollback \
+org.apache.jdo.tck.transactions.SetNontransactionalRead \
+org.apache.jdo.tck.transactions.WhenNontransactionalReadIsFalse \
+org.apache.jdo.tck.transactions.SetNontransactionalReadCalledDuringTxCompletion \
+org.apache.jdo.tck.transactions.SetNontransactionalWriteCalledDuringTxCompletion \
+org.apache.jdo.tck.transactions.SetNontransactionalReadTrueWhenNotSupported \
+org.apache.jdo.tck.transactions.SetOptimistic \
+org.apache.jdo.tck.transactions.SetOptimisticCalledDuringTxCompletion \
+org.apache.jdo.tck.transactions.SetOptimisticDuringTransaction \
+org.apache.jdo.tck.transactions.SetOptimisticTrueWhenNotSupported \
+org.apache.jdo.tck.transactions.SetRetainValues \
+org.apache.jdo.tck.transactions.SetRetainValuesCalledDuringTxCompletion \
+org.apache.jdo.tck.transactions.SetRetainValuesTrueWhenNotSupported \
+org.apache.jdo.tck.transactions.SetSynchronization \
+org.apache.jdo.tck.transactions.SetSynchronizationToNull

Propchange: incubator/jdo/trunk/tck20/test/conf/alltests.conf
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/jdo/trunk/tck20/test/conf/cfg2.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/cfg2.conf?rev=193203&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/cfg2.conf (added)
+++ incubator/jdo/trunk/tck20/test/conf/cfg2.conf Thu Jun 23 12:16:32 2005
@@ -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

Propchange: incubator/jdo/trunk/tck20/test/conf/cfg2.conf
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/jdo/trunk/tck20/test/conf/configurations.list
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/configurations.list?rev=193203&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/configurations.list (added)
+++ incubator/jdo/trunk/tck20/test/conf/configurations.list Thu Jun 23 12:16:32 2005
@@ -0,0 +1,3 @@
+jdo.tck.cfglist = \
+                 alltests.conf \
+                 cfg2.conf

Propchange: incubator/jdo/trunk/tck20/test/conf/configurations.list
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/jdo/trunk/tck20/test/conf/jdori.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/jdori.properties?rev=193203&r1=193202&r2=193203&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/jdori.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/jdori.properties Thu Jun 23 12:16:32 2005
@@ -13,7 +13,7 @@
 javax.jdo.option.RestoreValues=false
 javax.jdo.option.Mapping=derby
 
-org.jpox.validateTables=false  # default = true
+org.jpox.validateTables=false
 org.jpox.validateConstraints=false
 org.jpox.autoCreateSchema=false
 org.jpox.autoCreateTables=false

Modified: incubator/jdo/trunk/tck20/test/conf/logging.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/logging.properties?rev=193203&r1=193202&r2=193203&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/logging.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/logging.properties Thu Jun 23 12:16:32 2005
@@ -57,7 +57,7 @@
 log4j.category.JPOX.JDO=INFO, A1
 log4j.category.JPOX.Cache=INFO, A1
 log4j.category.JPOX.MetaData=INFO, A1
-log4j.category.JPOX.General=INFO, A1
+log4j.category.JPOX.General=DEBUG, A1
 log4j.category.JPOX.Utility=INFO, A1
 log4j.category.JPOX.Transaction=INFO, A1
 log4j.category.JPOX.RDBMS=DEBUG, A1

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/JDO_Test.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/JDO_Test.java?rev=193203&r1=193202&r2=193203&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/JDO_Test.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/JDO_Test.java Thu Jun 23 12:16:32 2005
@@ -114,6 +114,18 @@
         {   true,           false,              false,      false,      false}
     };
   
+    /** identitytype value for applicationidentity. */
+    public static final String APPLICATION_IDENTITY = "applicationidentity";
+
+    /** identitytype value for datastoreidentity. */
+    public static final String DATASTORE_IDENTITY = "datastoreidentity";
+
+    /** 
+     * String indicating the type of identity used for the current test case.
+     * The value is either "applicationidentity" or "datastoreidentity".
+     */
+    protected final String identitytype;
+
     /** Name of the file contaninig the properties for the PMF. */
     protected static String PMFProperties;
 
@@ -150,13 +162,14 @@
     
     /** 
      * A list of registered pc classes. 
-     * Th extents of these classes are deleted in <code>localTearDown</code>.
+     * The extents of these classes are deleted in <code>localTearDown</code>.
      */
     private Collection tearDownClasses = new LinkedList();
     
     /** */
     protected JDO_Test() {
         PMFProperties = System.getProperty("PMFProperties");
+        identitytype = System.getProperty("jdo.tck.identitytype");
     }
 
     /** */
@@ -785,4 +798,15 @@
         }
     }
 
+    /**
+     * Returns <code>true</code> if the current test runs with application
+     * identity. This means the system property jdo.tck.identitytype has the
+     * value applicationidentity.
+     * @return <code>true</code> if current test runs with application
+     * identity; <code>false</code> otherwise:
+     */
+    public boolean runsWithApplicationIdentity() {
+        return APPLICATION_IDENTITY.equals(identitytype);
+    }
+    
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchResultPrinter.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchResultPrinter.java?rev=193203&r1=193202&r2=193203&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchResultPrinter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchResultPrinter.java Thu Jun 23 12:16:32 2005
@@ -67,6 +67,8 @@
     /** */
     protected void printHeader(long runTime) {
         getWriter().println("Time: "+elapsedTimeAsString(runTime));
+        getWriter().println("Description: " +
+                            System.getProperty("jdo.tck.description"));
     }
         
     /** */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchTestRunner.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchTestRunner.java?rev=193203&r1=193202&r2=193203&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchTestRunner.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchTestRunner.java Thu Jun 23 12:16:32 2005
@@ -192,15 +192,24 @@
     private static class ConsoleFileOutput extends OutputStream {
 
         private static String outDir = "logs";
-        private static String fileNamePrefix = "TCKLog-";
         private static String fileNameSuffix = ".txt";
         private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd-HHmmss");
-            
         private PrintStream systemOut = System.out;
         private FileOutputStream fileOut;
         
         private ConsoleFileOutput() {
-            String fileName = fileNamePrefix+simpleDateFormat.format(new Date())+fileNameSuffix;
+            String identityType =  System.getProperty("jdo.tck.identitytype");
+            String db =  System.getProperty("jdo.tck.database");
+            String testConfig =  System.getProperty("jdo.tck.cfg");
+            if (identityType.equals("applicationidentity"))
+                identityType = "app";
+            else identityType = "dsid";
+            testConfig = testConfig.substring(0, testConfig.indexOf('.'));
+            String fileName = db + "-"
+                              + identityType + "-"
+                              + testConfig + "-"
+                              + simpleDateFormat.format(new Date())
+                              + fileNameSuffix;
             File dir = new File(outDir);
             if (!dir.exists()) {
                 dir.mkdir();



Mime
View raw message