improved test case error messages

diff --git a/t/snippets/make_t.pl b/t/snippets/make_t.pl
index 78a27c51ddc7f7d37072623217bd50c6d56f2ce2..9c1820158e2be5f49de6ee3fada07ae13846bdde 100755 (executable)
--- a/t/snippets/make_t.pl
+++ b/t/snippets/make_t.pl
@@ -91,11 +91,14 @@ my @exp = glob("$ipath*");
 #print "exp=(@exp)\n";
 my $ix      = 0;
 my $rix_lookup = {};
-foreach my $file_exp (@exp) {
+my %is_basename;
+foreach my $file_exp (sort @exp) {
     my $estring = $get_string->($file_exp);
     my $ename   = $file_exp;
     if ( $ename =~ /([^\/]+)$/ ) { $ename = $1 }
     my ( $sname, $pname ) = split /\./, $ename;
+    my $sroot = ( $sname =~ /^([^\d]+)/ ) ? $1 : $sname;
+    if ( $sroot ne $sname && $pname ne 'def' ) { $is_basename{$pname}++ }
 
     $get_source->($sname);
     $get_param->($pname);
@@ -104,6 +107,46 @@ foreach my $file_exp (@exp) {
     $ix++;
 }
 
+# Find the base names.  NOTE: I tried packing by basename, which makes tracking
+# down errors a little easier, and makes the files change less frequently, but
+# the run times increased too much over the 'snippets*.t' packing method.  For
+# example, here are times recorded in April 2020 
+
+#    packing in 20 files, snippets1.t ... snippets20.t: 17.7 s 
+#    packing in 226 files, 105484.t ...  wngnu1.t:      44.7 s 
+
+# so there is over a factor of 2 increase in run time for the convenience of
+# packing by base name.  The extra time is due to continually reloading
+# perltidy for tiny snippets of code. Since I run 'make test' frequently, I
+# decided to stay with the snippets*.t packing.  I have left the base name
+# coding in just in case I ever need the basenames.
+
+my $rpacking_by_basename = {};
+foreach my $item ( @{$rtests} ) {
+    my ( $ename, $pname, $sname, $estring ) = @{$item};
+
+    # The base name is either $sname or $sroot
+    my $basename;
+    my $proot = ( $pname =~ /^([^\d]+)/ ) ? $1 : $pname;
+    my $sroot = ( $sname =~ /^([^\d]+)/ ) ? $1 : $sname;
+
+    if    ( $sname eq $pname ) { $basename = $sname }
+    elsif ( $sname eq $sroot ) { $basename = $sname }
+    elsif ( $sroot eq $proot ) { $basename = $sroot }
+    elsif ( $pname eq 'def' ) {
+        if   ( $is_basename{$sroot} ) { $basename = $sroot }
+        else                          { $basename = $sname }
+    }
+    else {
+        # shouldn't happen
+        $basename = "$sname-$pname";
+        print STDERR
+          "Unexpected filename $sname.$pname, using basename=$basename\n";
+    }
+    push @{$item}, $basename;
+    push @{ $rpacking_by_basename->{$basename} }, $item;
+}
+
 # assign indexes to existing packing locations 
 my $rassigned;
 my $rcount;
@@ -187,6 +230,23 @@ EOM
 write_packing_list("$fpacking_list", $rpacking_list);
 print "Now run a 'make test' from the top directory to check these\n";
 
+# Example showing how to pack the snippet files using base names
+# See above note on the problem this causes with run times
+if (0) {
+    foreach my $basename ( sort keys %{$rpacking_by_basename} ) {
+        my @tests = @{ $rpacking_by_basename->{$basename} };
+        my $ofile = "/tmp/t/$basename.t";    ## FIXME: Just for testing
+        my $num   = @tests;
+        if ($num) {
+            make_snippet_t( $ofile, \@tests, $rparams, $rsources );
+            print "writing $num tests to $ofile\n";
+        }
+        else {
+            print STDERR "Strange; no files for $basename\n";
+        }
+    }
+}
+
 sub write_packing_list {
     my ( $ofile, $rpacking ) = @_;
     if (-e $ofile) {system "mv $ofile $ofile.bak"}
@@ -405,30 +465,37 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }
 EOM

diff --git a/t/snippets1.t b/t/snippets1.t
index b18edac3dfa3af229ef0a92220090bd5aea0cd90..30903c4680f182f72a45f46fb7d9c4dbf2fc4c75 100644 (file)
--- a/t/snippets1.t
+++ b/t/snippets1.t
@@ -537,29 +537,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets10.t b/t/snippets10.t
index 944ffde5657ad620a962b93bc3d5ed08e75f6fd6..231cbcc9734cfc67bbd6993164cfef45c21fcc24 100644 (file)
--- a/t/snippets10.t
+++ b/t/snippets10.t
@@ -1011,29 +1011,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets11.t b/t/snippets11.t
index edf75508e88a48e7f8f585bedd955d1e0556ad9e..eba9fcd8ba90f76db6e96140695e6b592c92544d 100644 (file)
--- a/t/snippets11.t
+++ b/t/snippets11.t
@@ -576,29 +576,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets12.t b/t/snippets12.t
index e35da61440afcf360e6e7dc28caf760e8a281824..7531ef364ebad0a23f08c5c37a35ccb4b5d939cd 100644 (file)
--- a/t/snippets12.t
+++ b/t/snippets12.t
@@ -590,29 +590,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets13.t b/t/snippets13.t
index 67bd8e0c5abb659a7d00abd9f8b2b3d335fc5f7b..257c1e4a8044b9a8a3f98608aeb40c6590502e71 100644 (file)
--- a/t/snippets13.t
+++ b/t/snippets13.t
@@ -450,29 +450,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets14.t b/t/snippets14.t
index 731f0bbe0d7e564b030f382076afd84020d6997f..59a36c8fa572828620101587f38ddc9f5e2d089e 100644 (file)
--- a/t/snippets14.t
+++ b/t/snippets14.t
@@ -1057,29 +1057,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets15.t b/t/snippets15.t
index 76dae13d9142ebdc7c997524f4dd63f50fdd809d..e3ee645cfafee39ada514b16b993f24a5bf07da5 100644 (file)
--- a/t/snippets15.t
+++ b/t/snippets15.t
@@ -518,29 +518,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets16.t b/t/snippets16.t
index 5a67997e997f3847c4e6d974651f9b92b8d9964a..768304f9ad57c2725c6509885f801e9d2a29d873 100644 (file)
--- a/t/snippets16.t
+++ b/t/snippets16.t
@@ -462,29 +462,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets17.t b/t/snippets17.t
index 22b3ca304720dbe0c59484b2f34e7ec4df9914d2..7d973fd2812e8bc26e251647d49744a7ca7ce1e2 100644 (file)
--- a/t/snippets17.t
+++ b/t/snippets17.t
@@ -1018,29 +1018,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets18.t b/t/snippets18.t
index 140b62adaf736fd498b7a3bd4a2ba474d87fc898..7f7c6716abd8bb84cbadfb67d6e3971636d6ba54 100644 (file)
--- a/t/snippets18.t
+++ b/t/snippets18.t
@@ -670,29 +670,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets19.t b/t/snippets19.t
index ceef46da8972b493c12af87f377a3ca4ed7cc660..b40eb2e021d1a8fa2720a3c72b6c89a2e85549b1 100644 (file)
--- a/t/snippets19.t
+++ b/t/snippets19.t
@@ -445,29 +445,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets2.t b/t/snippets2.t
index ef199cfc02381d515cd56f0db7a03267868bb58b..1ffb7d64ad448e4b5f860ae35a740a4260c7a0dc 100644 (file)
--- a/t/snippets2.t
+++ b/t/snippets2.t
@@ -522,29 +522,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets20.t b/t/snippets20.t
index df6753fb81dd07c071a960a1a01b2adcc9a8c933..b1070e62e1ba7fc9041013cc29358b6c1f243106 100644 (file)
--- a/t/snippets20.t
+++ b/t/snippets20.t
@@ -97,29 +97,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets3.t b/t/snippets3.t
index 725ee9f0736101d96c3b2d46737a17f2ae6f1a94..ee5508c7c955e5541a6da2c35e669cfc3109d4c7 100644 (file)
--- a/t/snippets3.t
+++ b/t/snippets3.t
@@ -843,29 +843,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets4.t b/t/snippets4.t
index 7de24453decceb45f1318eca2d909d9bcc07ad51..40eb8e6e21d0af03d78faf1b5c946816d37d53e5 100644 (file)
--- a/t/snippets4.t
+++ b/t/snippets4.t
@@ -545,29 +545,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets5.t b/t/snippets5.t
index fffdcf8c6869312b8c06dbf4f4f2855e9d149263..ac9eed51c6051515ad2bcd1631f0f1e03619e044 100644 (file)
--- a/t/snippets5.t
+++ b/t/snippets5.t
@@ -943,29 +943,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets6.t b/t/snippets6.t
index 4bfdcc6b8970e790eef7150acbdf1430dbd401fa..dccba331d4f9c3a45db10fbcde11be2357db52b5 100644 (file)
--- a/t/snippets6.t
+++ b/t/snippets6.t
@@ -433,29 +433,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets7.t b/t/snippets7.t
index b295447108e82419b77a2cf6f958d626314ca04a..dae9f6c780d5987b8e48d1b8d6c02fc9e1bae087 100644 (file)
--- a/t/snippets7.t
+++ b/t/snippets7.t
@@ -538,29 +538,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets8.t b/t/snippets8.t
index 3b80a40a8235df0d57a0aa18b938627cada7a838..a90c35a6705f3f76b8fc1cbac67e4e9269655a53 100644 (file)
--- a/t/snippets8.t
+++ b/t/snippets8.t
@@ -480,29 +480,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }

diff --git a/t/snippets9.t b/t/snippets9.t
index c187d93fb0288485fac849c4dc83a8fc1ef9a45c..de7ebd8c04c6e9868780b20245a83057897e67fa 100644 (file)
--- a/t/snippets9.t
+++ b/t/snippets9.t
@@ -502,29 +502,36 @@ foreach my $key ( sort keys %{$rtests} ) {
         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 {
-        is( $output, $expect, "$sname.$pname" );
+        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";
+            }
+        }
     }
 }