X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F010_basic_json.t;h=a34d1bcd88a02b60a859cdcb969f764ac4d2a195;hb=c2d52f94beb56939250944a12df15d7d90779866;hp=30b3327ee45559428d3803afc660c36e7181aa37;hpb=a7f358fb48a26700a3683db2a10a12660cf4a189;p=gitmo%2FMooseX-Storage.git

diff --git a/t/010_basic_json.t b/t/010_basic_json.t
index 30b3327..a34d1bc 100644
--- a/t/010_basic_json.t
+++ b/t/010_basic_json.t
@@ -1,20 +1,16 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
 use Test::More;
+use Test::Deep;
+
+use Test::Requires {
+    'JSON::Any' => 0.01,
+    'Test::Deep::JSON' => 0,
+};
 
 BEGIN {
-    eval "use Test::JSON";
-    plan skip_all => "Test::JSON is required for this test" if $@; 
-    # NOTE: 
-    # this idiocy is cause Test::JSON 
-    # uses JSON.pm and that can be 
-    # very picky about the JSON output
-    # - SL 
-    BEGIN { $ENV{JSON_ANY_ORDER} = qw(JSON) }           
-    plan tests => 12;
+    plan tests => 11;
     use_ok('MooseX::Storage');
 }
 
@@ -47,12 +43,21 @@ 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',
     );
 }
 
@@ -66,8 +71,8 @@ BEGIN {
     is( $foo->number, 10,    '... got the right number' );
     is( $foo->string, 'foo', '... got the right string' );
     is( $foo->float,  10.5,  '... got the right float' );
-    is_deeply( $foo->array, [ 1 .. 10 ], '... got the right array' );
-    is_deeply(
+    cmp_deeply( $foo->array, [ 1 .. 10 ], '... got the right array' );
+    cmp_deeply(
         $foo->hash,
         { map { $_ => undef } ( 1 .. 10 ) },
         '... got the right hash'