X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F011_basic_json_w_utf8.t;h=a56dde0c265124d00e220536dfceac954cff2fc0;hb=cd4cef76da2af19af449e8c4c366e3111c6530ba;hp=b8d4c915e71435fdd8e2bd9c67b48678b78645fa;hpb=766ab81f59db9f3087e0011112ff2e69133a85c5;p=gitmo%2FMooseX-Storage.git

diff --git a/t/011_basic_json_w_utf8.t b/t/011_basic_json_w_utf8.t
index b8d4c91..a56dde0 100644
--- a/t/011_basic_json_w_utf8.t
+++ b/t/011_basic_json_w_utf8.t
@@ -5,20 +5,22 @@ use warnings;
 
 use Test::More;
 
+use Test::Requires {
+    'Encode' => 0.01, # skip all if not installed
+    'JSON::Any' => 0.01,
+};
+
 BEGIN {
-    eval "use Encode";
-    plan skip_all => "Encode is required for this test" if $@;
-    eval "use JSON::Any";
-    plan skip_all => "JSON::Any is required for this test" if $@; 
-    # NOTE:
-    # this is because JSON::XS is
+    # NOTE: 
+    # this is because JSON::XS is 
     # the only one which really gets
     # utf8 correct
-    # - SL
+    # - SL 
     BEGIN {
         $ENV{JSON_ANY_ORDER}  = qw(XS);
-        $ENV{JSON_ANY_CONFIG} = "utf8=1"; 
-    } 
+        $ENV{JSON_ANY_CONFIG} = "utf8=0,canonical=1";
+    }
+
     plan tests => 16;
     use_ok('MooseX::Storage');
 }
@@ -29,7 +31,7 @@ BEGIN {
     use MooseX::Storage;
 
     with Storage( 'format' => 'JSON' );
-
+    
     has 'utf8_string' => (
         is      => 'rw',
         isa     => 'Str',
@@ -49,14 +51,14 @@ BEGIN {
 
     my $foo2 = Foo->thaw($json);
     isa_ok( $foo, 'Foo' );
-
-    is($foo2->utf8_string,
-      "ネットスーパー (Internet Shopping)",
+    
+    is($foo2->utf8_string, 
+      "ネットスーパー (Internet Shopping)", 
       '... got the string we expected');
-
+      
     is($foo2->freeze,
        '{"__CLASS__":"Foo","utf8_string":"ネットスーパー (Internet Shopping)"}',
-       '... got the right JSON');
+       '... got the right JSON');          
 }
 
 {
@@ -66,15 +68,15 @@ BEGIN {
         $test_string = "ネットスーパー (Internet Shopping)";
         no utf8;
     }
-
+    
     ok(utf8::is_utf8($test_string), '... got a utf8 string');
-    ok(utf8::valid($test_string), '... got a valid utf8 string');
-
+    ok(utf8::valid($test_string), '... got a valid utf8 string');    
+    
     Encode::_utf8_off($test_string);
-
+    
     ok(!utf8::is_utf8($test_string), '... no longer is utf8 string');
-    ok(utf8::valid($test_string), '... got a valid utf8 string');
-
+    ok(utf8::valid($test_string), '... got a valid utf8 string');    
+    
     my $foo = Foo->new(
         utf8_string => $test_string
     );
@@ -84,11 +86,11 @@ BEGIN {
     ok(utf8::valid($foo->utf8_string), '... but is a valid utf8 string');
 
     my $json = $foo->freeze;
-
+    
     ok(utf8::is_utf8($json), '... is a utf8 string now');
-    ok(utf8::valid($json), '... got a valid utf8 string');
+    ok(utf8::valid($json), '... got a valid utf8 string');    
 
     is($json,
        '{"__CLASS__":"Foo","utf8_string":"ネットスーパー (Internet Shopping)"}',
-       '... got the right JSON');
+       '... got the right JSON');    
 }