Merge pull request #814 from gugod/replace-test-output

Replace Test::Output

Build.PL

@@ -1,4 +1,4 @@
-# This Build.PL for App-perlbrew was generated by mbtiny 0.041.
+# This Build.PL for App-perlbrew was generated by mbtiny 0.047.
 use 5.008;
 use Module::Build::Tiny 0.039;
 Build_PL();

META.json

@@ -4,7 +4,7 @@
       "Kang-min Liu  C<< <[email protected]> >>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "App::ModuleBuildTiny version 0.041",
+   "generated_by" : "App::ModuleBuildTiny version 0.047",
    "license" : [
       "mit"
    ],
@@ -21,7 +21,7 @@
       },
       "develop" : {
          "requires" : {
-            "App::ModuleBuildTiny" : "0.041",
+            "App::ModuleBuildTiny" : "0.047",
             "Pod::Markdown" : "2.002"
          }
       },
@@ -48,7 +48,6 @@
             "Test2::V0" : "0.000163",
             "Test::More" : "1.001002",
             "Test::NoWarnings" : "1.04",
-            "Test::Output" : "1.03",
             "Test::Simple" : "1.001002",
             "Test::TempDir::Tiny" : "0.016"
          }

META.yml

@@ -11,13 +11,12 @@ build_requires:
   Test2::V0: '0.000163'
   Test::More: '1.001002'
   Test::NoWarnings: '1.04'
-  Test::Output: '1.03'
   Test::Simple: '1.001002'
   Test::TempDir::Tiny: '0.016'
 configure_requires:
   Module::Build::Tiny: '0.039'
 dynamic_config: 0
-generated_by: 'App::ModuleBuildTiny version 0.041, CPAN::Meta::Converter version 2.150010'
+generated_by: 'App::ModuleBuildTiny version 0.047, CPAN::Meta::Converter version 2.150010'
 license: mit
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html

cpanfile

@@ -17,7 +17,6 @@ on test => sub {
     requires 'Path::Class'          => '0.33';
     requires 'Test::More'           => '1.001002';
     requires 'Test::NoWarnings'     => '1.04';
-    requires 'Test::Output'         => '1.03';
     requires 'Test::Simple'         => '1.001002';
     requires 'Test::TempDir::Tiny'  => '0.016';
     requires 'Test2::V0'            => '0.000163';

t/PerlbrewTestHelpers.pm

@@ -0,0 +1,48 @@
+package PerlbrewTestHelpers;
+use Test2::V0;
+use Test2::Plugin::IOEvents;
+
+use Exporter 'import';
+our @EXPORT_OK = qw(stderr_from stderr_is stderr_like stdout_from stdout_is stdout_like);
+
+# Replacements of Test::Output made by using Test2::Plugin::IOEvents
+
+sub ioevents_from {
+    my ($cb) = @_;
+    return grep { $_->tag eq 'STDOUT' || $_->tag eq 'STDERR' }
+        map { @{ $_->facets->{info} } }
+        @{ intercept(sub { $cb->() }) };
+}
+
+sub stderr_from (&) {
+    my ($cb) = @_;
+    join "", map { $_->details } grep { $_->tag eq 'STDERR' } ioevents_from($cb);
+}
+
+sub stderr_is (&$;$) {
+    my ($cb, $expected, $desc) = @_;
+    is(stderr_from(sub { $cb->() }), $expected, $desc);
+}
+
+sub stderr_like (&$;$) {
+    my ($cb, $re, $desc) = @_;
+    like(stderr_from(sub { $cb->() }), $re, $desc);
+}
+
+sub stdout_from (&) {
+    my ($cb) = @_;
+    return join "", map { $_->details } grep { $_->tag eq 'STDOUT' } ioevents_from($cb);
+}
+
+sub stdout_is (&$;$) {
+    my ($cb, $expected, $desc) = @_;
+    is(stdout_from(sub { $cb->() }), $expected, $desc);
+}
+
+sub stdout_like (&$;$) {
+    my ($cb, $re, $desc) = @_;
+    like(stdout_from(sub { $cb->() }), $re, $desc);
+}
+
+
+1;

t/command-alias.t

@@ -1,16 +1,15 @@
 #!/usr/bin/env perl
 use Test2::V0;
 use Test2::Tools::Spec;
+use Config;
 
 BEGIN { $ENV{SHELL} = "/bin/bash" }
 
 use FindBin;
 use lib $FindBin::Bin;
 use App::perlbrew;
 require "test2_helpers.pl";
-
-use Test::Output;
-use Config;
+use PerlbrewTestHelpers qw(stderr_like);
 
 mock_perlbrew_install("perl-5.14.1");
 mock_perlbrew_lib_create('perl-5.14.1@nobita');

t/command-available.t

@@ -2,9 +2,14 @@
 use Test2::V0;
 use Test2::Tools::Spec;
 use File::Temp qw( tempdir );
-use Test::Output;
 
+use FindBin;
+use lib $FindBin::Bin;
 use App::perlbrew;
+require "test2_helpers.pl";
+
+use PerlbrewTestHelpers qw(stdout_like);
+
 $App::perlbrew::PERLBREW_ROOT = my $perlbrew_root = tempdir( CLEANUP => 1 );
 $App::perlbrew::PERLBREW_HOME = my $perlbrew_home = tempdir( CLEANUP => 1 );
 

t/command-compgen.t

@@ -6,8 +6,7 @@ use FindBin;
 use lib $FindBin::Bin;
 use App::perlbrew;
 require "test2_helpers.pl";
-
-use Test::Output qw( stdout_from );
+use PerlbrewTestHelpers qw( stdout_from );
 
 $ENV{PERLBREW_DEBUG_COMPLETION} = 0;
 

t/command-env.t

@@ -1,16 +1,15 @@
 #!/usr/bin/env perl
 use Test2::V0;
 use Test2::Tools::Spec;
+use Config;
 
 BEGIN { $ENV{SHELL} = "/bin/bash" }
 
 use FindBin;
 use lib $FindBin::Bin;
 use App::perlbrew;
 require "test2_helpers.pl";
-
-use Test::Output;
-use Config;
+use PerlbrewTestHelpers qw(stdout_is);
 
 mock_perlbrew_install("perl-5.14.1");
 mock_perlbrew_lib_create('perl-5.14.1@nobita');

t/command-exec.t

@@ -6,8 +6,7 @@ use FindBin;
 use lib $FindBin::Bin;
 use App::perlbrew;
 require 'test2_helpers.pl';
-
-use Test::Output;
+use PerlbrewTestHelpers qw(stderr_is);
 
 mock_perlbrew_install("perl-5.12.3");
 mock_perlbrew_install("perl-5.12.4");

t/command-info.t

@@ -1,11 +1,14 @@
 #!/usr/bin/env perl
 use Test2::V0;
 use Test2::Tools::Spec;
-use Test::Output;
 use File::Spec;
 use Config;
 
+use FindBin;
+use lib $FindBin::Bin;
 use App::perlbrew;
+require "test2_helpers.pl";
+use PerlbrewTestHelpers qw(stdout_like);
 
 describe "info command" => sub {
     it "should display info if under perlbrew perl" => sub {

t/test2_helpers.pl

@@ -15,9 +15,13 @@
 =cut
 
 use Test2::V0;
+use Test2::Plugin::IOEvents;
 use IO::All;
 use File::Temp qw( tempdir );
 
+use App::Perlbrew::Path;
+use App::Perlbrew::Path::Root;
+
 no warnings 'redefine';
 sub dir {
     App::Perlbrew::Path->new(@_);