X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F061_basic_deferred_w_io.t;h=95539ae51678354241b3362ecf2fb8e17cf998ff;hb=8b2ba857269b040d3a0f11f3d95e2c5b9af44415;hp=3cc66af136b225c8232def5b29fe7b42d80ea0a1;hpb=cfee09ad9535c50ee223c90fb34afd9667866bcb;p=gitmo%2FMooseX-Storage.git

diff --git a/t/061_basic_deferred_w_io.t b/t/061_basic_deferred_w_io.t
index 3cc66af..95539ae 100644
--- a/t/061_basic_deferred_w_io.t
+++ b/t/061_basic_deferred_w_io.t
@@ -1,14 +1,20 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
 use Test::More;
+use Test::Deep;
+use File::Temp qw(tempdir);
+use File::Spec::Functions;
+
+my $dir = tempdir;
+
+use Test::Requires {
+    'IO::AtomicFile' => 0.01, # skip all if not installed
+    'JSON::Any' => 0.01,
+};
 
 BEGIN {
-    eval "use IO::AtomicFile";
-    plan skip_all => "IO::AtomicFile is required for this test" if $@;        
-    plan tests => 21;    
+    plan tests => 20;
     use_ok('MooseX::Storage');
 }
 
@@ -16,18 +22,18 @@ BEGIN {
     package Foo;
     use Moose;
     use MooseX::Storage;
-    
+
     with 'MooseX::Storage::Deferred';
-    
+
     has 'number' => (is => 'ro', isa => 'Int');
     has 'string' => (is => 'ro', isa => 'Str');
-    has 'float'  => (is => 'ro', isa => 'Num');        
+    has 'float'  => (is => 'ro', isa => 'Num');
     has 'array'  => (is => 'ro', isa => 'ArrayRef');
-    has 'hash'   => (is => 'ro', isa => 'HashRef');    
-	has 'object' => (is => 'ro', isa => 'Object');    
+    has 'hash'   => (is => 'ro', isa => 'HashRef');
+    has 'object' => (is => 'ro', isa => 'Object');
 }
 
-my $file = 'temp.json';
+my $file = catfile($dir, 'temp.json');
 
 {
     my $foo = Foo->new(
@@ -36,7 +42,7 @@ my $file = 'temp.json';
         float  => 10.5,
         array  => [ 1 .. 10 ],
         hash   => { map { $_ => undef } (1 .. 10) },
-    	object => Foo->new( number => 2 ),
+        object => Foo->new( number => 2 ),
     );
     isa_ok($foo, 'Foo');
 
@@ -50,8 +56,8 @@ my $file = 'temp.json';
     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, { map { $_ => undef } (1 .. 10) }, '... got the right hash');
+    cmp_deeply($foo->array, [ 1 .. 10], '... got the right array');
+    cmp_deeply($foo->hash, { map { $_ => undef } (1 .. 10) }, '... got the right hash');
 
     isa_ok($foo->object, 'Foo');
     is($foo->object->number, 2, '... got the right number (in the embedded object)');
@@ -67,7 +73,7 @@ ok(!(-e $file), '... the file has been deleted');
         float  => 10.5,
         array  => [ 1 .. 10 ],
         hash   => { map { $_ => undef } (1 .. 10) },
-    	object => Foo->new( number => 2 ),
+        object => Foo->new( number => 2 ),
     );
     isa_ok($foo, 'Foo');
 
@@ -81,13 +87,11 @@ ok(!(-e $file), '... the file has been deleted');
     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, { map { $_ => undef } (1 .. 10) }, '... got the right hash');
+    cmp_deeply($foo->array, [ 1 .. 10], '... got the right array');
+    cmp_deeply($foo->hash, { map { $_ => undef } (1 .. 10) }, '... got the right hash');
 
     isa_ok($foo->object, 'Foo');
     is($foo->object->number, 2, '... got the right number (in the embedded object)');
 }
 
-unlink $file;
-ok(!(-e $file), '... the file has been deleted');