X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F060_basic_deferred.t;h=a93c890d173a2440aedb7b7565b7b6b8184c299a;hb=f16b57403e78d22ab73a98b8714d2dae8e1ca207;hp=9be9b3a3db860beeb3b90904d40c7c8abe756579;hpb=4fa64e865c99a6dcc3bec159a662300151d62fdf;p=gitmo%2FMooseX-Storage.git

diff --git a/t/060_basic_deferred.t b/t/060_basic_deferred.t
index 9be9b3a..a93c890 100644
--- a/t/060_basic_deferred.t
+++ b/t/060_basic_deferred.t
@@ -8,11 +8,13 @@ use Test::More;
 use Storable;
 
 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 Test::JSON";
+    plan skip_all => "Test::JSON is required for this test" if $@;
     eval "use JSON::Any";
-    plan skip_all => "JSON::Any is required for this test" if $@;          
-    plan tests => 33;    
+    plan skip_all => "JSON::Any is required for this test" if $@;
+    eval "use YAML::Any";
+    plan skip_all => "YAML::Any is required for this test" if $@;
+    plan tests => 31;
     use_ok('MooseX::Storage');
 }
 
@@ -153,94 +155,21 @@ BEGIN {
 
     my $yaml = $foo->freeze({ 'format' => 'YAML' });
 
-    yaml_string_ok( $yaml, '... we got valid YAML out of it' );
-
-    is(
-        $yaml,
-        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
-},
-        '... got the same YAML'
-    );
-
-}
-
-{
-    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' );
+    my $bar = Foo->thaw( $yaml, { 'format' => 'YAML' } );
+    isa_ok( $bar, '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( $bar->number, 10,    '... got the right number' );
+    is( $bar->string, 'foo', '... got the right string' );
+    is( $bar->float,  10.5,  '... got the right float' );
+    is_deeply( $bar->array, [ 1 .. 10 ], '... got the right array' );
     is_deeply(
-        $foo->hash,
+        $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)' );
 }