Test::Fatal -> Test2::Tools::Exception

Author: karenetheridge

t/add-schema.t

@@ -11,7 +11,7 @@ no if "$]" >= 5.041009, feature => 'smartmatch';
 no feature 'switch';
 use open ':std', ':encoding(UTF-8)'; # force stdin, stdout, stderr into utf8
 
-use Test::Fatal;
+use Test2::Tools::Exception;
 use Test2::Warnings qw(warnings :no_end_test had_no_warnings);
 use List::Util 'unpairs';
 use lib 't/lib';
@@ -231,7 +231,7 @@ subtest 'add a schema associated with a uri' => sub {
   my $js = JSON::Schema::Modern->new;
 
   like(
-    exception { $js->add_schema('https://foo.com#/x/y/z', {}) },
+    dies { $js->add_schema('https://foo.com#/x/y/z', {}) },
     qr/^cannot add a schema with a uri with a fragment/,
     'cannot use a uri with a fragment',
   );
@@ -694,13 +694,13 @@ subtest 'register a document against multiple uris, with absolute root uri' => s
   );
 
   like(
-    exception { $js->add_schema('https://uri2.com', { x => 1 }) },
+    dies { $js->add_schema('https://uri2.com', { x => 1 }) },
     qr!^\Quri "https://uri2.com" conflicts with an existing schema resource\E!,
     'cannot call add_schema with the same URI as for another schema',
   );
 
   like(
-    exception { $js->add_schema('https://uri3.com', { '$id' => 'https://foo.com', x => 1 }) },
+    dies { $js->add_schema('https://uri3.com', { '$id' => 'https://foo.com', x => 1 }) },
     qr!^\Quri "https://foo.com" conflicts with an existing schema resource\E!,
     'cannot reuse the same $id in another document',
   );
@@ -862,13 +862,13 @@ subtest 'register a document against multiple uris, with relative root uri' => s
   );
 
   like(
-    exception { $js->add_schema('https://uri2.com', { x => 1 }) },
+    dies { $js->add_schema('https://uri2.com', { x => 1 }) },
     qr!^\Quri "https://uri2.com" conflicts with an existing schema resource\E!,
     'cannot call add_schema with the same URI as for another schema',
   );
 
   like(
-    exception { $js->add_schema('https://uri3.com', { '$id' => 'https://uri2.com', x => 1 }) },
+    dies { $js->add_schema('https://uri3.com', { '$id' => 'https://uri2.com', x => 1 }) },
     qr!^\Quri "https://uri2.com" conflicts with an existing schema resource\E!,
     'cannot reuse the same $id in another document',
   );
@@ -1024,13 +1024,13 @@ subtest 'register a document against multiple uris, with no root uri' => sub {
   );
 
   like(
-    exception { $js->add_schema('https://uri2.com', { x => 1 }) },
+    dies { $js->add_schema('https://uri2.com', { x => 1 }) },
     qr!^\Quri "https://uri2.com" conflicts with an existing schema resource\E!,
     'cannot call add_schema with the same URI as for another schema',
   );
 
   like(
-    exception { $js->add_schema('https://uri3.com', { '$id' => 'https://uri2.com', x => 1 }) },
+    dies { $js->add_schema('https://uri3.com', { '$id' => 'https://uri2.com', x => 1 }) },
     qr!^\Quri "https://uri2.com" conflicts with an existing schema resource\E!,
     'cannot reuse the same $id in another document',
   );

t/annotations.t

@@ -13,13 +13,13 @@ no feature 'switch';
 use open ':std', ':encoding(UTF-8)'; # force stdin, stdout, stderr into utf8
 
 use builtin::compat 'load_module';
-use Test::Fatal;
+use Test2::Tools::Exception;
 use lib 't/lib';
 use Helper;
 
 subtest 'draft7' => sub {
   like(
-    exception {
+    dies {
       JSON::Schema::Modern->new(collect_annotations => 1, specification_version => 'draft7');
     },
     qr/collect_annotations cannot be used with specification_version draft7/,

t/boolean-schemas.t

@@ -12,7 +12,7 @@ no if "$]" >= 5.041009, feature => 'smartmatch';
 no feature 'switch';
 use open ':std', ':encoding(UTF-8)'; # force stdin, stdout, stderr into utf8
 
-use Test::Fatal;
+use Test2::Tools::Exception;
 use lib 't/lib';
 use Helper;
 
@@ -33,7 +33,7 @@ my @tests = (
 foreach my $test (@tests) {
   my $data = 'hello';
   is(
-    exception {
+    dies {
       my $result = $js->evaluate($data, $test->{schema});
       ok(!($result->exception xor $test->{exception}), json_sprintf('%s is not a schema', $test->{schema}));
       ok(!($result->valid xor $test->{valid}), json_sprintf('schema: %s evaluates to: %s', $test->{schema}, $test->{valid}));

t/content-encoding.t

@@ -12,7 +12,7 @@ no feature 'switch';
 use open ':std', ':encoding(UTF-8)'; # force stdin, stdout, stderr into utf8
 use utf8;
 
-use Test::Fatal;
+use Test2::Tools::Exception;
 use lib 't/lib';
 use Helper;
 
@@ -56,7 +56,7 @@ subtest 'media_type and encoding handlers' => sub {
   my $js = JSON::Schema::Modern->new;
 
   like(
-    exception { $js->add_media_type('FOO/BAR' => sub { \1 }) },
+    dies { $js->add_media_type('FOO/BAR' => sub { \1 }) },
     qr!Value "FOO/BAR" did not pass type constraint !,
     'upper-cased names are not accepted',
   );
@@ -103,7 +103,7 @@ subtest 'media_type and encoding handlers' => sub {
   );
 
   like(
-    exception { $js->get_media_type('application/x-ndjson')->(\qq!{"foo":1,"bar":2}\n["a","b",]!) },
+    dies { $js->get_media_type('application/x-ndjson')->(\qq!{"foo":1,"bar":2}\n["a","b",]!) },
     qr/^parse error at line 2: malformed JSON string/,
     'application/x-ndjson dies with line number of the bad data',
   );

t/dialects.t

@@ -13,7 +13,7 @@ no feature 'switch';
 use open ':std', ':encoding(UTF-8)'; # force stdin, stdout, stderr into utf8
 
 use Test2::Warnings qw(warnings :no_end_test had_no_warnings allow_warnings);
-use Test::Fatal;
+use Test2::Tools::Exception;
 use lib 't/lib';
 use Helper;
 
@@ -1691,27 +1691,27 @@ subtest 'custom vocabulary classes with add_vocabulary()' => sub {
   my $js = JSON::Schema::Modern->new;
 
   like(
-    exception { $js->add_vocabulary('MyVocabulary::Does::Not::Exist') },
+    dies { $js->add_vocabulary('MyVocabulary::Does::Not::Exist') },
     qr!an't locate MyVocabulary/Does/Not/Exist.pm in \@INC!,
     'vocabulary class must exist',
   );
 
   like(
-    exception { $js->add_vocabulary('MyVocabulary::MissingRole') },
+    dies { $js->add_vocabulary('MyVocabulary::MissingRole') },
     qr/Value "MyVocabulary::MissingRole" did not pass type constraint/,
     'vocabulary class must implement the role',
   );
 
   like(
-    exception { $js->add_vocabulary('MyVocabulary::MissingSub') },
+    dies { $js->add_vocabulary('MyVocabulary::MissingSub') },
     qr/Can't apply JSON::Schema::Modern::Vocabulary to MyVocabulary::MissingSub - missing vocabulary, keywords/,
     'vocabulary class must implement some subs',
   );
 
   cmp_result(
     [ warnings {
       like(
-        exception { $js->add_vocabulary('MyVocabulary::BadVocabularySub1') },
+        dies { $js->add_vocabulary('MyVocabulary::BadVocabularySub1') },
         qr/Undef did not pass type constraint/,
         'vocabulary() sub in the vocabulary class must return uri => specification_version pairs',
       )
@@ -1721,21 +1721,20 @@ subtest 'custom vocabulary classes with add_vocabulary()' => sub {
   );
 
   like(
-    exception { $js->add_vocabulary('MyVocabulary::BadVocabularySub2') },
+    dies { $js->add_vocabulary('MyVocabulary::BadVocabularySub2') },
     qr!Value "https://some/uri#/invalid/uri" did not pass type constraint!,
     'vocabulary() sub in the vocabulary class must contain valid absolute, fragmentless URIs',
   );
 
   like(
-    exception { $js->add_vocabulary('MyVocabulary::BadVocabularySub3') },
+    dies { $js->add_vocabulary('MyVocabulary::BadVocabularySub3') },
     qr/Value "wrongdraft" did not pass type constraint/,
     'vocabulary() sub in the vocabulary class must reference a known specification version',
   );
 
 
-  is(
-    exception { $js->add_vocabulary('MyVocabulary::BadEvaluationOrder') },
-    undef,
+  ok(
+    lives { $js->add_vocabulary('MyVocabulary::BadEvaluationOrder') },
     'added a vocabulary sub',
   );
 
@@ -1774,9 +1773,8 @@ subtest 'custom vocabulary classes with add_vocabulary()' => sub {
     'custom vocabulary class has a conflicting evaluation_order',
   );
 
-  is(
-    exception { $js->add_vocabulary('MyVocabulary::StringComparison') },
-    undef,
+  ok(
+    lives { $js->add_vocabulary('MyVocabulary::StringComparison') },
     'added another vocabulary sub',
   );
 
@@ -1813,15 +1811,14 @@ subtest 'custom vocabulary classes with add_vocabulary()' => sub {
 
 
   like(
-    exception { $js->add_vocabulary('MyVocabulary::ReservedKeyword') },
+    dies { $js->add_vocabulary('MyVocabulary::ReservedKeyword') },
     qr/^keywords starting with "\$" are reserved for core and cannot be used/,
     '$ keywords are prohibited',
   );
 
 
-  is(
-    exception { $js->add_vocabulary('MyVocabulary::ConflictingKeyword') },
-    undef,
+  ok(
+    lives { $js->add_vocabulary('MyVocabulary::ConflictingKeyword') },
     'added another vocabulary sub',
   );
 

t/document.t

@@ -12,7 +12,7 @@ no feature 'switch';
 use open ':std', ':encoding(UTF-8)'; # force stdin, stdout, stderr into utf8
 
 use Test::Deep::UnorderedPairs;
-use Test::Fatal;
+use Test2::Tools::Exception;
 use Test::Memory::Cycle;
 use List::Util 'unpairs';
 use lib 't/lib';
@@ -46,7 +46,7 @@ subtest 'boolean document' => sub {
   );
 
   like(
-    exception {
+    dies {
       JSON::Schema::Modern::Document->new(
         canonical_uri => Mojo::URL->new('https://foo.com#/x/y/z'),
         schema => false,
@@ -885,19 +885,18 @@ subtest 'JSON pointer and URI escaping' => sub {
 };
 
 subtest 'resource collisions' => sub {
-  is(
-    exception {
+  ok(
+    lives {
       JSON::Schema::Modern::Document->new(
         canonical_uri => Mojo::URL->new('https://foo.com/x/y/z'),
         schema => { '$id' => '/x/y/z' },
       );
     },
-    undef,
     'no collision when adding an identical resource (after resolving with base uri)',
   );
 
   like(
-    exception {
+    dies {
       JSON::Schema::Modern::Document->new(
         canonical_uri => Mojo::URL->new('https://foo.com/x/y/z'),
         schema => {
@@ -943,23 +942,22 @@ subtest 'resource collisions' => sub {
   my $doc2 = JSON::Schema::Modern::Document->new(schema => { '$id' => 'b' });
   my $js = JSON::Schema::Modern->new;
 
-  is(
+  ok(
     # id resolves to https://foo.com/a/b
-    exception { $js->add_document('https://foo.com' => $doc1) },
-    undef,
+    lives { $js->add_document('https://foo.com' => $doc1) },
     'add first document, resolving resources to a base uri',
   );
 
   like(
     # id resolves to https://foo.com/a/b
-    exception { $js->add_document('https://foo.com/a/' => $doc2) },
+    dies { $js->add_document('https://foo.com/a/' => $doc2) },
     qr{^uri "https://foo.com/a/b" conflicts with an existing schema resource},
     'the resource in the second document resolves to the same uri as from the first document',
   );
 
 
-  is(
-    exception {
+  ok(
+    lives {
       JSON::Schema::Modern::Document->new(
         canonical_uri => Mojo::URL->new('https://foo.com/x/y/z'),
         schema => {
@@ -976,7 +974,6 @@ subtest 'resource collisions' => sub {
         },
       );
     },
-    undef,
     'ignored "duplicate" uris embedded in non-schemas',
   );
 };

t/evaluate_json_string.t

@@ -12,7 +12,7 @@ no if "$]" >= 5.041009, feature => 'smartmatch';
 no feature 'switch';
 use open ':std', ':encoding(UTF-8)'; # force stdin, stdout, stderr into utf8
 
-use Test::Fatal;
+use Test2::Tools::Exception;
 
 use lib 't/lib';
 use Helper;
@@ -21,16 +21,15 @@ my $js = JSON::Schema::Modern->new;
 
 like(ref($js->_json_decoder), qr/^(?:Cpanel::JSON::XS|JSON::PP)$/, 'we have a JSON decoder');
 
-is(
-  exception {
+ok(
+  lives {
     ok($js->evaluate_json_string('true', {})->valid, 'json data "true" is evaluated successfully');
   },
-  undef,
   'no exceptions in evaluate_json_string on good json',
 );
 
-is(
-  exception {
+ok(
+  lives {
     cmp_result(
       $js->evaluate_json_string('blargh', {})->TO_JSON,
       {
@@ -46,7 +45,6 @@ is(
       'evaluating bad json data returns false, with error',
     );
   },
-  undef,
   'no exceptions in evaluate_json_string on bad json',
 );