switch to Test::More

diff --git a/t/snippets/expect/spp.def b/t/snippets/expect/spp.def
index 4b8e38c6dfe86dffd0d1970a0126227a0bb50c44..9e8da408cd2cd7d0373bacaed96c710e9fed4ac6 100644 (file)
--- a/t/snippets/expect/spp.def
+++ b/t/snippets/expect/spp.def
@@ -3,3 +3,5 @@ sub get_val() { }
 sub get_Val () { }
 
 sub Get_val () { }
+my $sub1 = sub () { };
+my $sub2 = sub () { };

diff --git a/t/snippets/expect/spp.spp0 b/t/snippets/expect/spp.spp0
index f663642fb3511a8d5ba41282d7d624026e79645e..821616b6367341e1ed62d77210d9471b6e82652c 100644 (file)
--- a/t/snippets/expect/spp.spp0
+++ b/t/snippets/expect/spp.spp0
@@ -3,3 +3,5 @@ sub get_val() { }
 sub get_Val() { }
 
 sub Get_val() { }
+my $sub1 = sub() { };
+my $sub2 = sub() { };

diff --git a/t/snippets/expect/spp.spp1 b/t/snippets/expect/spp.spp1
index 4b8e38c6dfe86dffd0d1970a0126227a0bb50c44..9e8da408cd2cd7d0373bacaed96c710e9fed4ac6 100644 (file)
--- a/t/snippets/expect/spp.spp1
+++ b/t/snippets/expect/spp.spp1
@@ -3,3 +3,5 @@ sub get_val() { }
 sub get_Val () { }
 
 sub Get_val () { }
+my $sub1 = sub () { };
+my $sub2 = sub () { };

diff --git a/t/snippets/expect/spp.spp2 b/t/snippets/expect/spp.spp2
index 7cd649c9868a6c83b33204f590d94466ea5b1575..4fb5032aa15605bcc5046b3a29d5ca331e6507f3 100644 (file)
--- a/t/snippets/expect/spp.spp2
+++ b/t/snippets/expect/spp.spp2
@@ -3,3 +3,5 @@ sub get_val () { }
 sub get_Val () { }
 
 sub Get_val () { }
+my $sub1 = sub () { };
+my $sub2 = sub () { };

diff --git a/t/snippets/make_t.pl b/t/snippets/make_t.pl
index 56d6558735c5139f153362c8e37bf9d335bda435..78a27c51ddc7f7d37072623217bd50c6d56f2ce2 100755 (executable)
--- a/t/snippets/make_t.pl
+++ b/t/snippets/make_t.pl
@@ -283,7 +283,7 @@ $ename_string
 EOM
     $script .= <<'EOM';
 use strict;
-use Test;
+use Test::More;
 use Carp;
 use Perl::Tidy;
 my $rparams;
@@ -428,7 +428,7 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }
 EOM

diff --git a/t/snippets/packing_list.txt b/t/snippets/packing_list.txt
index 913908c583aab579c5158dc8a081003e7db9de2a..7a99d59ca9366ad3d35b5149490e74cd29069353 100644 (file)
--- a/t/snippets/packing_list.txt
+++ b/t/snippets/packing_list.txt
@@ -232,6 +232,8 @@
 ../snippets2.t carat.def
 ../snippets2.t ce1.ce
 ../snippets2.t ce1.def
+../snippets20.t        space6.def
+../snippets20.t        space6.space6
 ../snippets3.t ce_wn1.ce_wn
 ../snippets3.t ce_wn1.def
 ../snippets3.t colin.colin
@@ -372,5 +374,3 @@
 ../snippets9.t rt98902.def
 ../snippets9.t rt98902.rt98902
 ../snippets9.t rt99961.def
-../snippets20.t        space6.def
-../snippets20.t        space6.space6

diff --git a/t/snippets1.t b/t/snippets1.t
index 68927e328eb75f7fa08d90fcae615bf1815eb4a9..b18edac3dfa3af229ef0a92220090bd5aea0cd90 100644 (file)
--- a/t/snippets1.t
+++ b/t/snippets1.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;
@@ -560,6 +560,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

diff --git a/t/snippets10.t b/t/snippets10.t
index 2bda303f530882788e0794616bc63c19cab87e6a..944ffde5657ad620a962b93bc3d5ed08e75f6fd6 100644 (file)
--- a/t/snippets10.t
+++ b/t/snippets10.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;
@@ -1034,6 +1034,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

diff --git a/t/snippets11.t b/t/snippets11.t
index 0878f4fd6aebaa31802d0fa09f0c39bf254f41bf..edf75508e88a48e7f8f585bedd955d1e0556ad9e 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;
@@ -599,6 +599,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

diff --git a/t/snippets12.t b/t/snippets12.t
index 9b0332a17007559a70c36884fad3796d0b1c7864..e35da61440afcf360e6e7dc28caf760e8a281824 100644 (file)
--- a/t/snippets12.t
+++ b/t/snippets12.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;
@@ -613,6 +613,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

diff --git a/t/snippets13.t b/t/snippets13.t
index 8d7bccdc4523e92a5a12cbb35a7cdfc5f31e4367..67bd8e0c5abb659a7d00abd9f8b2b3d335fc5f7b 100644 (file)
--- 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;
@@ -473,6 +473,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

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

diff --git a/t/snippets15.t b/t/snippets15.t
index affba1b78b73abdf7d0d1b32cd0904a7a7000ed8..76dae13d9142ebdc7c997524f4dd63f50fdd809d 100644 (file)
--- a/t/snippets15.t
+++ b/t/snippets15.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;
@@ -171,6 +171,8 @@ sub get_val() { }
 sub get_Val  () { }
 
 sub Get_val            () { }
+my $sub1=sub                     () { };
+my $sub2=sub () { };
 ----------
 
         'wngnu1' => <<'----------',
@@ -470,6 +472,8 @@ sub get_val() { }
 sub get_Val () { }
 
 sub Get_val () { }
+my $sub1 = sub () { };
+my $sub2 = sub () { };
 #18...........
         },
 
@@ -482,6 +486,8 @@ sub get_val() { }
 sub get_Val() { }
 
 sub Get_val() { }
+my $sub1 = sub() { };
+my $sub2 = sub() { };
 #19...........
         },
     };
@@ -535,6 +541,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

diff --git a/t/snippets16.t b/t/snippets16.t
index 20da519ff6ade1d4539860c215de65fd30a33464..5a67997e997f3847c4e6d974651f9b92b8d9964a 100644 (file)
--- a/t/snippets16.t
+++ b/t/snippets16.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;
@@ -169,6 +169,8 @@ sub get_val() { }
 sub get_Val  () { }
 
 sub Get_val            () { }
+my $sub1=sub                     () { };
+my $sub2=sub () { };
 ----------
     };
 
@@ -186,6 +188,8 @@ sub get_val() { }
 sub get_Val () { }
 
 sub Get_val () { }
+my $sub1 = sub () { };
+my $sub2 = sub () { };
 #1...........
         },
 
@@ -198,6 +202,8 @@ sub get_val () { }
 sub get_Val () { }
 
 sub Get_val () { }
+my $sub1 = sub () { };
+my $sub2 = sub () { };
 #2...........
         },
 
@@ -479,6 +485,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

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

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

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

diff --git a/t/snippets2.t b/t/snippets2.t
index 03a62595fc7657a726ff0b49b02075d3a371da94..ef199cfc02381d515cd56f0db7a03267868bb58b 100644 (file)
--- a/t/snippets2.t
+++ b/t/snippets2.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;
@@ -545,6 +545,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

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

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

diff --git a/t/snippets4.t b/t/snippets4.t
index 1878425c5104af2f3d66a2c1259b21975c9b08b1..7de24453decceb45f1318eca2d909d9bcc07ad51 100644 (file)
--- a/t/snippets4.t
+++ b/t/snippets4.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;
@@ -568,6 +568,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

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

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

diff --git a/t/snippets7.t b/t/snippets7.t
index 078fcb68ea1fdc2ec8f3e0fd51578e7809936b7c..b295447108e82419b77a2cf6f958d626314ca04a 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;
@@ -561,6 +561,6 @@ foreach my $key ( sort keys %{$rtests} ) {
         }
     }
     else {
-        ok( $output, $expect );
+        is( $output, $expect, "$sname.$pname" );
     }
 }

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

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