geoff 2004/07/12 09:44:47
Modified: perl-framework/t/apache acceptpathinfo.t errordoc.t
perl-framework/t/modules include.t
perl-framework/t/ssl headers.t http.t varlookup.t
Log:
swap t_cmp() order where qr// is used.
Revision Changes Path
1.3 +2 -2 httpd-test/perl-framework/t/apache/acceptpathinfo.t
Index: acceptpathinfo.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/apache/acceptpathinfo.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- acceptpathinfo.t 14 May 2002 23:16:05 -0000 1.2
+++ acceptpathinfo.t 12 Jul 2004 16:44:47 -0000 1.3
@@ -63,8 +63,8 @@
);
$actual = super_chomp(GET_BODY "$req");
- ok t_cmp(qr/$expectedbody/,
- $actual,
+ ok t_cmp($actual,
+ qr/$expectedbody/,
"AcceptPathInfo $mode body for $req"
);
}
1.2 +8 -8 httpd-test/perl-framework/t/apache/errordoc.t
Index: errordoc.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/apache/errordoc.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- errordoc.t 12 Apr 2004 15:12:42 -0000 1.1
+++ errordoc.t 12 Jul 2004 16:44:47 -0000 1.2
@@ -19,8 +19,8 @@
$response->code,
'notfound.html code');
- ok t_cmp(qr'per-server 404',
- $content,
+ ok t_cmp($content,
+ qr'per-server 404',
'notfound.html content');
}
@@ -32,8 +32,8 @@
$response->code,
'/inherit/notfound.html code');
- ok t_cmp(qr'per-server 404',
- $content,
+ ok t_cmp($content,
+ qr'per-server 404',
'/inherit/notfound.html content');
}
@@ -63,8 +63,8 @@
have_apache(2) ? 'default' :
qr/Additionally, a 500/;
- ok t_cmp($expected,
- $content,
+ ok t_cmp($content,
+ $expected,
'/redefine/notfound.html content');
}
@@ -102,7 +102,7 @@
$response->code,
'/bounce/notfound.html code');
- ok t_cmp(qr!expire test!,
- $content,
+ ok t_cmp($content,
+ qr!expire test!,
'/bounce/notfound.html content');
}
1.49 +1 -1 httpd-test/perl-framework/t/modules/include.t
Index: include.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/modules/include.t,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- include.t 31 Jan 2004 00:54:32 -0000 1.48
+++ include.t 12 Jul 2004 16:44:47 -0000 1.49
@@ -325,7 +325,7 @@
ok $str;
for my $pat (@patterns) {
- ok t_cmp(qr{$pat}, $str, "/$pat/");
+ ok t_cmp($str, qr{$pat}, "/$pat/");
}
### MOD_BUCKETEER+MOD_INCLUDE TESTS
1.2 +3 -3 httpd-test/perl-framework/t/ssl/headers.t
Index: headers.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/headers.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- headers.t 28 Feb 2004 21:49:55 -0000 1.1
+++ headers.t 12 Jul 2004 16:44:47 -0000 1.2
@@ -23,6 +23,6 @@
$h =~ s/Client-Bad-Header-Line:.*$//g;
-ok t_cmp(qr/X-SSL-Flag: on/, $h, "SSLFlag header set");
-ok t_cmp(qr/X-SSL-Cert:.*END CERTIFICATE-----/, $h, "SSL certificate is
unwrapped");
-ok t_cmp(qr/X-SSL-None: \(null\)\n/, $h, "unknown SSL variable not given");
+ok t_cmp($h, qr/X-SSL-Flag: on/, "SSLFlag header set");
+ok t_cmp($h, qr/X-SSL-Cert:.*END CERTIFICATE-----/, "SSL certificate is
unwrapped");
+ok t_cmp($h, qr/X-SSL-None: \(null\)\n/, "unknown SSL variable not given");
1.12 +2 -2 httpd-test/perl-framework/t/ssl/http.t
Index: http.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/http.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- http.t 18 Feb 2004 16:51:24 -0000 1.11
+++ http.t 12 Jul 2004 16:44:47 -0000 1.12
@@ -41,8 +41,8 @@
);
}
-ok t_cmp(qr{speaking plain HTTP to an SSL-enabled server port},
- $res->content,
+ok t_cmp($res->content,
+ qr{speaking plain HTTP to an SSL-enabled server port},
"that error document contains the proper hint"
);
1.14 +1 -1 httpd-test/perl-framework/t/ssl/varlookup.t
Index: varlookup.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/varlookup.t,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- varlookup.t 6 Nov 2002 12:43:59 -0000 1.13
+++ varlookup.t 12 Jul 2004 16:44:47 -0000 1.14
@@ -80,7 +80,7 @@
}
my $str = GET_BODY("$url?$key", cert => 'client_ok',
@headers);
- t_cmp($lookup{$key}, $str, "$key");
+ t_cmp($str, $lookup{$key}, "$key");
}
__END__
