dies_ok -> throws_like cleanup, part 1

Author: lizmat

integration/advent2009-day04.t

@@ -15,4 +15,4 @@ is fac(2), 2,  'fac(2) works';
 is fac(3), 6,  'fac(3) works';
 is fac(4), 24, 'fac(4) works';
 
-dies_ok { EVAL(q[ fac('oh noes i am a string')]) }, 'Can only call it with ints';
+throws_like { EVAL q[fac('oh noes i am a string')] }, X::TypeCheck::Argument;

integration/advent2009-day06.t

@@ -16,7 +16,8 @@ my @pi-sin = @pi>>.sin;
 is (@a <<+>> @c), [4, 3, 6, 5], 'Dwimmy hyperoperator on arrays of the same length';
 is (@a >>+<< @c), [4, 3, 6, 5], 'Non-dwimmy hyperoperator on arrays of the same length';
 is (@a <<+>> @b), [4, 3, 6, 5], 'Dwimmy hyperoperator on arrays of different size';
-dies_ok {@a >>+<< @b}, 'Non-dwimmy hyperoperator on arrays of different size fails';
+throws_like {@a >>+<< @b}, X::HyperOp::NonDWIM,
+  'Non-dwimmy hyperoperator on arrays of different size fails';
 is (@a >>+>> 2), [3, 4, 5, 6], 'Single scalars extend to the right';
 is (3 <<+<< @a), [4, 5, 6, 7], 'Single scalars extend to the left';
 is (~<<@a), ["1", "2", "3", "4"], 'Hyperoperator with prefix operator';
@@ -30,5 +31,3 @@ is ((-1, 0, 3, 42)>>.Str), ["-1", "0", "3", "42"], 'Hyperoperator used to call .
 {
 	is (@a-copy = @a; @a-copy >>/=>> 2; @a-copy), [1/2, 2/2, 3/2, 4/2], 'In-place operators work';
 }
-
-done;

integration/advent2009-day09.t

@@ -57,7 +57,7 @@ is grade_essay("How to eat a Fish", 0), 0, 'P6 auto unpacking/verification';
 ok (entreat()), 'Default values for parameters works';
 is (xml_tag("hi")), "hihi>", 'Default values using previously supplied arguments';
 nok deactivate("Rakudo Quality Fission"), 'optional parameters';
-dies_ok {drawline2(1,2,3,4)}, 'Must be named';
+dies_ok {drawline2(1,2,3,4)}, 'wrong number of parameters, no exception object';
 ok (drawline2(:x1(3))), 'When you force naming, they are not all required.';
 #the required & must-be named (:$var!) test not here, its opposite is 1 up
 is (varsum(100,200,30,40,5)), 375, 'Parameters with a * in front can take as many items as you wish';
@@ -66,13 +66,13 @@ is detector(:foo(1), :bar(2), :camel(3)), ("'bar', 'camel'"|"'camel', 'bar'"), '
 #?niecza todo 'Capturing arbitrary named parameters as hash'
 is (detector(foo => 1, bar => 2, camel => 3)), ("'bar', 'camel'"|"'camel', 'bar'"), 'Same as above test, only passed as hash';
 my $t = 3;
-dies_ok {up1($t)}, "Can't modify parameters within by default.";
+dies_ok {up1($t)}, "Can't modify parameters within by default, no exception object.";
 up1_2($t);
 is $t, 4, 'Set a parameter to "is rw", and then you can modify';
 up1_3($t);
 is $t, 4, '"is copy" leaves original alone"';
 my @te = <a b c>;
-dies_ok {EVAL 'namen(@te)' }, 'Autoflattening doesnt exist';
+dies_ok {EVAL 'namen(@te)' }, 'Autoflattening doesnt exist, no exception object';
 is (namen(|@te)), ('a','b','c'), "Put a | in front of the variable, and you're ok!";
 
 is <734043054508967647390469416144647854399310>.comb(/.**7/).join('|') , '7340430|5450896|7647390|4694161|4464785|4399310' , 'Test one liner at end of post (part1)';

integration/advent2009-day18.t

@@ -26,8 +26,10 @@ role SocketPower {
     }
 }
 
-#~ class Laptop does BatteryPower does SocketPower {}
-eval_dies_ok 'class Laptop does BatteryPower does SocketPower {}' , "Method 'find-power-accessories' collides and a resolution must be provided by the class";
+#~ class Notebook does BatteryPower does SocketPower {}
+throws_like { EVAL 'class Notebook does BatteryPower does SocketPower {}' },
+  X::AdHoc, # doesn't have its own exception yet
+  "Method 'find-power-accessories' collides and a resolution must be provided by the class";
 
 class Laptop does BatteryPower does SocketPower {
     method find-power-accessories() {

integration/advent2010-day07.t

@@ -6,9 +6,9 @@ use Test;
 
 plan 8;
 
-dies_ok {EVAL '{ $var = 42 }'};
+throws_like {EVAL '{ $var = 42 }'}, X::Undeclared;
 lives_ok {EVAL '{ my $var = 42 }'};
-dies_ok {EVAL '{ my $var = 42 }; say $var'};
+throws_like {EVAL '{ my $var = 42 }; say $var'}, X::Undeclared;
 
 sub counter($start_value) {
     my $count = $start_value;

integration/advent2011-day11.t

@@ -55,10 +55,16 @@ $order.add_item('Gadget', 25.50);
 $order.add_item('Gizmo', 49.00);
 
 lives_ok {$order.this-should-compile},'order total sanity';
-dies_ok {$order.but-this-shouldnt},'order total with typo';
+throws_like {$order.but-this-shouldnt},
+  X::Method::NotFound,
+  'order total with typo';
 lives_ok {EVAL '$order.discount'}, 'public method sanity';
-dies_ok {EVAL '$order!compute_discount'}, 'private method sanity';
-dies_ok {EVAL '$o!Order::compute_discount'}, 'private method sanity';
+throws_like {EVAL '$order!compute_discount'},
+  X::Method::Private::Unqualified,
+  'private method sanity';
+throws_like {EVAL '$o!Order::compute_discount'},
+  X::Method::Private::Permission,
+  'private method sanity';
 
 # "...a class may choose to trust another one (or, indeed, any other package)
 # to be able to call its private methods. Critically, this is the decision of
@@ -86,5 +92,7 @@ $untrusty.add_item('Contrivance', 60.00);
 $untrusty.add_item('Apparatus', 50.00);
 
 lives_ok {$untrusty.try-pub}, 'inheritance public method, (untrusting)';
-dies_ok {$untrusty.try-priv}, 'inheritance private method, (untrusting)';
+throws_like {$untrusty.try-priv},
+  X::Method::Private::Permission,
+  'inheritance private method, (untrusting)';
 

integration/advent2011-day24.t

@@ -31,8 +31,11 @@ multi sub Slurp($filename) {
 }
 --END--
 
-eval_lives_ok $unambigous ~ 'Slurp("README.md")', 'unambigous multi - lives';
-eval_dies_ok  $ambigous   ~ 'Slurp("README.md")',  'ambigous multi - dies';
+lives_ok { EVAL $unambigous ~ 'Slurp("README.md")' },
+  'unambigous multi - lives';
+throws_like { EVAL $ambigous   ~ 'Slurp("README.md")' },
+  X::Multi::Ambiguous,
+  'ambigous multi - dies';
 
 class Present {
     has $.item;
@@ -61,4 +64,3 @@ my $gift = Present.new(:item("sock"));
 is $gift.look, "It's wrapped.", "It's wrapped.";
 open($gift);
 is $gift.look, 'A sock!', 'A sock!';
-

integration/advent2012-day13.t

@@ -27,7 +27,9 @@ my %words2 := baggy($slurp1);
 is_deeply %words1.keys.sort, %words1.keys.sort, 'standard vs baggy word-count';
 is_deeply %words1.values.sort, %words1.values.sort, 'standard vs baggy word-count';
 lives_ok {EVAL q<%words1{"the"} = "green">}, 'hash assign (lives)';
-dies_ok  {EVAL q<%words2{"the"} = "green">}, 'baggy assign (dies)';
+throws_like {EVAL q<%words2{"the"} = "green">},
+  X::Multi::NoMatch,
+  'baggy assign (dies)';
 
 # use {...}.Bag constructor (dwarring's reply to this post)
 # >my $bag = bag "red" => 2, "blue" => 10;

integration/advent2012-day19.t

@@ -64,7 +64,7 @@ is (4.7kΩ ± 1kΩ).gist, Measure.new(unit => Unit::ohm, value => 3700/1..5700/1
 is (4.7kΩ ± 5%).gist, Measure.new(unit => Unit::ohm, value => 4465/1..4935/1).gist, 'range object';
 
 my $resistance = 4321Ω;
-dies_ok {die "resistance is futile" if !($resistance ~~ 4.7kΩ ± 5%)}, 'resistance is futile';
+nok $resistance ~~ 4.7kΩ ± 5%, 'resistance is futile';
 
 # Symbols that aren’t operators
 

integration/advent2013-day02.t

@@ -22,7 +22,9 @@ nok defined(Dog), 'Type object is undefined';
 ok $dog, 'instance is True';
 ok defined($dog), 'instance is defined';
 is $dog.name, 'Fido', 'Attribute access on instance';
-dies_ok { Dog.name }, 'Cannot access attribute on type object';
+throws_like { Dog.name },
+  X::AdHoc,  # does not have an Exception object yet
+  'Cannot access attribute on type object';
 
 multi sniff(Dog:U $dog) {
     return "a type object, of course"