X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F001_basic.t;h=faf41ebf6544b869b5404b5a0d4e4e2981ff6323;hb=54d6ff364f51d33839d796256e295f165e20fa7b;hp=e84210703401c822580b9847dd30ae10f4892891;hpb=b5384d082ce9b7c4fc23c74c4dfc4479ddbe7a67;p=gitmo%2FMooseX-Storage.git

diff --git a/t/001_basic.t b/t/001_basic.t
index e842107..faf41eb 100644
--- a/t/001_basic.t
+++ b/t/001_basic.t
@@ -3,7 +3,11 @@
 use strict;
 use warnings;
 
-use Test::More no_plan => 1;
+use Test::More tests => 14;
+
+BEGIN {
+    use_ok('MooseX::Storage');
+}
 
 {
 
@@ -11,46 +15,77 @@ use Test::More no_plan => 1;
     use Moose;
     use MooseX::Storage;
 
-    with Storage( 'format' => 'JSON' );
+    with Storage;
 
-    has 'number' => ( is => 'ro', isa => 'Int' );
-    has 'string' => ( is => 'ro', isa => 'Str' );
-    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 'number'  => ( is => 'ro', isa => 'Int' );
+    has 'string'  => ( is => 'ro', isa => 'Str' );
+    has 'boolean' => ( is => 'ro', isa => 'Bool' );
+    has 'float'   => ( is => 'ro', isa => 'Num' );
+    has 'array'   => ( is => 'ro', isa => 'ArrayRef' );
+    has 'hash'    => ( is => 'ro', isa => 'HashRef' );
+    has 'object'  => ( is => 'ro', isa => 'Foo' );
+    has 'union'   => ( is => 'ro', isa => 'ArrayRef|Str' );
+    has 'union2'   => ( is => 'ro', isa => 'ArrayRef|Str' );
 }
 
-SKIP: {
-    eval { require Test::JSON };
-    skip "HTML::Lint not installed", 3 if $@;
-    Test::JSON->import();
+{
     my $foo = Foo->new(
-        number => 10,
-        string => 'foo',
-        float  => 10.5,
-        array  => [ 1 .. 10 ],
-        hash   => { map { $_ => undef } ( 1 .. 10 ) },
-        object => Foo->new( number => 2 ),
+        number  => 10,
+        string  => 'foo',
+        boolean => 1,
+        float   => 10.5,
+        array   => [ 1 .. 10 ],
+        hash    => { map { $_ => undef } ( 1 .. 10 ) },
+        object  => Foo->new( number => 2 ),
+        union   => [ 1, 2, 3 ],
+        union2  => 'A String'
     );
     isa_ok( $foo, 'Foo' );
-    my $json = $foo->freeze;
-    is_valid_json($json);
-    is_json(
-        $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'
+
+    is_deeply(
+        $foo->pack,
+        {
+            __CLASS__ => 'Foo',
+            number    => 10,
+            string    => 'foo',
+            boolean   => 1,
+            float     => 10.5,
+            array     => [ 1 .. 10 ],
+            hash      => { map { $_ => undef } ( 1 .. 10 ) },
+            object    => {
+                            __CLASS__ => 'Foo',
+                            number    => 2
+                         },
+            union     => [ 1, 2, 3 ],
+            union2    => 'A String'
+        },
+        '... got the right frozen class'
     );
 }
 
 {
-    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"}'
+    my $foo = Foo->unpack(
+        {
+            __CLASS__ => 'Foo',
+            number    => 10,
+            string    => 'foo',
+            boolean   => 1,
+            float     => 10.5,
+            array     => [ 1 .. 10 ],
+            hash      => { map { $_ => undef } ( 1 .. 10 ) },
+            object    => {
+                            __CLASS__ => 'Foo',
+                            number    => 2
+                         },
+            union     => [ 1, 2, 3 ],
+            union2    => 'A String'
+        }
     );
     isa_ok( $foo, 'Foo' );
 
     is( $foo->number, 10,    '... got the right number' );
     is( $foo->string, 'foo', '... got the right string' );
+    ok( $foo->boolean,       '... got the right boolean' );
     is( $foo->float,  10.5,  '... got the right float' );
     is_deeply( $foo->array, [ 1 .. 10 ], '... got the right array' );
     is_deeply(
@@ -62,5 +97,6 @@ SKIP: {
     isa_ok( $foo->object, 'Foo' );
     is( $foo->object->number, 2,
         '... got the right number (in the embedded object)' );
+    is_deeply( $foo->union, [ 1 .. 3 ], '... got the right array (in the union)' );
+    is( $foo->union2,  'A String',  '... got the right string (in the union)' );
 }
-