X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=t%2F12-suite.t;h=1acb5b5cadd857cb5aaafc089af190e5af3bc430;hb=1b350f7b046bbc833e37a9fba91fc808c0fed41a;hp=83f0e995780a5ae8dfd5d2f17cc1f6d6f4e95a0a;hpb=0bf9e38bd59ec2d30d98cdd5b1ff6659bc776761;p=liburi-template-perl.git

diff --git a/t/12-suite.t b/t/12-suite.t
index 83f0e99..1acb5b5 100644
--- a/t/12-suite.t
+++ b/t/12-suite.t
@@ -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 );
 
-    my %variables = %{ $suite->{ variables } };
+    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 );
+    for my $test (@{ $suite->{tests} }) {
+        my $template = URI::Template->new( $test->{template} );
+        my $result   = $template->process( $variables );
         $count++;
-        is( $result, $test->{ expected }, "${file}#${count}" );
+        is( $result, $test->{expected}, "${file} test ${count}" );
     }
 }
 
-