bump to latest version of bundle

[gitmo/MooseX-Storage.git] / t / 011_basic_json_w_utf8.t

diff --git a/t/011_basic_json_w_utf8.t b/t/011_basic_json_w_utf8.t
index b8d4c91..7a84b40 100644 (file)
--- a/t/011_basic_json_w_utf8.t
+++ b/t/011_basic_json_w_utf8.t
@@ -1,28 +1,25 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
 use Test::More;
 
+# NOTE:
+# this is because JSON::XS (and Cpanel::JSON::XS) is
+# the only one which really gets utf8 correct
+# - SL
 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
-    # the only one which really gets
-    # utf8 correct
-    # - SL
-    BEGIN {
-        $ENV{JSON_ANY_ORDER}  = qw(XS);
-        $ENV{JSON_ANY_CONFIG} = "utf8=1"; 
-    } 
-    plan tests => 16;
-    use_ok('MooseX::Storage');
+    $ENV{JSON_ANY_ORDER}  = 'XS CPANEL';
+    $ENV{JSON_ANY_CONFIG} = "utf8=0,canonical=1";
 }
 
+use Test::Requires {
+    'Encode' => 0.01, # skip all if not installed
+    'JSON::Any' => 0.01,
+};
+
+plan tests => 16;
+use_ok('MooseX::Storage');
+
 {
     package Foo;
     use Moose;