X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F060_basic_deferred.t;h=87964033f9da72538095eaf06f7426a6ee0c34ea;hb=c2d52f94beb56939250944a12df15d7d90779866;hp=451bfd98710a4668b7af29e39abe330f42aa0622;hpb=94574eb5dab74ed3cdd6f8da700ff4b25047c913;p=gitmo%2FMooseX-Storage.git

diff --git a/t/060_basic_deferred.t b/t/060_basic_deferred.t
index 451bfd9..8796403 100644
--- a/t/060_basic_deferred.t
+++ b/t/060_basic_deferred.t
@@ -1,23 +1,25 @@
-#!/usr/bin/perl
-
 $|++;
 use strict;
 use warnings;
 
 use Test::More;
+use Test::Deep;
 use Storable;
 
+use Test::Requires {
+    'Test::Deep::JSON' => 0, # skip all if not installed
+    'JSON::Any' => 0.01,
+    'YAML::Any' => 0.01,
+};
+
 BEGIN {
-    eval "use Test::JSON; use Test::YAML::Valid;";
-    plan skip_all => "Test::JSON and Test::YAML::Valid are required for this test" if $@;  
-    eval "use JSON::Any";
-    plan skip_all => "JSON::Any is required for this test" if $@;          
-    plan tests => 32;
+    plan tests => 30;
     use_ok('MooseX::Storage');
 }
 
-{
+diag('Using implementation: ', YAML::Any->implementation);
 
+{
     package Foo;
     use Moose;
     use MooseX::Storage;
@@ -45,11 +47,20 @@ BEGIN {
 
     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'
     );
 }
@@ -57,15 +68,15 @@ BEGIN {
 {
     my $foo = Foo->thaw(
         '{"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"}',
-        { 'format' => 'JSON' } 
+        { 'format' => 'JSON' }
     );
     isa_ok( $foo, 'Foo' );
 
     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'
@@ -86,19 +97,19 @@ BEGIN {
         object => Foo->new( number => 2 ),
     );
     isa_ok( $foo, 'Foo' );
-    
+
     my $stored = $foo->freeze({ 'format' => 'Storable' });
 
     my $struct = Storable::thaw($stored);
-    is_deeply(
+    cmp_deeply(
         $struct,
         {
             '__CLASS__' => 'Foo',
             'float'     => 10.5,
             'number'    => 10,
-            'string'    => 'foo',           
+            'string'    => 'foo',
             'array'     => [ 1 .. 10],
-            'hash'      => { map { $_ => undef } 1 .. 10 },            
+            'hash'      => { map { $_ => undef } 1 .. 10 },
             'object'    => {
                 '__CLASS__' => 'Foo',
                 'number' => 2
@@ -113,23 +124,23 @@ BEGIN {
         '__CLASS__' => 'Foo',
         'float'     => 10.5,
         'number'    => 10,
-        'string'    => 'foo',           
+        'string'    => 'foo',
         'array'     => [ 1 .. 10],
-        'hash'      => { map { $_ => undef } 1 .. 10 },            
+        'hash'      => { map { $_ => undef } 1 .. 10 },
         'object'    => {
             '__CLASS__' => 'Foo',
             'number' => 2
         },
     });
-    
+
     my $foo = Foo->thaw($stored, { 'format' => 'Storable' });
     isa_ok( $foo, 'Foo' );
 
     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'
@@ -153,58 +164,21 @@ BEGIN {
 
     my $yaml = $foo->freeze({ 'format' => 'YAML' });
 
-    yaml_string_ok( $yaml, '... we got valid YAML out of it' );
+    my $bar = Foo->thaw( $yaml, { 'format' => 'YAML' } );
+    isa_ok( $bar, 'Foo' );
 
-}
-
-{
-    my $foo = Foo->thaw(
-        q{--- 
-__CLASS__: Foo
-array: 
-  - 1
-  - 2
-  - 3
-  - 4
-  - 5
-  - 6
-  - 7
-  - 8
-  - 9
-  - 10
-float: 10.5
-hash: 
-  1: ~
-  10: ~
-  2: ~
-  3: ~
-  4: ~
-  5: ~
-  6: ~
-  7: ~
-  8: ~
-  9: ~
-number: 10
-object: 
-  __CLASS__: Foo
-  number: 2
-string: foo
-}, { 'format' => 'YAML' }
-    );
-    isa_ok( $foo, 'Foo' );
-
-    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(
-        $foo->hash,
+    is( $bar->number, 10,    '... got the right number' );
+    is( $bar->string, 'foo', '... got the right string' );
+    is( $bar->float,  10.5,  '... got the right float' );
+    cmp_deeply( $bar->array, [ 1 .. 10 ], '... got the right array' );
+    cmp_deeply(
+        $bar->hash,
         { map { $_ => undef } ( 1 .. 10 ) },
         '... got the right hash'
     );
 
-    isa_ok( $foo->object, 'Foo' );
-    is( $foo->object->number, 2,
+    isa_ok( $bar->object, 'Foo' );
+    is( $bar->object->number, 2,
         '... got the right number (in the embedded object)' );
 }