New upstream version 20210717

[perltidy.git] / t / snippets7.t

diff --git a/t/snippets7.t b/t/snippets7.t
index 078fcb68ea1fdc2ec8f3e0fd51578e7809936b7c..aff36100c3a4fdf680785c7b8dd5a6539f117d70 100644 (file)
--- a/t/snippets7.t
+++ b/t/snippets7.t
@@ -25,7 +25,7 @@
 # To locate test #13 you can search for its name or the string '#13'
 
 use strict;
-use Test;
+use Test::More;
 use Carp;
 use Perl::Tidy;
 my $rparams;
@@ -52,6 +52,7 @@ BEGIN {
 -blbc=1
 -blaol='*'
 -blbcl='*'
+-mbl=2
 ----------
         'rt119970' => "-wn",
     };
@@ -329,10 +330,8 @@ my $y = 2;
             expect => <<'#8...........',
 get(
     on_ready => sub ($worker) { $on_ready->end; return; },
-    on_exit  => sub ( $worker, $status ) {
-        return;
-    },
-    on_data => sub ($data) { $self->_on_data(@_) if $self; return; }
+    on_exit  => sub ( $worker, $status ) { return; },
+    on_data  => sub ($data) { $self->_on_data(@_) if $self; return; }
 );
 #8...........
         },
@@ -535,32 +534,39 @@ foreach my $key ( sort keys %{$rtests} ) {
         perltidyrc  => \$params,
         argv        => '',             # for safety; hide any ARGV from perltidy
         stderr      => \$stderr_string,
-        errorfile => \$errorfile_string,    # not used when -se flag is set
+        errorfile   => \$errorfile_string,    # not used when -se flag is set
     );
     if ( $err || $stderr_string || $errorfile_string ) {
+        print STDERR "Error output received for test '$key'\n";
         if ($err) {
-            print STDERR
-"This error received calling Perl::Tidy with '$sname' + '$pname'\n";
+            print STDERR "An error flag '$err' was returned\n";
             ok( !$err );
         }
         if ($stderr_string) {
             print STDERR "---------------------\n";
             print STDERR "<<STDERR>>\n$stderr_string\n";
             print STDERR "---------------------\n";
-            print STDERR
-"This error received calling Perl::Tidy with '$sname' + '$pname'\n";
             ok( !$stderr_string );
         }
         if ($errorfile_string) {
             print STDERR "---------------------\n";
             print STDERR "<<.ERR file>>\n$errorfile_string\n";
             print STDERR "---------------------\n";
-            print STDERR
-"This error received calling Perl::Tidy with '$sname' + '$pname'\n";
             ok( !$errorfile_string );
         }
     }
     else {
-        ok( $output, $expect );
+        if ( !is( $output, $expect, $key ) ) {
+            my $leno = length($output);
+            my $lene = length($expect);
+            if ( $leno == $lene ) {
+                print STDERR
+"#> Test '$key' gave unexpected output.  Strings differ but both have length $leno\n";
+            }
+            else {
+                print STDERR
+"#> Test '$key' gave unexpected output.  String lengths differ: output=$leno, expected=$lene\n";
+            }
+        }
     }
 }