Exception propagation fixes

[perl/modules/Variable-Magic.git] / t / 14-callbacks.t

diff --git a/t/14-callbacks.t b/t/14-callbacks.t
index eae92fd0ac60c4d27bb899d18242ae56a7d17ca2..c599b2fe7dc69bf6c027408e4f488e598e7eeb12 100644 (file)
--- a/t/14-callbacks.t
+++ b/t/14-callbacks.t
@@ -3,9 +3,9 @@
 use strict;
 use warnings;
 
-use Test::More tests => 12 + (2 * 5 + 2 * 6 + 2 * 5);
+use Test::More tests => 17;
 
-use Variable::Magic qw/wizard cast dispell VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
+use Variable::Magic qw/wizard cast/;
 
 my $wiz = eval { wizard get => sub { undef } };
 is($@, '',             'wizard creation doesn\'t croak');
@@ -27,6 +27,24 @@ 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 string callback doesn\'t croak');
+ my $b = $n;
+ my $res = eval { cast $b, $wiz };
+ is($@, '', 'cast a wizard with a string callback doesn\'t croak');
+ my $x;
+ eval {
+  local $SIG{__WARN__} = sub { die };
+  $x = $b;
+ };
+ is($@, '', 'string callback doesn\'t warn/croak');
+ is($c, 1,  'string callback is called');
+ is($x, $n, 'string callback returns the right thing');
+}
+
 my @callers;
 $wiz = wizard get => sub {
  my @c;
@@ -65,39 +83,3 @@ is_deeply(\@callers, [
  ([ 'main', $0, __LINE__-3 ]) x 2,
 ], 'caller into callback into eval returns the right thing');
 
-for ([ 'get', '$c', 'sassign' ], [ 'len', '@c', 'padav' ]) {
- my ($key, $var, $exp) = @$_;
-
- for my $op_info (VMG_OP_INFO_NAME, VMG_OP_INFO_OBJECT, 3) {
-  my ($c, @c);
-
-  # We must test for the $op correctness inside the callback because, if we
-  # bring it out, it will go outside of the eval STRING scope, and what it
-  # points to will no longer exist.
-  eval {
-   $wiz = wizard $key => sub {
-    my $op = $_[-1];
-    my $desc = "$key magic with op_info == $op_info";
-    if ($op_info == 1) {
-     is $op, $exp, "$desc gets the right op info";
-    } elsif ($op_info == 2) {
-     isa_ok $op, 'B::OP', $desc;
-     is $op->name, $exp, "$desc gets the right op info";
-    } else {
-     is $op, undef, "$desc gets the right op info";
-    }
-    ()
-   }, op_info => $op_info
-  };
-  is $@, '', "$key wizard with op_info == $op_info doesn't croak";
-
-  eval "cast $var, \$wiz";
-  is $@, '', "$key cast with op_info == $op_info doesn't croak";
-
-  eval "my \$x = $var";
-  is $@, '', "$key magic with op_info == $op_info doesn't croak";
-
-  eval "dispell $var, \$wiz";
-  is $@, '', "$key dispell with op_info == $op_info doesn't croak";
- }
-}