X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F14-callbacks.t;h=6a1f56f1e0cc35704a06123ff1843d44a01ae5e0;hb=2a7199760cc1080be8e62e425d74a85f4eebcdfc;hp=7a7948cba51ba38bdd06b7bbbec3f2bf7f992c0d;hpb=ca5538ffb33de051f881859a9a9bd1f78f806626;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/14-callbacks.t b/t/14-callbacks.t
index 7a7948c..6a1f56f 100644
--- a/t/14-callbacks.t
+++ b/t/14-callbacks.t
@@ -3,9 +3,9 @@
 use strict;
 use warnings;
 
-use Test::More tests => 12;
+use Test::More tests => 26;
 
-use Variable::Magic qw/wizard cast/;
+use Variable::Magic qw<wizard cast>;
 
 my $wiz = eval { wizard get => sub { undef } };
 is($@, '',             'wizard creation doesn\'t croak');
@@ -27,6 +27,59 @@ eval {
 is($@, '', 'callback returning undef doesn\'t warn/croak');
 is($x, $n, 'callback returning undef fails');
 
+{
+ my $c = 0;
+ sub X::wat { ++$c }
+ my $wiz = eval { wizard get => \'X::wat' };
+ is($@, '', 'wizard with a qualified string callback doesn\'t croak');
+ my $b = $n;
+ my $res = eval { cast $b, $wiz };
+ is($@, '', 'cast a wizard with a qualified string callback doesn\'t croak');
+ my $x;
+ eval {
+  local $SIG{__WARN__} = sub { die };
+  $x = $b;
+ };
+ is($@, '', 'qualified string callback doesn\'t warn/croak');
+ is($c, 1,  'qualified string callback is called');
+ is($x, $n, 'qualified string callback returns the right thing');
+}
+
+{
+ my $c = 0;
+ sub wut { fail 'main::wut was called' }
+ sub Y::wut { ++$c }
+ my $wiz = eval { wizard get => \'wut' };
+ is($@, '', 'wizard with a short string callback doesn\'t croak');
+ my $b = $n;
+ my $res = eval { cast $b, $wiz };
+ is($@, '', 'cast a wizard with a short string callback doesn\'t croak');
+ my $x;
+ eval {
+  local $SIG{__WARN__} = sub { die };
+  package Y;
+  $x = $b;
+ };
+ is($@, '', 'short string callback doesn\'t warn/croak');
+ is($c, 1,  'short string callback is called');
+ is($x, $n, 'short string callback returns the right thing');
+}
+
+{
+ my $wiz = eval { wizard get => \undef };
+ is($@, '', 'wizard with a ref-to-undef callback doesn\'t croak');
+ my $b = $n;
+ my $res = eval { cast $b, $wiz };
+ is($@, '', 'cast a wizard with a ref-to-undef callback doesn\'t croak');
+ my $x;
+ eval {
+  local $SIG{__WARN__} = sub { die };
+  $x = $b;
+ };
+ is($@, '', 'ref-to-undef callback doesn\'t warn/croak');
+ is($x, $n, 'ref-to-undef callback returns the right thing');
+}
+
 my @callers;
 $wiz = wizard get => sub {
  my @c;
@@ -41,25 +94,27 @@ cast $b, $wiz;
 
 my $u = $b;
 is_deeply(\@callers, [
- [ 'main', $0, 42 ],
+ ([ 'main', $0, __LINE__-2 ]) x 2,
 ], 'caller into callback returns the right thing');
 
 @callers = ();
 $u = $b;
 is_deeply(\@callers, [
- [ 'main', $0, 48 ],
+ ([ 'main', $0, __LINE__-2 ]) x 2,
 ], 'caller into callback returns the right thing (second time)');
 
 {
- my $u = $b;
  @callers = ();
- is_deeply(\@callers, [ ], 'caller into callback into block returns the right thing');
+ my $u = $b;
+ is_deeply(\@callers, [
+  ([ 'main', $0, __LINE__-2 ]) x 2,
+ ], 'caller into callback into block returns the right thing');
 }
 
 @callers = ();
 eval { my $u = $b };
 is($@, '', 'caller into callback doesn\'t croak');
 is_deeply(\@callers, [
- [ 'main', $0, 60 ],
- [ 'main', $0, 60 ],
+ ([ 'main', $0, __LINE__-3 ]) x 3,
 ], 'caller into callback into eval returns the right thing');
+