use File::Spec;
use Test::More;
+eval {
+ require Test::LongString;
+ Test::LongString->import(max => 128);
+
+ no warnings 'redefine'; # override module to not escape newlines
+ my $formatter = *Test::LongString::_display;
+ my $parent = \&{$formatter};
+ *{$formatter} = sub {
+ my $s = &{$parent};
+ $s =~ s/\Q\x{0a}/\n /g; # revert newline quoting
+ return $s;
+ };
+} or *is_string = \&is; # fallback to ugly unformatted is()
+
eval { require PerlIO::scalar };
plan skip_all => "PerlIO required (perl 5.8) to test PLP" if $@;
open ORGOUT, '>&', *STDOUT;
sub plp_is {
- my ($test, $plp, $expect) = @_;
+ my ($test, $plp, $expect, $env) = @_;
chomp $expect;
local $Test::Builder::Level = $Test::Builder::Level + 1;
+ %ENV = (
+ REQUEST_METHOD => 'GET',
+ REQUEST_URI => "/$testfile/test/123",
+ QUERY_STRING => 'test=1&test=2',
+ GATEWAY_INTERFACE => 'CGI/1.1',
+
+ SCRIPT_NAME => '/plp.cgi',
+ SCRIPT_FILENAME => "$base/plp.cgi",
+ PATH_INFO => "/$testfile/test/123",
+ PATH_TRANSLATED => "$base/$testfile/test/123",
+ DOCUMENT_ROOT => $base,
+
+ $env ? %{$env} : (),
+ ); # Apache/2.2.4 CGI environment
+
if (defined $plp) {
eval {
open my $testfh, '>', "$base/$testfile" or die $!;
open STDOUT, '>', \my $output; # STDOUT buffered to scalar
select STDOUT; # output before start() (which selects PLPOUT)
eval {
- local $SIG{__WARN__} = sub { print $_[0] }; # enables warnings
+ local $SIG{__WARN__} = sub {
+ # include warnings in stdout (but modified to distinguish)
+ my $msg = shift;
+ my $eol = $msg =~ s/(\s*\z)// && $1;
+ print "<warning>$msg</warning>$eol"
+ };
PLP::everything();
};
+ my $failure = $@;
select ORGOUT; # return to original STDOUT
- not $@ or fail($test), diag(" Error: $@"), return;
+ if ($failure) {
+ fail($test);
+ diag(" Error: $failure");
+ return;
+ }
$output =~ s{((?:.+\n)*)}{ join "", sort split /(?<=\n)/, $1 }e; # order headers
- is($output, $expect, $test);
+ is_string($output, $expect, $test);
}
sub getwarning {
local $SIG{__WARN__} = sub { die @_ };
# warnings module runs at BEGIN, so we need to use icky expression evals
eval qq(# line $line "$file"\n$code; return);
- return $@;
+ my $res = $@;
+ chomp $res;
+ return $res;
};
-%ENV = (
- REQUEST_METHOD => 'GET',
- REQUEST_URI => "/$testfile/test/123",
- QUERY_STRING => 'test=1&test=2',
- GATEWAY_INTERFACE => 'CGI/1.1',
-
- SCRIPT_NAME => '/plp.cgi',
- SCRIPT_FILENAME => "$base/plp.cgi",
- PATH_INFO => "/$testfile/test/123",
- PATH_TRANSLATED => "$base/$testfile/test/123",
- DOCUMENT_ROOT => $base,
-); # Apache/2.2.4 CGI environment
-
my $HEAD = <<EOT; # common header output
Content-Type: text/html
X-PLP-Version: $PLP::VERSION
my $SYNTAXERR = getwarning("q\cq\n\cq; syntax(error", 1, $testfile);
plp_is('fatal error', "runtime\n<: syntax(error :>\nruntime", <<TEST);
$HEAD
-<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$SYNTAXERR</td></tr></table>
+<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$SYNTAXERR
+</td></tr></table>
TEST
SKIP: {
6
$HEAD
-${VOIDWARN}1
+<warning>${VOIDWARN}</warning>
+1
2
-3warning at $testfile line 3.
+3<warning>warning at $testfile line 3.</warning>
4<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$INCWARN at $testfile line 4.
</td></tr></table>
SKIP: {
chmod 0244, $testfile or skip("changed permissions", 1);
plp_is('permission denied', undef, <<TEST);
+<warning>PLP: Can't read: $base/$testfile (/$testfile/test/123)</warning>
Content-Type: text/html
-PLP: Can't read: $base/$testfile (/$testfile/test/123)
Status: 403
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
chmod 0644, $testfile;
}
-$ENV{PATH_TRANSLATED} = "$base/missinginclude/test/123";
-plp_is('not found', undef, <<TEST);
+my %nf = (PATH_TRANSLATED => "$base/missinginclude/test/123");
+plp_is('not found', undef, <<TEST, \%nf);
+<warning>PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123)</warning>
Content-Type: text/html
-PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123)
Status: 404
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
</body></html>
TEST
-%ENV = (
+plp_is('%ENV on lighttpd', @envtest, {
+ # lighttpd/1.4.7 CGI environment
REQUEST_METHOD => 'GET',
REQUEST_URI => "/$testfile/test/123",
QUERY_STRING => 'test=1&test=2',
SCRIPT_NAME => "/$testfile", #XXX: .plp?
SCRIPT_FILENAME => "$base/$testfile",
PATH_INFO => '/test/123',
-); # lighttpd/1.4.7 CGI environment
-
-plp_is('%ENV on lighttpd', @envtest);
+ PATH_TRANSLATED => undef,
+ DOCUMENT_ROOT => undef,
+});
unlink "$base/$testfile";