X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2Fsnippets13.t;h=8ffce858c75a655aefc5349b82aea78eb1d618ec;hb=59059cb760c81f70180a9c28d58e7bf94a1898b1;hp=8d7bccdc4523e92a5a12cbb35a7cdfc5f31e4367;hpb=7f27e55dce5925b2bbe8fcfca64f385e917a52be;p=perltidy.git

diff --git a/t/snippets13.t b/t/snippets13.t
index 8d7bccd..8ffce85 100644
--- a/t/snippets13.t
+++ b/t/snippets13.t
@@ -24,7 +24,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;
@@ -107,7 +107,7 @@ use constant {
 ----------
 
         'align20' => <<'----------',
-# marginal two-line match; differnt lhs patterns; do not align
+# marginal two-line match; different lhs patterns; do not align
 $w[$i] = $t;
 $t = 1000000;
 ----------
@@ -139,7 +139,7 @@ my $abc = "abc";
 ----------
 
         'align24' => <<'----------',
-# Do not align interior fat commas here; differnt container types
+# Do not align interior fat commas here; different container types
 my $p    = TAP::Parser::SubclassTest->new(
     {
         exec    => [ $cat            => $file ],
@@ -149,7 +149,7 @@ my $p    = TAP::Parser::SubclassTest->new(
 ----------
 
         'align25' => <<'----------',
-# do not align commas here; different container types
+# do not align internal commas here; different container types
 is_deeply( [ $a,        $a ], [ $b,               $c ] );
 is_deeply( { foo => $a, bar => $a }, { foo => $b, bar => $c } );
 is_deeply( [ \$a,       \$a ], [ \$b,             \$c ] );
@@ -220,8 +220,8 @@ my $account   = "Insert into accountlines
             params => "def",
             expect => <<'#3...........',
     my $type   = shift || "o";
-    my $fname  = ( $type eq 'oo' ? 'orte_city' : 'orte' );
-    my $suffix = ( $coord_system eq 'standard' ? '' : '-orig' );
+    my $fname  = ( $type eq 'oo'               ? 'orte_city' : 'orte' );
+    my $suffix = ( $coord_system eq 'standard' ? ''          : '-orig' );
 #3...........
         },
 
@@ -331,7 +331,7 @@ return (
             source => "align20",
             params => "def",
             expect => <<'#12...........',
-# marginal two-line match; differnt lhs patterns; do not align
+# marginal two-line match; different lhs patterns; do not align
 $w[$i] = $t;
 $t = 1000000;
 #12...........
@@ -379,7 +379,7 @@ my $abc  = "abc";
             source => "align24",
             params => "def",
             expect => <<'#16...........',
-# Do not align interior fat commas here; differnt container types
+# Do not align interior fat commas here; different container types
 my $p = TAP::Parser::SubclassTest->new(
     {
         exec    => [ $cat => $file ],
@@ -393,10 +393,10 @@ my $p = TAP::Parser::SubclassTest->new(
             source => "align25",
             params => "def",
             expect => <<'#17...........',
-# do not align commas here; different container types
-is_deeply( [ $a, $a ], [ $b, $c ] );
+# do not align internal commas here; different container types
+is_deeply( [ $a, $a ],               [ $b, $c ] );
 is_deeply( { foo => $a, bar => $a }, { foo => $b, bar => $c } );
-is_deeply( [ \$a, \$a ], [ \$b, \$c ] );
+is_deeply( [ \$a, \$a ],             [ \$b, \$c ] );
 
 #17...........
         },
@@ -447,32 +447,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";
+            }
+        }
     }
 }