Began switching tests to Capture::Tiny

Chris White · Chris White · commit 4d7592634fc2 · 2018-05-20T14:09:31.000-04:00
diff --git a/Makefile.PL b/Makefile.PL
@@ -2,18 +2,26 @@ use 5.010;
 use strict;
 use warnings;
 use ExtUtils::MakeMaker;
+use Config;
 
-sub MY::postamble {
+# Get the filename of the Perl interpreter running this.  From perlvar.
+my $secure_perl_path = $Config{perlpath};
+if ($^O ne 'VMS') {
+    $secure_perl_path .= $Config{_exe}
+        unless $secure_perl_path =~ m/$Config{_exe}$/i;
+}
+
+sub MY::postamble {     # TODO also handle Windows nmake syntax (SET vs. export)
     return <<EOT;
 authortest:
 \tRELEASE_TESTING=1 prove -l xt"
 
 testhere:   # Run the tests from lib rather than blib
-\texport PERLPP_CMD="perl -Ilib bin/perlpp"; \\
+\texport PERLPP_CMD="\\\"$secure_perl_path\\\" -Ilib bin/perlpp"; \\
 \tperl -Ilib -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
 
 testpacked: pack    # Test the packed version
-\texport PERLPP_NOUSE=1 PERLPP_CMD="perl blib/perlpp"; \\
+\texport PERLPP_NOUSE=1 PERLPP_CMD="\\\"$secure_perl_path\\\" blib/perlpp"; \\
 \tperl -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
 EOT
 } #postamble
@@ -35,6 +43,7 @@ WriteMakefile(
         'IPC::Run3' => '0',
         'Test::More' => '0',
     },
+    # TODO add TEST_REQUIRES
     PREREQ_PM => {
         'Getopt::Long'     => '2.5',    # Per issue #17
         'Pod::Usage'       => '0',
diff --git a/t/00-load.t b/t/00-load.t
@@ -3,16 +3,27 @@ use 5.010;
 use strict;
 use warnings;
 use Test::More;
+use rlib './lib';
 
 BEGIN {
-	if($ENV{PERLPP_NOUSE} || 0) {
-		plan skip_all => 'Loading not tested in this configuration (PERLPP_NOUSE)';
-	} else {
-		plan tests => 1;
-		use_ok( 'Text::PerlPP' ) || print "Bail out!\n";
-		diag("Included from $INC{'Text/PerlPP.pm'}");
-	}
-}
+    if($ENV{PERLPP_NOUSE} || 0) {
+        plan skip_all => 'Loading not tested in this configuration (PERLPP_NOUSE)';
+    } else {
+        plan tests => 2;
+        unless(use_ok( 'Text::PerlPP' )) {
+            diag("@INC is:\n  ", join("\n  ", @INC), "\n");
+            BAIL_OUT("Cannot load Text::PerlPP");
+        };
+
+        unless(use_ok( 'PerlPPTest' )) {
+            diag("@INC is:\n  ", join("\n  ", @INC), "\n");
+            BAIL_OUT("Cannot load PerlPPTest");
+        };
+        diag("Running as $0");
+        diag("Text::PerlPP included from $INC{'Text/PerlPP.pm'}");
+        diag("PerlPPTest included from $INC{'PerlPPTest.pm'}");
+    }
+} # BEGIN
 
 done_testing();
 # vi: set ts=4 sts=4 sw=4 et ai: #
diff --git a/t/01-capture.t b/t/01-capture.t
@@ -0,0 +1,16 @@
+#!perl
+# Some basic tests for perlpp
+use rlib './lib';
+use PerlPPTest;
+
+my ($stdout, $stderr, @result);
+($stdout, $stderr, @result) = capture {
+    local *STDIN;
+    close STDIN;
+    Text::PerlPP::Main(['-e','say 42;']);
+};
+
+is($stdout, "42\n");
+
+done_testing();
+# vi: set ts=4 sts=4 sw=4 et ai: #
diff --git a/t/02-basic.t b/t/02-basic.t
@@ -1,14 +1,14 @@
 #!/usr/bin/env perl -W
 # Some basic tests for perlpp
-use strict;
-use warnings;
-use Test::More;
-use IPC::Run3;
-use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
-diag "perlpp command: " . CMD;
-(my $whereami = __FILE__) =~ s/01-basic\.t$//;
+use rlib './lib';
+use PerlPPTest;
 
-my ($in, $out, $err);
+use IPC::Run3;
+#use constant CMD => ($ENV{PERLPP_CMD} || "$^X -Iblib/lib blib/script/perlpp");
+#	# TODO use $^X even if a PERLPP_CMD is provided.
+#diag "perlpp command: " . CMD;
+(my $whereami = __FILE__) =~ s/02-basic\.t$//;
+diag join(' ', 'File is' . __FILE__, 'whereami', $whereami);
 
 my @testcases=(
 	# [$in (the script), $out (expected output), $err (stderr output, if any)]
@@ -46,10 +46,14 @@ plan tests => scalar @testcases;
 
 for my $lrTest (@testcases) {
 	my ($testin, $refout, $referr) = @$lrTest;
-	run3 CMD, \$testin, \$out, \$err;
+
+	my ($in, $out, $err);
+	run_perlpp [], \$testin, \$out, \$err;
+
 	if(defined $refout) {
 		is($out, $refout);
 	}
+
 	if(defined $referr) {
 		is($err, $referr);
 	}
diff --git a/t/02-readme.t b/t/02-readme.t
@@ -1,10 +1,8 @@
 #!/usr/bin/env perl -W
 # Tests from perlpp's README.md and bin/perlpp's POD.
-use strict;
-use warnings;
-use Test::More;
-use IPC::Run3;
 use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
+use rlib './lib';
+use PerlPPTest;
 
 my ($in, $out, $err);
 
diff --git a/t/03-cmdline.t b/t/03-cmdline.t
@@ -1,10 +1,8 @@
 #!/usr/bin/env perl -W
 # Tests of perlpp command-line options
-use strict;
-use warnings;
-use Test::More;
-use IPC::Run3;
 use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
+use rlib './lib';
+use PerlPPTest;
 
 my @testcases=(
 	# [$cmdline_options, $in (the script), $out_re (expected output),
@@ -111,21 +109,25 @@ for my $lrTest (@testcases) {
 }
 
 plan tests => $testcount;
+diag "Running $testcount tests";
 
 for my $lrTest (@testcases) {
 	my ($opts, $testin, $out_re, $err_re) = @$lrTest;
 
 	my ($out, $err);
-	#print STDERR CMD . " $opts", " <<<'", $testin, "'\n";
-	run3 CMD . " $opts", \$testin, \$out, \$err;
+	diag "$opts", " <<<'", $testin, "'\n";
+	run_perlpp $opts, \$testin, \$out, \$err;
+	diag "Done running";
 
 	if(defined $out_re) {
+		diag "checking output";
 		like($out, $out_re);
 	}
 	if(defined $err_re) {
+		diag "checking stderr";
 		like($err, $err_re);
 	}
-	#print STDERR "$err\n";
+	print STDERR "$err\n";
 
 } # foreach test
 
diff --git a/t/03-idempotency.t b/t/03-idempotency.t
@@ -1,11 +1,8 @@
 #!/usr/bin/env perl -W
 # Test running perlpp on itself - nothing should change.
 # Always uses the Text/PerlPP.pm in lib, for simplicity.
-use strict;
-use warnings;
-use Test::More tests => 1;
-use IPC::Run3;
-
+use rlib './lib';
+use PerlPPTest;
 use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp')
 	. ' lib/Text/PerlPP.pm';
 diag 'idempotency-test command: ' . CMD;
diff --git a/t/04-include.t b/t/04-include.t
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl -W
 # Tests of :include, :macro Include, :immediate ProcessFile
-use strict;
-use warnings;
-use Test::More;
-use IPC::Run3;
+use rlib './lib';
+use PerlPPTest;
 use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 
 (my $whereami = __FILE__) =~ s/04-include\.t$//;
diff --git a/t/05-external-command.t b/t/05-external-command.t
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl -W
 # Tests of perlpp <?!...?> external commands
-use strict;
-use warnings;
-use Test::More;
-use IPC::Run3;
+use rlib './lib';
+use PerlPPTest;
 use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 
 (my $whereami = __FILE__) =~ s/macro\.t$//;
diff --git a/t/06-macro.t b/t/06-macro.t
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl -W
 # Tests of perlpp :macro and related
-use strict;
-use warnings;
-use Test::More 'no_plan';
-use IPC::Run3;
+use rlib './lib';
+use PerlPPTest;
 use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 
 (my $whereami = __FILE__) =~ s/06-macro\.t$//;
diff --git a/t/07-invalid.t b/t/07-invalid.t
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl -W
 # Testing perlpp with invalid input
-use strict;
-use warnings;
-use Test::More;
-use IPC::Run3;
+use rlib './lib';
+use PerlPPTest;
 use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 (my $whereami = __FILE__) =~ s/07-invalid\.t$//;
 diag "perlpp command " . CMD . "; whereami $whereami.";
diff --git a/t/lib/PerlPPTest.pm b/t/lib/PerlPPTest.pm
@@ -0,0 +1,95 @@
+#!perl
+# PerlPPTest.pm: test kit for Text::PerlPP
+
+package PerlPPTest;
+
+use 5.010001;
+use feature ':5.10';
+
+use strict;
+use warnings;
+
+use parent 'Exporter';
+use Import::Into;
+
+use Test::More;
+use Text::PerlPP;
+use Capture::Tiny 'capture';
+use Carp;
+use Config;
+use IPC::Run3;
+
+use Data::Dumper;
+
+our @EXPORT = qw(run_perlpp);
+our @EXPORT_OK = qw(get_perl_filename);
+
+# run_perlpp: Run perlpp
+# Args: $lrArgs, $refStdin, $refStdout, $refStderr
+sub run_perlpp {
+	my ($lrArgs, $refStdin, $refStdout, $refStderr) = @_;
+	my $retval;
+
+	$lrArgs = [split(' ', $lrArgs)] if ref $lrArgs ne 'ARRAY';
+
+	if($ENV{PERLPP_PERLOPTS}) {
+		say STDERR "# running external perl";
+		$retval = run3(
+			join(' ', get_perl_filename(), $ENV{PERLPP_PERLOPTS},
+				@$lrArgs),
+			$refStdin, $refStdout, $refStderr);
+		# TODO figure out $?, retval, &c.
+
+	} else {
+		say STDERR "# running perlpp internal";
+		say STDERR "# redirecting stdin";
+		open local(*STDIN), '<', $refStdin or die $!;
+		say STDERR "# redirected stdin";
+
+		my @result;
+		say STDERR "# before capture";
+		eval {
+		($$refStdout, $$refStderr, @result) = capture {
+			# Thanks to http://www.perlmonks.org/bare/?node_id=289391 by Zaxo
+			say STDERR "# running perlpp";
+			my $result = Text::PerlPP::Main($lrArgs);
+			say STDERR "# done running perlpp";
+			$result;
+		};
+		} or die "Capture failed: " . $@;
+		say STDERR "# after capture";
+		close STDIN;
+		$retval = $result[0] if @result;
+	}
+
+	return $retval;
+} #run_perlpp
+
+# Get the filename of the Perl interpreter running this.  From perlvar.
+sub get_perl_filename {
+	my $secure_perl_path = $Config{perlpath};
+	if ($^O ne 'VMS') {
+		$secure_perl_path .= $Config{_exe}
+			unless $secure_perl_path =~ m/$Config{_exe}$/i;
+	}
+	return $secure_perl_path;
+} # get_perl_filename()
+
+sub import {
+	my $target = caller;
+
+	# Copy symbols listed in @EXPORT first, in case @_ gets trashed later.
+	PerlPPTest->export_to_level(1, @_);
+
+	# Re-export packages
+	feature->import::into($target, ':5.10');
+	Capture::Tiny->import::into($target, qw(capture capture_stdout));
+	Carp->import::into($target, qw(carp croak confess));
+
+	foreach my $package (qw(strict warnings Test::More Text::PerlPP)) {
+		$package->import::into($target);
+	};
+} #import
+
+1;
+# vi: set ts=4 sts=0 sw=4 noet ai fdm=marker fdl=1: #
