X-Git-Url: http://git.shiar.net/perl/plp/.git/blobdiff_plain/58ad0f73721365480cd2c2bc844af04146ba1941..refs/tags/3.23:/t/50-cgi.t

diff --git a/t/50-cgi.t b/t/50-cgi.t
index bf60143..d29fcd0 100644
--- a/t/50-cgi.t
+++ b/t/50-cgi.t
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
 
+use Cwd;
 use File::Spec;
 use Test::More;
 
@@ -14,7 +15,7 @@ require_ok('PLP::Backend::CGI') or BAIL_OUT();
 $PLP::use_cache = 0 if $PLP::use_cache;
 #TODO: caching on (change file names)
 
-my $base = File::Spec->tmpdir || File::Spec->curdir;
+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");
@@ -49,6 +50,16 @@ sub plp_is {
 	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);
+	return $@;
+};
+
 %ENV = (
 	REQUEST_METHOD => 'GET',
 	REQUEST_URI => "/$testfile/test/123",
@@ -103,11 +114,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)
-</td></tr></table>
+<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$SYNTAXERR</td></tr></table>
 TEST
 
 SKIP: {
@@ -119,33 +129,24 @@ 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.
-1
-
+${VOIDWARN}1
 2
+3warning at $testfile line 3.
 
-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