juergen 2004/02/06 09:28:47
Modified: testsuite build.xml tp.properties.tamino
Added: testsuite/testsuite/junit .cvsignore
Log:
exclude multi-user tests from tp.functional, tp.bind, ...
Revision Changes Path
1.11 +35 -26 jakarta-slide/testsuite/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 6 Feb 2004 17:00:58 -0000 1.10
+++ build.xml 6 Feb 2004 17:28:46 -0000 1.11
@@ -6,7 +6,7 @@
<property name="slideclientlib" value="${basedir}/../webdavclient/dist/lib" />
<property name="slideclientextlib" value="${basedir}/../webdavclient/lib" />
<property name="dist" value="${basedir}/dist" />
- <property name="client.jar" value="jakarta-slide-webdavlib-2.0beta1.jar" />
+ <property name="client.jar" value="jakarta-slide-webdavlib-2.0b1.jar" />
<!-- =============================================================== -->
<target name="compile">
@@ -45,7 +45,7 @@
</target>
<!-- =============================================================== -->
- <target name="make">
+ <target name="make" description="builds the tprocessor">
<copy todir="${lib}" file="${slideclientlib}/${client.jar}" overwrite="yes" />
<copy todir="${lib}" file="${slideclientextlib}/commons-httpclient.jar"
overwrite="yes" />
<antcall target="compile" />
@@ -70,48 +70,49 @@
<target name="tp.functional" description="Runs functional tests">
<property name="tp.include" value="functional/**/*.xml"/>
- <antcall target="tp.run"/>
+ <antcall target="tp.pattern"/>
</target>
- <target name="tp.bind" description="Runs BIND tests">
+ <target name="tp.bind" description="Runs BIND tests (without cross-server
binding)">
<property name="tp.include" value="BIND/**/*.xml"/>
- <antcall target="tp.run"/>
+ <property name="tp.exclude" value="**/cross-server-binding*.xml"/>
+ <antcall target="tp.pattern"/>
+ </target>
+ <target name="tp.bindx" description="Runs BIND tests for cross-server binding">
+ <property name="tp.include" value="BIND/**/cross-server-binding*.xml"/>
+ <antcall target="tp.pattern"/>
</target>
<target name="tp.deltav" description="Runs DeltaV tests">
<property name="tp.include" value="DeltaV/**/*.xml"/>
- <antcall target="tp.run"/>
+ <antcall target="tp.pattern"/>
</target>
<target name="tp.dasl" description="Runs DASL tests">
<property name="tp.include" value="DASL/**/*.xml"/>
- <antcall target="tp.run"/>
+ <antcall target="tp.pattern"/>
+ </target>
+ <target name="tp.bind" description="Runs bind tests">
+ <property name="tp.include" value="BIND/**/*.xml"/>
+ <antcall target="tp.pattern"/>
</target>
<target name="tp.i18n" description="Runs I18N tests">
<property name="tp.include" value="I18N/**/*.xml"/>
- <antcall target="tp.run"/>
+ <antcall target="tp.pattern"/>
</target>
<target name="tp.acl" description="Runs ACL tests">
<property name="tp.include" value="ACL/**/*.xml"/>
- <antcall target="tp.run"/>
+ <antcall target="tp.pattern"/>
</target>
<target name="tp.multiuser" description="Runs multi-user tests">
- <property name="tp.include" value="multi-user/**/*.xml"/>
- <antcall target="tp.run">
- <!-- TODO -->
- <param name="xdav.globalVariableUsers" value="4"/>
- <param name="xdav.globalVariableIterationCount" value="4"/>
- <param name="xdav.globalVariableIterationCountSmall" value="2"/>
- </antcall>
+ <property name="tp.include" value="**/multi-user/**/*.xml"/>
+ <property name="tp.multiuser.exclude" value="Nothing"/>
+ <antcall target="tp.pattern"/>
</target>
<target name="tp.stores" description="Creates the initial stores">
<property name="tp.include" value="configuration/create_webdav_stores.xml"/>
- <antcall target="tp.run"/>
+ <antcall target="tp.pattern"/>
</target>
- <target name="tp.pattern" description=
- "Runs all tests matched by the pattern specified by -Dtp.pattern=pattern.
Always use slashes, even on windows!">
- <property name="tp.include" value="${tp.pattern}"/>
- <antcall target="tp.invoke"/>
- </target>
-
- <target name="tp.run" depends="tp.props">
+
+ <target name="tp.pattern" depends="tp.props" description=
+ "Runs all tests matched by the pattern specified by -Dtp.include and
-Dtp.exclude.">
<taskdef name="tprocessor"
classname="org.apache.slide.testsuite.testtools.tutil.TProcessorTask">
<classpath>
<fileset dir="${lib}" >
@@ -119,12 +120,20 @@
</fileset>
</classpath>
</taskdef>
+
+ <!-- property defaults if not specified by the caller -->
+ <property name="tp.include" value="**/*.xml"/>
+ <property name="tp.exclude" value="Nothing"/>
+ <property name="tp.always.exclude" value="**/*UNEXPL*/**/*.xml"/>
+ <property name="tp.multiuser.exclude" value="**/multi-user/**/*.xml"/>
+
<tprocessor config="${basedir}/testsuite/junit/tprocessor.xml"
urlEncoding="UTF-8" tracingRequest="xar"
result="${basedir}/result.xml">
<fileset dir="${basedir}/testsuite/junit/xmltestcases">
<include name="${tp.include}"/>
- <exclude name="**/*UNEXPL*/**/*.xml"/>
- <exclude name="**/*cross*.xml"/>
+ <include name="${tp.exclude}"/>
+ <exclude name="${tp.multiuser.exclude}"/>
+ <exclude name="${tp.always.exclude}"/>
</fileset>
</tprocessor>
</target>
1.2 +6 -6 jakarta-slide/testsuite/tp.properties.tamino
Index: tp.properties.tamino
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/tp.properties.tamino,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tp.properties.tamino 6 Feb 2004 15:55:15 -0000 1.1
+++ tp.properties.tamino 6 Feb 2004 17:28:47 -0000 1.2
@@ -6,17 +6,17 @@
workdb = mhm
globalVariableCollection = testcoll
-globalVariableUsers = 1
-globalVariableIterationCount = 1
-globalVariableIterationCountSmall = 1
+globalVariableUsers = 4
+globalVariableIterationCount = 4
+globalVariableIterationCountSmall = 2
globalVariablePerformanceIterations = 1
-globalVariableDomainName = ${xdav.host}
+globalVariableDomainName = localhost
globalVariableGroup = group
globalVariableGroupsColl = groups
globalVariableUsersColl = users
globalVariableRolesColl = roles
-globalVariableRootUserPath = /webdav/administration/security/userdb
-globalVariableUserPath = /webdav/administration/security/userdb/users/${user}
globalVariableServerName = webdav
+globalVariableRootUserPath =
/${globalVariableServerName}/administration/security/userdb
+globalVariableUserPath =
/${globalVariableServerName}/administration/security/userdb/users/${user}
globalVariableXMLReference=
1.1 jakarta-slide/testsuite/testsuite/junit/.cvsignore
Index: .cvsignore
===================================================================
debug
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
