Added persistent-state test

- PerlPPTest can now take a PerlPP instance to use
- Added t/08-persistent-state to test a -D in one call to Main followed
  by a use of the defined symbol in another call to Main
- Bugfixes in skipping in t/05-external-command.t
- Bumped version number to 0.500.4

Author: Chris White

Changes

@@ -1,6 +1,9 @@
 Revision history for Text-PerlPP
 (Note: GH = GitHub issue; # = RT issue)
 
+0.500.4 2018/05/29
+        Updated tests
+
 0.500.3 2018/05/28
         Fixes to tests; updated documentation
 

MANIFEST

@@ -18,6 +18,7 @@ t/04-include.t
 t/05-external-command.t
 t/06-macro.t
 t/07-invalid.t
+t/08-persistent-state.t
 t/a.txt
 t/b.txt
 t/c.txt

lib/Text/PerlPP.pm

@@ -5,7 +5,7 @@ package Text::PerlPP;
 
 # Semantic versioning, packed per Perl rules.  Must always be at least one
 # digit left of the decimal, and six digits right of the decimal.
-our $VERSION = '0.500003';
+our $VERSION = '0.500004';
 
 use 5.010001;
 use strict;

t/05-external-command.t

@@ -1,15 +1,18 @@
 #!/usr/bin/env perl
-# Tests of perlpp <?!...?> external commands
+# Tests of perlpp <?!...?> external commands.
 #
-# TODO: On non-Unix, test only `echo` with no parameters.
+# Note: On non-Unix, we test only `echo` with no parameters.
+# On non-Unix, non-Windows, we skip this because yours truly doesn't know
+# enough about what external commands are available! :)
 
 use rlib 'lib';
 use PerlPPTest qw(:DEFAULT quote_string);
 use List::Util 'any';
 
-if(any { $_ eq $^O } 'VMS', 'os390', 'os400', 'riscos', 'amigaos') {
-	plan skip_all => "I don't know how to run this test on $^O";
-	exit;
+my $os = $^O;	# so we can mock $^O to test this test code!
+
+if(any { $_ eq $os } 'VMS', 'os390', 'os400', 'riscos', 'amigaos') {
+	plan skip_all => "I don't know how to run this test on $os";
 }
 
 (my $whereami = __FILE__) =~ s/macro\.t$//;
@@ -38,26 +41,27 @@ do {
 	is($out, "howdy\n", "basic echo");
 };
 
-if (any { $_ eq $^O } 'dos', 'os2', 'MSWin32') {
-	skip "I don't know how to run the rest of the tests on $^O", $ntests-1;
-	exit;
-}
+SKIP: {
+	if (any { $_ eq $os } 'dos', 'os2', 'MSWin32') {
+		skip "I don't know how to run the rest of the tests on $os", $ntests-1;
+	}
 
-for my $lrTest (@testcases) {
-	my ($opts, $testin, $out_re, $err_re) = @$lrTest;
-	my ($out, $err);
+	for my $lrTest (@testcases) {
+		my ($opts, $testin, $out_re, $err_re) = @$lrTest;
+		my ($out, $err);
 
-	#diag "perlpp $opts <<<@{[quote_string $testin]}";
-	run_perlpp $opts, \$testin, \$out, \$err;
+		#diag "perlpp $opts <<<@{[quote_string $testin]}";
+		run_perlpp $opts, \$testin, \$out, \$err;
 
-	if(defined $out_re) {
-		like($out, $out_re);
-	}
-	if(defined $err_re) {
-		like($err, $err_re);
-	}
+		if(defined $out_re) {
+			like($out, $out_re);
+		}
+		if(defined $err_re) {
+			like($err, $err_re);
+		}
 
-} # foreach test
+	} # foreach test
+} #SKIP
 
 # TODO test -o / --output, and processing input from files rather than stdin
 

t/08-persistent-state.t

@@ -0,0 +1,28 @@
+#!perl
+# PerlPP: test persistence of state across calls to Main
+use rlib 'lib';
+use PerlPPTest;
+
+# When testing perlpp as an external command, there is by definition no state
+# persistence.  Therefore, skip this test file.
+if($ENV{PERLPP_NOUSE}) {
+    plan skip_all => 'Persistent state not tested in this configuration (PERLPP_NOUSE)';
+}
+
+plan tests => 3;
+
+my ($in, $out, $err);
+my @ioe=\($in, $out, $err);
+my $instance = Text::PerlPP->new;
+
+$in = '';
+run_perlpp {instance=>$instance, args=>['-D','foo=42']}, @ioe;
+is($out, '', 'first call returns nothing');
+is($err, '', 'first call succeeds');
+
+$in = 'foo';
+run_perlpp {instance=>$instance}, @ioe;
+is($out, '42', 'definition carries forward');
+
+done_testing();
+# vi: set ts=4 sts=4 sw=4 et ai: #

t/lib/PerlPPTest.pm

@@ -38,17 +38,29 @@ sub L {
 } #L
 
 # run_perlpp: Run perlpp
-# Args: $lrArgs, $refStdin, $refStdout, $refStderr
+# Args: $args, $refStdin, $refStdout, $refStderr
+# 	$args can be:	a string, in which case it is split with shellwords();
+# 					an arrayref, in which case it is used as the args; or
+# 					a hashref with (all optional):
+# 						{args}		string or arrayref as above
+# 						{instance}	an existing Text::PerlPP instance to use
 sub run_perlpp {
-	#say STDERR "args ", Dumper(\@_);
+	#say STDERR "run_perlpp: ", Dumper(\@_);
 	my $lrArgs = shift;
+	my $instance;
+	if(ref $lrArgs eq 'HASH') {
+		$instance = $lrArgs->{instance};	# nonexistent => falsy, so it's OK
+		$lrArgs = $lrArgs->{args};	# or undef, which will become [] below.
+		#say STDERR "args updated: ", Dumper($lrArgs);
+	}
+
 	my $refStdin = shift // \(my $nullstdin);
 	my $refStdout = shift // \(my $nullstdout);
 	my $refStderr = shift // \(my $nullstderr);
 
 	my $retval;
 
-	$lrArgs = [shellwords($lrArgs)] if ref $lrArgs ne 'ARRAY';
+	$lrArgs = [shellwords($lrArgs // '')] if ref $lrArgs ne 'ARRAY';
 	#do { (my $args = Dumper($lrArgs)) =~ s/^/##/gm;
 	#say STDERR "## args:\n$args"; };
 
@@ -76,6 +88,8 @@ sub run_perlpp {
 
 	} else {							# Run perl code under this perl
 		#say STDERR "# running perlpp internal";
+		$instance = Text::PerlPP->new unless $instance;
+
 		#say STDERR "# redirecting stdin";
 		open local(*STDIN), '<', $refStdin or die $!;
 		#say STDERR "# redirected stdin";
@@ -86,7 +100,7 @@ sub run_perlpp {
 			($$refStdout, $$refStderr, @result) = capture {
 				# Thanks to http://www.perlmonks.org/bare/?node_id=289391 by Zaxo
 				#say STDERR "# running perlpp";
-				my $result = Text::PerlPP->new->Main($lrArgs);
+				my $result = $instance->Main($lrArgs);
 				#say STDERR "# done running perlpp";
 				$result;
 			};