stas 2004/04/12 14:52:10
Modified: t/apache scanhdrs.t
t/response/TestCompat apache_file.pm
Log:
fixed t_cmp in Apache-Test doesn't require a scalar context workaround
for functions returning undef called as t_cmp's arguments
Revision Changes Path
1.6 +6 -2 modperl-2.0/t/apache/scanhdrs.t
Index: scanhdrs.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/apache/scanhdrs.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- scanhdrs.t 18 Apr 2003 06:18:55 -0000 1.5
+++ scanhdrs.t 12 Apr 2004 21:52:10 -0000 1.6
@@ -16,8 +16,12 @@
ok t_cmp(qr/^ok 1$/m, $res->content);
-ok t_cmp('text/test-output', scalar $res->header('Content-Type'));
+ok t_cmp('text/test-output',
+ $res->header('Content-Type'),
+ "standard header");
-ok t_cmp($module, scalar $res->header('X-Perl-Module'));
+ok t_cmp($module,
+ $res->header('X-Perl-Module'),
+ "custom header");
ok t_cmp(qr/beer/, $res->message);
1.2 +1 -1 modperl-2.0/t/response/TestCompat/apache_file.pm
Index: apache_file.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestCompat/apache_file.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- apache_file.pm 15 Aug 2002 09:35:11 -0000 1.1
+++ apache_file.pm 12 Apr 2004 21:52:10 -0000 1.2
@@ -74,7 +74,7 @@
my $write = "test $$";
print $tmpfh $write;
seek $tmpfh, 0, 0;
- ok t_cmp($write, scalar(<$tmpfh>), "write/read from tmpfile");
+ ok t_cmp($write, <$tmpfh>, "write/read from tmpfile");
ok t_cmp(Apache::OK,
$r->discard_request_body,
