test: Convert to Capture::Tiny

Author: jsoref

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
           Module::Build::Tiny
           Devel::Cover
           Devel::Cover::Report::Html
-          IO::Capture::Stderr
+          Capture::Tiny
           Hash::Merge
           Text::Hunspell
           " |sort|xargs)"

t/DictionaryCoverage.t

@@ -6,7 +6,7 @@ use warnings;
 use File::Temp qw/ tempfile tempdir /;
 use File::Basename;
 use Test::More;
-use IO::Capture::Stderr;
+use Capture::Tiny ':all';
 plan tests => 11;
 use_ok('CheckSpelling::DictionaryCoverage');
 
@@ -84,34 +84,24 @@ is($output2, "1-4-0-other:$one_match_name [other:$one_match_name]($one_match) (4
 
 ($fh, $filename) = tempfile();
 close $fh;
-my $capture = IO::Capture::Stderr->new();
-$capture->start();
-CheckSpelling::DictionaryCoverage::main($filename, "no-such-file");
-$capture->stop();
-is((join "\n", $capture->read()), "Couldn't open dictionary \`no-such-file\` (dictionary-not-found)
+my ($stdout, $stderr, @result);
+($stdout, $stderr, @result) = capture { CheckSpelling::DictionaryCoverage::main($filename, "no-such-file"); };
+is($stderr, "Couldn't open dictionary \`no-such-file\` (dictionary-not-found)
 ", 'dictionary-not-found');
 
-$capture = IO::Capture::Stderr->new();
-$capture->start();
-CheckSpelling::DictionaryCoverage::main("/dev/no-such-file", ());
-$capture->stop();
-is((join "\n", $capture->read()), 'Could not read /dev/no-such-file
+($stdout, $stderr, @result) = capture { CheckSpelling::DictionaryCoverage::main("/dev/no-such-file", ()); };
+is($stderr, 'Could not read /dev/no-such-file
 ', 'no-such-file');
 
-$capture = IO::Capture::Stderr->new();
-$capture->start();
-CheckSpelling::DictionaryCoverage::main($filename, "/dev/no-such-file.dic");
-$capture->stop();
-my $dictionary_coverage = (join "\n", $capture ? $capture->read() : ());
+($stdout, $stderr, @result) = capture { CheckSpelling::DictionaryCoverage::main($filename, "/dev/no-such-file.dic"); };
+my $dictionary_coverage = $stderr;
 if ($dictionary_coverage =~ /hunspell-unavailable/) {
 is($dictionary_coverage, 'Could not load Text::Hunspell for `/dev/no-such-file.dic` (hunspell-unavailable)
 ', 'no-such-file');
 } else {
 is($dictionary_coverage, "Couldn't open dictionary `/dev/no-such-file.dic` (dictionary-not-found)
 ", 'no-such-file');
 }
-$capture = IO::Capture::Stderr->new();
-$capture->start();
 ($fh, $filename) = tempfile();
 print $fh 'world
 hello
@@ -120,9 +110,8 @@ worked
 something
 ';
 close $fh;
-CheckSpelling::DictionaryCoverage::main($filename, 't/sample.dic');
-$capture->stop();
-$dictionary_coverage = (join "\n", $capture ? $capture->read() : ());
+($stdout, $stderr, @result) = capture { CheckSpelling::DictionaryCoverage::main($filename, 't/sample.dic'); };
+$dictionary_coverage = $stderr;
 if ($dictionary_coverage =~ /hunspell-unavailable/) {
   is($dictionary_coverage, 'Could not load Text::Hunspell for `t/sample.dic` (hunspell-unavailable)
 ', 'hunspell-unavailable')

t/SpellingCollator.t

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Temp qw/ tempfile tempdir /;
-use IO::Capture::Stderr;
+use Capture::Tiny ':all';
 
 use Test::More;
 plan tests => 34;
@@ -35,18 +35,12 @@ sub stage_test {
 sub run_test {
   my ($directories) = @_;
   my $output = '';
-  open(my $outputFH, '>', \$output) or die; # This shouldn't fail
-  my $oldFH = select $outputFH;
-  my $capture = IO::Capture::Stderr->new();
-  $capture->start();
-  {
+  my ($stdout, $stderr, @result) = capture {
     open my $fh, "<", \$directories;
     local *ARGV = $fh;
     CheckSpelling::SpellingCollator::main();
-  }
-  $capture->stop();
-  select $oldFH;
-  return ($output, (join "\n", $capture->read()));
+  };
+  return ($stdout, $stderr);
 }
 
 sub read_file {
@@ -117,7 +111,6 @@ my $directories = "$directory
 fill_file($early_warnings, "goose (animal)\n");
 my ($output, $error_lines) = run_test($directories);
 is($error_lines, 'Not a directory: /dev/null
-
 Could not find: /dev/no-such-dev
 ');
 check_output_file($warning_output, 'goose (animal)