use Test::Deep::JSON rather than Test::JSON

diff --git a/Makefile.PL b/Makefile.PL
index 87051be..fdf673f 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -21,10 +21,10 @@ auto_install; # Needed for features to work. RT#67170
 feature 'JSON',
   -default     => 1,
   'JSON::Any'  => '1.15',
-  'Test::JSON' => '0.06';
+  'Test::Deep::JSON' => '0';
 
 author_requires 'JSON::Any'  => '1.15';
-author_requires 'Test::JSON' => '0.06';
+author_requires 'Test::Deep::JSON' => '0';
 
 feature 'YAML',
   -default            => 1,

diff --git a/t/010_basic_json.t b/t/010_basic_json.t
index f94acdb..a34d1bc 100644 (file)
--- a/t/010_basic_json.t
+++ b/t/010_basic_json.t
@@ -5,12 +5,12 @@ use Test::More;
 use Test::Deep;
 
 use Test::Requires {
-    'Test::JSON' => 0.01, # skip all if not installed
     'JSON::Any' => 0.01,
+    'Test::Deep::JSON' => 0,
 };
 
 BEGIN {
-    plan tests => 12;
+    plan tests => 11;
     use_ok('MooseX::Storage');
 }
 
@@ -43,15 +43,22 @@ BEGIN {
 
     my $json = $foo->freeze;
 
-    is_valid_json($json, '.. this is valid JSON');
-
-
-    is_json(
+    cmp_deeply(
         $json,
-'{"array":[1,2,3,4,5,6,7,8,9,10],"hash":{"6":null,"3":null,"7":null,"9":null,"2":null,"8":null,"1":null,"4":null,"10":null,"5":null},"float":10.5,"object":{"number":2,"__CLASS__":"Foo"},"number":10,"__CLASS__":"Foo","string":"foo"}',
-        '... got the right JSON'
+        json({
+            number => 10,
+            string => 'foo',
+            float => 10.5,
+            array => [ 1 .. 10 ],
+            hash => { map { $_ => undef } (1 .. 10) },
+            __CLASS__ => 'Foo',
+            object => {
+                number => 2,
+                __CLASS__ => 'Foo'
+            },
+        }),
+        'is valid JSON and content matches',
     );
-
 }
 
 {

diff --git a/t/060_basic_deferred.t b/t/060_basic_deferred.t
index 330548a..8796403 100644 (file)
--- a/t/060_basic_deferred.t
+++ b/t/060_basic_deferred.t
@@ -7,13 +7,13 @@ use Test::Deep;
 use Storable;
 
 use Test::Requires {
-    'Test::JSON' => 0.01, # skip all if not installed
+    'Test::Deep::JSON' => 0, # skip all if not installed
     'JSON::Any' => 0.01,
     'YAML::Any' => 0.01,
 };
 
 BEGIN {
-    plan tests => 31;
+    plan tests => 30;
     use_ok('MooseX::Storage');
 }
 
@@ -47,11 +47,20 @@ diag('Using implementation: ', YAML::Any->implementation);
 
     my $json = $foo->freeze({ 'format' => 'JSON' });
 
-    is_valid_json($json, '.. this is valid JSON');
-
-    is_json(
+    cmp_deeply(
         $json,
-'{"array":[1,2,3,4,5,6,7,8,9,10],"hash":{"6":null,"3":null,"7":null,"9":null,"2":null,"8":null,"1":null,"4":null,"10":null,"5":null},"float":10.5,"object":{"number":2,"__CLASS__":"Foo"},"number":10,"__CLASS__":"Foo","string":"foo"}',
+        json({
+            number => 10,
+            string => 'foo',
+            float  => 10.5,
+            array  => [ 1 .. 10 ],
+            hash   => { map { $_ => undef } ( 1 .. 10 ) },
+            __CLASS__ => 'Foo',
+            object => {
+                number => 2,
+                __CLASS__ => 'Foo'
+            },
+        }),
         '... got the right JSON'
     );
 }