X-Git-Url: http://git.shiar.net/perl/plp/.git/blobdiff_plain/b7b9dad9e33b14e2364f6f69edc9bce5bdbd0cb2..6b48397e14cca5fdcbfdd63eb2c00c2a46dce308:/t/50-cgi.t

diff --git a/t/50-cgi.t b/t/50-cgi.t
index b3d5105..111e112 100644
--- a/t/50-cgi.t
+++ b/t/50-cgi.t
@@ -1,7 +1,8 @@
 use strict;
 use warnings;
 
-use Cwd qw(cwd);
+use Cwd;
+use File::Spec;
 use Test::More;
 
 eval { require PerlIO::scalar };
@@ -14,11 +15,12 @@ require_ok('PLP::Backend::CGI') or BAIL_OUT();
 $PLP::use_cache = 0 if $PLP::use_cache;
 #TODO: caching on (change file names)
 
-my $base = -w '/tmp' ? '/tmp' : cwd();
+my $base = Cwd::abs_path(File::Spec->tmpdir || File::Spec->curdir);
+-w $base or BAIL_OUT("$base not writable");
 my $testfile = 'testfile.plp';
 not -f "$base/$testfile" or BAIL_OUT("$testfile exists");
 
-open ORGOUT, '>&', STDOUT;
+open ORGOUT, '>&', *STDOUT;
 
 sub plp_is {
 	my ($test, $plp, $expect) = @_;
@@ -36,17 +38,40 @@ sub plp_is {
 
 	close STDOUT;
 	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);
 }
 
+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",
@@ -101,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", <<TEST);
 $HEAD
-<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>syntax error at $testfile line 2, at EOF
-  (Might be a runaway multi-line \cq\cq string starting on line 1)
+<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$SYNTAXERR
 </td></tr></table>
 TEST
 
@@ -117,33 +142,25 @@ 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/, <<TEST, 2);
-1
-<: use warnings :>
-2
-<: 42 :>
-3
-<: warn "warning" :>
-4
-<: include "missinginclude" :>
-5
-<(missinginclude)>
+1<: use warnings :>
+2<: 42 :>
+3<: warn "warning" :>
+4<: include "missinginclude" :>
+5<(missinginclude)>
 6
 
 $HEAD
-Useless use of a constant in void context at $testfile line 4.
+<warning>${VOIDWARN}</warning>
 1
-
 2
+3<warning>warning at $testfile line 3.</warning>
 
-3
-warning at $testfile line 6.
-
-4
-<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$INCWARN at $testfile line 8.
+4<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$INCWARN at $testfile line 4.
 </td></tr></table>
-5
-<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$INCWARN at $testfile line 10.
+5<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$INCWARN at $testfile line 5.
 </td></tr></table>
 TEST
 
@@ -176,6 +193,7 @@ plp_is('%ENV (on apache)', @envtest);
 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
 Status: 403
 
@@ -193,6 +211,7 @@ chmod 0644, $testfile;
 
 $ENV{PATH_TRANSLATED} = "$base/missinginclude/test/123";
 plp_is('not found', undef, <<TEST);
+<warning>PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123)</warning>
 Content-Type: text/html
 Status: 404