X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=t%2F12-suite.t;h=c95931e8159b46ec2b0b87d73a2f283668daf6cf;hb=442ba661f64513885fcf794469609f9da28beef1;hp=19b091496d86a99d97ee645f1831dc80ee057a25;hpb=e0de6ab08282e52476e36abb99a35be9eff9ca8e;p=liburi-template-perl.git

diff --git a/t/12-suite.t b/t/12-suite.t
index 19b0914..c95931e 100644
--- a/t/12-suite.t
+++ b/t/12-suite.t
@@ -4,8 +4,8 @@ use warnings;
 use Test::More;
 
 BEGIN {
-	eval "use JSON ();";
-	plan skip_all => "JSON required" if $@;
+    eval "use JSON ();";
+    plan skip_all => "JSON required" if $@;
     plan( 'no_plan' );
     use_ok( 'URI::Template' );
 }
@@ -14,18 +14,19 @@ my @files = glob( 't/data/*.json' );
 
 for my $file ( @files ) {
     open( my $json, $file );
-    my $suite = JSON::jsonToObj( do { local $/; <$json> } );
+    my $data = do { local $/; <$json> };
     close( $json );
 
+    eval { JSON->VERSION( 2 ) };
+    my $suite = $@ ? JSON::jsonToObj( $data ) : JSON::from_json( $data );
     my %variables = %{ $suite->{ variables } };
 
     my $count = 0;
     for my $test ( @{ $suite->{ tests } } ) {
         my $template = URI::Template->new( $test->{ template } );
-        my $result = $template->process( %variables );
+        my $result   = $template->process( %variables );
         $count++;
         is( $result, $test->{ expected }, "${file}#${count}" );
     }
 }
 
-