db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r225648 - in /incubator/jdo/trunk/tck20: maven.xml test/conf/alltests.conf test/java/org/apache/jdo/tck/util/BatchResultPrinter.java
Date Wed, 27 Jul 2005 22:58:37 GMT
Author: mcaisse
Date: Wed Jul 27 15:58:25 2005
New Revision: 225648

URL: http://svn.apache.org/viewcvs?rev=225648&view=rev
Log:
JDO-57: Implement exclude list

Modified:
    incubator/jdo/trunk/tck20/maven.xml
    incubator/jdo/trunk/tck20/test/conf/alltests.conf
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/BatchResultPrinter.java

Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev=225648&r1=225647&r2=225648&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Wed Jul 27 15:58:25 2005
@@ -81,6 +81,8 @@
         <echo>setProps:</echo>
 
         <j:set var="zeroval" value="0"/>
+        <j:set var="spaceval" value=" "/>
+        <j:set var="nullval" value=""/>
 
         <j:set var="cfglist" value="${jdo.tck.cfglist}"/>
         <j:if test="${cfglist == null}">
@@ -104,6 +106,33 @@
 
     </goal>
 
+    <goal name="exclude">
+
+        <j:new var="testclasses" className="java.util.Vector"/>
+        <u:tokenize var="jdo.tck.classes" delim=" ">
+            ${jdo.tck.classes}
+        </u:tokenize>
+        <j:forEach var="class" items="${jdo.tck.classes}">
+            <j:set var="foo" value="${testclasses.add(class)}"/>
+        </j:forEach>
+
+        <u:properties file="${jdo.tck.excludelist}"/>
+        <u:tokenize var="jdo.tck.exclude" delim=" ">
+            ${jdo.tck.exclude}
+        </u:tokenize>
+        <j:forEach var="excludedclass" items="${jdo.tck.exclude}">
+            <j:set var="foo" value="${testclasses.remove(excludedclass)}"/>
+        </j:forEach>
+
+        <j:new var="strbuf" className="java.lang.StringBuffer"/>
+        <j:forEach var="class" items="${testclasses}">
+            <j:set var="foo" value="${strbuf.append(class)}"/>
+            <j:set var="foo" value="${strbuf.append(spaceval)}"/>
+        </j:forEach>
+        <j:set var="jdo.tck.classes" value="${strbuf}"/>
+
+    </goal>
+
     <!-- ================== -->
     <!-- Install schema     -->
     <!-- ================== -->
@@ -181,6 +210,7 @@
                     <!-- get jdo.tck.classes (list of testclasses),
                          jdo.tck.testdata, jdo.tck.mapping -->
                     <u:properties file="${basedir}/test/conf/${jdo.tck.cfg}"/>
+                    <attainGoal name="exclude"/>
                     <j:new var="schemaname" className="java.lang.String"/>
                     <j:set var="id" value="${jdo.tck.identitytype}"/>
                     <j:set var="mapping" value="${jdo.tck.mapping}"/>
@@ -209,6 +239,7 @@
             <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}"/>
+                    <attainGoal name="exclude"/>
                     <j:new var="schemaname" className="java.lang.String"/>
                     <j:set var="id" value="${jdo.tck.identitytype}"/>
                     <j:set var="mapping" value="${jdo.tck.mapping}"/>
@@ -263,8 +294,8 @@
                          value="${jdo.tck.database}"/>
             <sysproperty key="jdo.tck.cfg"
                          value="${jdo.tck.cfg}"/>
-            <sysproperty key="jdo.tck.excludelist"
-                         value="${jdo.tck.excludelist}"/>
+            <sysproperty key="jdo.tck.exclude"
+                         value="${jdo.tck.exclude}"/>
             <jvmarg line="${database.runtck.sysproperties}"/>
             <jvmarg line="${iut.runtck.sysproperties}"/>
             <arg line="${jdo.tck.classes}"/>
@@ -308,8 +339,8 @@
                          value="${jdo.tck.database}"/>
             <sysproperty key="jdo.tck.cfg"
                          value="${jdo.tck.cfg}"/>
-            <sysproperty key="jdo.tck.excludelist"
-                         value="${jdo.tck.excludelist}"/>
+            <sysproperty key="jdo.tck.exclude"
+                         value="${jdo.tck.exclude}"/>
             <jvmarg line="${database.runtck.sysproperties}"/>
             <jvmarg line="${jdo.runtck.sysproperties}"/>
             <arg line="${jdo.tck.classes}"/>

Modified: incubator/jdo/trunk/tck20/test/conf/alltests.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/alltests.conf?rev=225648&r1=225647&r2=225648&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/alltests.conf (original)
+++ incubator/jdo/trunk/tck20/test/conf/alltests.conf Wed Jul 27 15:58:25 2005
@@ -172,6 +172,8 @@
 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.enhancement.FieldAccessModified \
+org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable \
 org.apache.jdo.tck.extents.CloseAll \
 org.apache.jdo.tck.extents.CloseOfExtentIteratorIsIteratorSpecific \
 org.apache.jdo.tck.extents.GetCandidateClass \

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=225648&r1=225647&r2=225648&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 Wed
Jul 27 15:58:25 2005
@@ -95,6 +95,7 @@
                                 ",  Errors: "+result.errorCount()+
                                 ", Time: "+elapsedTimeAsString(this.runtime)+" seconds.");
         }
+        getWriter().println("Excluded tests: " + System.getProperty("jdo.tck.exclude"));
     }
         
     // helper method



Mime
View raw message