nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-31 03:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow test case to be fully specified on the command line by filename.

Browse Source
This commit is contained in:
Andrew McMillan 2009-10-30 19:06:57 +13:00
parent e02514cd46
commit c1267717d0
1 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
testing/dav_test
View File

@ -13,14 +13,15 @@ my $debug = 0;
my $dsn = "davical"; my $dsn = "davical";
my $dbuser = ""; my $dbuser = "";
my $dbpass = ""; my $dbpass = "";
my $suite;
my $webhost = 'mycaldav'; my $webhost = 'mycaldav';
my $althost = 'myempty'; my $althost = 'myempty';
my $test; my $testdef;
my $suite;
my $case;
my $helpmeplease = 0; my $helpmeplease = 0;
my $dbadir = $0; my $dbadir = $0;
$dbadir =~ s#/[^/]*$##; $dbadir =~ s{/[^/]*$}{};
my $patchdir = $dbadir . "/patches"; my $patchdir = $dbadir . "/patches";
@ -28,20 +29,16 @@ GetOptions ('debug!' => \$debug,
'dsn=s' => \$dsn, 'dsn=s' => \$dsn,
'dbuser=s' => \$dbuser, 'dbuser=s' => \$dbuser,
'dbpass=s' => \$dbpass, 'dbpass=s' => \$dbpass,
'suite=s' => \$suite,
'webhost=s' => \$webhost, 'webhost=s' => \$webhost,
'althost=s' => \$althost, 'althost=s' => \$althost,
'case=s' => \$test, 'test=s' => \$testdef,
'suite=s' => \$suite,
'case=s' => \$case,
'help' => \$helpmeplease ); 'help' => \$helpmeplease );
usage() if ( $helpmeplease || !defined($suite) || !defined($test)); usage() if ( $helpmeplease || ((!defined($suite) || !defined($case)) && !defined($testdef)));
############################################################ my $dbh;
# Open database connection. Note that the standard PostgreSQL
# environment variables will also work with DBD::Pg.
############################################################
$dsn = "dbi:Pg:dbname=$dsn";
my $dbh = DBI->connect($dsn, $dbuser, $dbpass, { AutoCommit => 0 } ) or die "Can't connect to database $dsn";
my @arguments = ( "--basic", "--proxy", "" ); my @arguments = ( "--basic", "--proxy", "" );
@ -52,7 +49,13 @@ my $url;
my $is_head_request = 0; my $is_head_request = 0;
my @auth = ( "--user", "user1:user1" ); my @auth = ( "--user", "user1:user1" );
my $datafile = "tests/$suite/$test.data"; if ( !defined($testdef) ) {
$testdef = "tests/$suite/$case.test";
}
my $datafile = $testdef;
$datafile =~ s{\.test$}{};
$datafile .= '.data';
my $state = ""; my $state = "";
my $data_binary; my $data_binary;
@ -63,7 +66,7 @@ my $sql_values = {};
my $queries = (); my $queries = ();
my $replacements = (); my $replacements = ();
open( TEST, '<', "tests/$suite/$test.test" ) or die "Can't open 'tests/$suite/$test.test'"; open( TEST, '<', $testdef ) or die "Can't open '$testdef'";
while( <TEST> ) { while( <TEST> ) {
my $line = $_; my $line = $_;
@ -111,7 +114,19 @@ while( <TEST> ) {
}; };
$line =~ /^\s*DATA\s*=\s*(\S.*)$/ && do { $line =~ /^\s*DATA\s*=\s*(\S.*)$/ && do {
$datafile="tests/$suite/$1.data"; my $basename = $1;
if ( -e "tests/$suite/$basename.data" ) {
$datafile="tests/$suite/$basename.data";
}
elsif ( -e "$basename.data" ) {
$datafile="$basename.data";
}
elsif ( -e $basename ) {
$datafile=$basename;
}
else {
die "Can't find DATA file $basename or $basename.data";
}
}; };
$line =~ /^BEGINDATA\s*$/ && do { $line =~ /^BEGINDATA\s*$/ && do {
@ -197,6 +212,7 @@ while( <RESULTS> ) {
} }
if ( defined(@{$queries}) && @{$queries} ) { if ( defined(@{$queries}) && @{$queries} ) {
opendb() unless defined($dbh);
print STDERR "Processing special queries\n" if ( $debug ); print STDERR "Processing special queries\n" if ( $debug );
foreach $sql_statement ( @$queries ) { foreach $sql_statement ( @$queries ) {
# run SQL statement and dump results, into array of hashes # run SQL statement and dump results, into array of hashes
@ -228,16 +244,28 @@ sub get_sql_value {
my $values = shift; my $values = shift;
my $sql = shift; my $sql = shift;
opendb() unless defined($dbh);
my $results = $dbh->selectall_arrayref($sql); my $results = $dbh->selectall_arrayref($sql);
print STDERR "RESULT for $varname is ", $results->[0][0], "\n" if ( $debug ); print STDERR "RESULT for $varname is ", $results->[0][0], "\n" if ( $debug );
$values->{$varname} = (defined($results->[0][0]) ? $results->[0][0] : ""); $values->{$varname} = (defined($results->[0][0]) ? $results->[0][0] : "");
} }
=item opendb()
Opens the database connection to the global $dbh handle.
Note that the standard PostgreSQL environment variables will also work
with DBD::Pg.
=cut
sub opendb {
$dsn = "dbi:Pg:dbname=$dsn";
$dbh = DBI->connect($dsn, $dbuser, $dbpass, { AutoCommit => 0 } ) or die "Can't connect to database $dsn";
}
sub usage { sub usage {
print <<EOERROR ; print <<EOERROR ;
Usage: dav_test [DB opts] --suite <testsuite> --case <testname> Usage:
dav_test [DB opts] [--suite <testsuite> --case <testname>] | [--test <filename>]
This program will read the file 'tests/<testsuite>/<testname>.test This program will read the file 'tests/<testsuite>/<testname>.test
and follow the instructions there. and follow the instructions there.