X-Git-Url: http://git.shiar.nl/gitweb.cgi/perl/plp/.git/blobdiff_plain/51d3d67a18705467fa51bb66805456a2502505f1..7e698b486410e08e8120786f7c39f250bc4ee0bb:/t/50-cgi.t diff --git a/t/50-cgi.t b/t/50-cgi.t index d29fcd0..58e36d1 100644 --- a/t/50-cgi.t +++ b/t/50-cgi.t @@ -5,6 +5,20 @@ use Cwd; 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 $@; @@ -40,14 +54,24 @@ sub plp_is { 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 "$msg$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 { @@ -57,7 +81,9 @@ 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 = ( @@ -117,7 +143,8 @@ unlink "$base/$testfile.inc"; my $SYNTAXERR = getwarning("q\cq\n\cq; syntax(error", 1, $testfile); plp_is('fatal error', "runtime\n<: syntax(error :>\nruntime", <Debug information:
$SYNTAXERR +
Debug information:
$SYNTAXERR +
TEST SKIP: { @@ -140,9 +167,10 @@ plp_is('warnings', split /\n\n/, <${VOIDWARN} +1 2 -3warning at $testfile line 3. +3warning at $testfile line 3. 4
Debug information:
$INCWARN at $testfile line 4.
@@ -179,8 +207,8 @@ plp_is('%ENV (on apache)', @envtest); SKIP: { chmod 0244, $testfile or skip("changed permissions", 1); plp_is('permission denied', undef, <PLP: Can't read: $base/$testfile (/$testfile/test/123) Content-Type: text/html -PLP: Can't read: $base/$testfile (/$testfile/test/123) Status: 403 @@ -197,8 +225,8 @@ chmod 0644, $testfile; $ENV{PATH_TRANSLATED} = "$base/missinginclude/test/123"; plp_is('not found', undef, <PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123) Content-Type: text/html -PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123) Status: 404