X-Git-Url: http://git.shiar.net/perl/plp/.git/blobdiff_plain/b6ecc856f9ee83de1465613f74e6eb585d38cf21..6b48397e14cca5fdcbfdd63eb2c00c2a46dce308:/t/50-cgi.t diff --git a/t/50-cgi.t b/t/50-cgi.t index d30bff2..111e112 100644 --- a/t/50-cgi.t +++ b/t/50-cgi.t @@ -40,16 +40,38 @@ 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); } +sub getwarning { + # captures the first warning produced by the given code string + my ($code, $line, $file) = @_; + + 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); + my $res = $@; + chomp $res; + return $res; +}; + %ENV = ( REQUEST_METHOD => 'GET', REQUEST_URI => "/$testfile/test/123", @@ -104,10 +126,10 @@ rename "$base/$testfile", "$base/$testfile.inc"; plp_is('include', "<($testfile.inc)> <: include '$testfile.inc'", "$HEAD\nok ok"); 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:
syntax error at $testfile line 2, at EOF - (Might be a runaway multi-line \cq\cq string starting on line 1) +
Debug information:
$SYNTAXERR
TEST @@ -120,6 +142,8 @@ if (open my $dummy, "<", $INCFILE) { # like PLP::source will } my $INCWARN = qq{Can't open "$INCFILE" ($!)}; +my $VOIDWARN = getwarning('42', 2, $testfile); + plp_is('warnings', split /\n\n/, < 2<: 42 :> @@ -129,10 +153,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.
@@ -169,8 +193,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 @@ -187,8 +211,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