New upstream version 20210717

[perltidy.git] / t / snippets11.t

diff --git a/t/snippets11.t b/t/snippets11.t
index 0878f4fd6aebaa31802d0fa09f0c39bf254f41bf..b417965e5cede555bb2a930625183b157e5970c2 100644 (file)
--- a/t/snippets11.t
+++ b/t/snippets11.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;
@@ -95,7 +95,7 @@ $a->();
 ----------
 
         'switch1' => <<'----------',
-sub classify_digit($digit)
+sub classify_digit ($digit)
   { switch($digit)
     { case 0 { return 'zero' } case [ 2, 4, 6, 8 ]{ return 'even' }
         case [ 1, 3, 4, 7, 9 ]{ return 'odd' } case /[A-F]/i { return 'hex' } }
@@ -289,7 +289,7 @@ $a->();
             source => "switch1",
             params => "def",
             expect => <<'#3...........',
-sub classify_digit($digit) {
+sub classify_digit ($digit) {
     switch ($digit) {
         case 0 { return 'zero' }
         case [ 2, 4, 6, 8 ]{ return 'even' }
@@ -573,32 +573,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";
+            }
+        }
     }
 }