mholz 2003/12/30 07:25:51
Modified: testsuite/bin TProcessor.pl
Log:
Sync TProcessor.pl with TProcessor.CMD.
Revision Changes Path
1.4 +34 -39 jakarta-slide/testsuite/bin/TProcessor.pl
Index: TProcessor.pl
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/bin/TProcessor.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TProcessor.pl 30 Dec 2003 09:40:27 -0000 1.3
+++ TProcessor.pl 30 Dec 2003 15:25:51 -0000 1.4
@@ -19,19 +19,21 @@
my $TP_WORKDB="xdavtest";
my $TP_WORKHOST="localhost";
my $DAV_HOST="localhost";
-my $DAV_AUTH="os";
+my $DAV_AUTH="none";
my $DAV_GROUP="group";
my $DAV_DOMAIN="localhost";
-my $DAV_USER="guest";
-my $DAV_PASSWORD="guest";
-my $DAV_PORT="4000";
+my $DAV_USER="root";
+my $DAV_PASSWORD="root";
+my $DAV_PORT="8080";
my $DAV_NAME="slide";
my $TP_STORE="files";
-my $TP_USERS="10";
-my $TP_ITERATIONS="10";
+my $TP_USERS="1";
+my $TP_ITERATIONS="1";
my $TESTCASE_PATH="";
my $TESTCASE_PATTERN="";
my $PAR="";
+my $TP_DEBUG="false";
+my $TP_VERBOSE="false";
my $PD="/";
if ($^O eq "MSWin32") {
@@ -64,7 +66,9 @@
elsif ($_ eq "-workhost"){shift; $TP_WORKHOST=$ARGV[0];}
elsif ($_ eq "-testcase"){shift; $TESTCASE_PATH=$ARGV[0];}
elsif ($_ eq "-pattern") {shift; $TESTCASE_PATTERN=$ARGV[0];}
- elsif ($_ eq "-exclude") {shift; $TESTCASE_EXCLUDE=$ARGV[0];}
+ elsif ($_ eq "-exclude") {shift; $TESTCASE_EXCLUDE= $ARGV[0];}
+ elsif ($_ eq "-debug"){shift; $TP_DEBUG=$ARGV[0];}
+ elsif ($_ eq "-verbose") {shift; $TP_VERBOSE=$ARGV[0];}
else {$PAR="$PAR $_";}
shift;
}
@@ -75,41 +79,32 @@
my $USER_PATH;
my $ACTION_PATH;
+my $PREEMPTIVE_AUTHENTICATION = "true";
if ("$DAV_AUTH" eq "none") {
- $ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
- $USER_PATH="$ROOT_USER_PATH";
- $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude \"*groupFunctional*\" -exclude
\"*ACL*\"";
-}
-if ("$DAV_AUTH" eq "os") {
- $ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
- $USER_PATH="$ROOT_USER_PATH/$DAV_DOMAIN/$DAV_USER";
- $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude \"*groupFunctional*\"";
-}
-if ("$DAV_AUTH" eq "ldap") {
- $ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
+ $ROOT_USER_PATH="/$DAV_NAME/users";
+ $DAV_USER="unauthenticated";
$USER_PATH="$ROOT_USER_PATH/$DAV_USER";
- $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude \"*groupFunctional*\"";
-}
-if ("$DAV_AUTH" eq "tamino") {
- $ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
+ $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude " . '*groupFunctional* -exclude
*ACL*';
+ $PREEMPTIVE_AUTHENTICATION = "false";
+} elsif ("$DAV_AUTH" eq "default") {
+ $ROOT_USER_PATH="/$DAV_NAME/users";
$USER_PATH="$ROOT_USER_PATH/$DAV_USER";
- $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude \"*groupFunctional*\"";
-}
-if ("$DAV_AUTH" eq "ldapgroup") {
- $ROOT_USER_PATH="/$DAV_NAME/administration/security/userdb";
- $USER_PATH="$ROOT_USER_PATH/users/$DAV_USER";
-}
-if ("$DAV_AUTH" eq "taminogroup") {
+ $TESTCASE_EXCLUDE="-exclude $TESTCASE_EXCLUDE " . '-exclude *groupFunctional*';
+ $ACTION_PATH="$DAV_NAME/actions";
+} elsif ("$DAV_AUTH" eq "urmnone") {
+ print "Tamino specific test.";
$ROOT_USER_PATH="/$DAV_NAME/administration/security/userdb";
+ $DAV_USER="unauthenticated";
$USER_PATH="$ROOT_USER_PATH/users/$DAV_USER";
-}
-if ("$DAV_AUTH" eq "urm") {
+ $ACTION_PATH="/$DAV_NAME/administration/security/actions";
+} elsif ("$DAV_AUTH" eq "urm") {
+ print "Tamino specific test.";
$ROOT_USER_PATH="/$DAV_NAME/administration/security/userdb";
$USER_PATH="$ROOT_USER_PATH/users/$DAV_USER";
$ACTION_PATH="/$DAV_NAME/administration/security/actions";
}
-my $OPTS="-Dxdav.home=\"$TP_HOME\" -Dxdav.host=$DAV_HOST -Dxdav.port=$DAV_PORT
-Dxdav.user=$DAV_USER -Dxdav.password=$DAV_PASSWORD
-Dxdav.globalVariableDomainName=$DAV_DOMAIN -Dxdav.globalVariableGroupsColl=groups
-Dxdav.globalVariableUsersColl=users -Dxdav.globalVariableRolesColl=roles
-Dxdav.globalVariableGroup=$DAV_GROUP
-Dxdav.globalVariableRootUserPath=$ROOT_USER_PATH
-Dxdav.globalVariableUserPath=$USER_PATH -Dxdav.globalVariableServerName=$DAV_NAME
-Dxdav.globalVariableCollection=$TP_STORE -Dxdav.globalVariableUsers=$TP_USERS
-Dxdav.globalVariableIterationCount=$TP_ITERATIONS
-Dxdav.globalVariableIterationCountSmall=$TP_ITER_SMALL
-Dxdav.globalVariablePerformanceIterations=$TP_ITER_SMALL -Dxdav.urlencoding=UTF-8
-Dxdav.workdb=$TP_WORKDB -Dxdav.workhost=$TP_WORKHOST
-Dhttpclient.authentication.preemptive=true";
+my $OPTS="-Dxdav.home=\"$TP_HOME\" -Dxdav.host=$DAV_HOST -Dxdav.port=$DAV_PORT
-Dxdav.user=$DAV_USER -Dxdav.password=$DAV_PASSWORD
-Dxdav.globalVariableDomainName=$DAV_DOMAIN -Dxdav.globalVariableGroupsColl=groups
-Dxdav.globalVariableUsersColl=users -Dxdav.globalVariableRolesColl=roles
-Dxdav.globalVariableGroup=$DAV_GROUP
-Dxdav.globalVariableRootUserPath=$ROOT_USER_PATH
-Dxdav.globalVariableUserPath=$USER_PATH -Dxdav.globalVariableServerName=$DAV_NAME
-Dxdav.globalVariableCollection=$TP_STORE -Dxdav.globalVariableUsers=$TP_USERS
-Dxdav.globalVariableIterationCount=$TP_ITERATIONS
-Dxdav.globalVariableIterationCountSmall=$TP_ITER_SMALL
-Dxdav.globalVariablePerformanceIterations=$TP_ITER_SMALL -Dxdav.urlencoding=UTF-8
-Dxdav.workdb=$TP_WORKDB -Dxdav.workhost=$TP_WORKHOST
-Dhttpclient.authentication.preemptive=$PREEMPTIVE_AUTHENTICATION";
$ENV{"CLASSPATH"}="";
cpbuild("$TP_HOME"."$PD"."lib");
@@ -122,7 +117,7 @@
$CLS="org.apache.slide.testsuite.testtools.walker.MultiTProcessorExecuter";
$PAR="$TESTCASE_PATTERN";
if ("$TESTCASE_EXCLUDE") {
- $PAR="$PAR -exclude \"$TESTCASE_EXCLUDE\"";
+ $PAR="$PAR -exclude $TESTCASE_EXCLUDE";
}
} else {
$CLS="junit.textui.TestRunner";
@@ -142,16 +137,16 @@
Usage: tprocessor [options]
Options:
- -davauth <user db type> (default: os)
- -davuser <webdavserver_user> (default: guest)
+ -davauth <user db type> (default: none)
+ -davuser <webdavserver_user> (default: root)
-davdomain <security domain> (default: localhost)
- -davpassword <webdavserver_password> (default: guest)
+ -davpassword <webdavserver_password> (default: root)
-davhost <webdavserver_host> (default: localhost)
- -davport <webdavserver_port> (default: 4000)
+ -davport <webdavserver_port> (default: 8080)
-davname <webdavserver_name> (default: slide)
-store <store_to_operate_on> (default: files)
- -users <number_of_users> (default: 10)
- -iterations <number_of_iterations> (default: 10)
+ -users <number_of_users> (default: 1)
+ -iterations <number_of_iterations> (default: 1)
-testcase <xmltestcase_path> (relative to the home directory)
-pattern <xmltestcase_pattern> (wildard is *, file separator is \\)
-exclude <xmltestcase_pattern> (wildard is *, file separator is \\)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
