diff options
| author | Jesse Luehrs <doy@tozt.net> | 2012-01-04 17:52:12 -0600 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2012-01-04 17:57:37 -0600 |
| commit | 79b443187ee06d8ee7eedc29012e2b68235e3cd1 (patch) | |
| tree | cc0d02a87ca053e4ea5a7f3b3a65a7758ed2db13 /t | |
| parent | 769d407137b20818b5ca38ab8b0904e9c1eb7a5d (diff) | |
| download | circular-require-79b443187ee06d8ee7eedc29012e2b68235e3cd1.tar.gz circular-require-79b443187ee06d8ee7eedc29012e2b68235e3cd1.zip | |
use filenames in the "from" part too
this also stops using "caller", which can produce incorrect results if
there are multiple packages in a file, or if you follow it up too far
(saying that the cycle is from 'main' isn't correct)
Diffstat (limited to 't')
| -rw-r--r-- | t/basic.t | 6 | ||||
| -rw-r--r-- | t/hide_middleman.t | 2 | ||||
| -rw-r--r-- | t/hide_middleman2.t | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -12,7 +12,7 @@ circular::require->unimport; my $warnings; local $SIG{__WARN__} = sub { $warnings .= $_[0] }; use_ok('Foo'); - is($warnings, "Circular require detected: Foo.pm (from Baz)\nCircular require detected: Baz.pm (from Bar)\n", "correct warnings"); + is($warnings, "Circular require detected: Foo.pm (from Baz.pm)\nCircular require detected: Baz.pm (from Bar.pm)\n", "correct warnings"); clear(); } @@ -20,7 +20,7 @@ circular::require->unimport; my $warnings; local $SIG{__WARN__} = sub { $warnings .= $_[0] }; use_ok('Bar'); - is($warnings, "Circular require detected: Baz.pm (from Foo)\nCircular require detected: Bar.pm (from Baz)\n", "correct warnings"); + is($warnings, "Circular require detected: Baz.pm (from Foo.pm)\nCircular require detected: Bar.pm (from Baz.pm)\n", "correct warnings"); clear(); } @@ -28,7 +28,7 @@ circular::require->unimport; my $warnings; local $SIG{__WARN__} = sub { $warnings .= $_[0] }; use_ok('Baz'); - is($warnings, "Circular require detected: Baz.pm (from Foo)\n", "correct warnings"); + is($warnings, "Circular require detected: Baz.pm (from Foo.pm)\nCircular require detected: Baz.pm (from Bar.pm)\n", "correct warnings"); clear(); } diff --git a/t/hide_middleman.t b/t/hide_middleman.t index 72fa9c6..90950b2 100644 --- a/t/hide_middleman.t +++ b/t/hide_middleman.t @@ -16,7 +16,7 @@ my @warnings; is_deeply( \@warnings, - ["Circular require detected: Foo.pm (from Bar)\n"], + ["Circular require detected: Foo.pm (from Bar.pm)\n"], "Show the module that used base, instead of 'base' when a cycle occurs from a use base." ); diff --git a/t/hide_middleman2.t b/t/hide_middleman2.t index 917674b..bb3092a 100644 --- a/t/hide_middleman2.t +++ b/t/hide_middleman2.t @@ -16,7 +16,7 @@ my @warnings; is_deeply( \@warnings, - ["Circular require detected: Foo.pm (from Bar)\n"], + ["Circular require detected: Foo.pm (from Bar.pm)\n"], "Show the module that used base, instead of 'base' when a cycle occurs from a use base." ); |