--- JSON-XS/t/03_types.t	2007/07/23 22:57:40	1.6
+++ JSON-XS/t/03_types.t	2007/12/05 10:59:30	1.7
@@ -28,32 +28,32 @@
 ok (JSON::XS->new->allow_nonref (1)->decode ('2.5') == 2.5);
 
 ok (JSON::XS->new->allow_nonref (1)->decode ('""') eq "");
-ok ('[1,2,3,4]' eq to_json from_json ('[1,2, 3,4]'));
-ok ('[{},[],[],{}]' eq to_json from_json ('[{},[], [ ] ,{ }]'));
-ok ('[{"1":[5]}]' eq to_json [{1 => [5]}]);
-ok ('{"1":2,"3":4}' eq JSON::XS->new->canonical (1)->encode (from_json '{ "1" : 2, "3" : 4 }'));
-ok ('{"1":2,"3":1.2}' eq JSON::XS->new->canonical (1)->encode (from_json '{ "1" : 2, "3" : 1.2 }'));
-
-ok ('[true]'  eq to_json [JSON::XS::true]);
-ok ('[false]' eq to_json [JSON::XS::false]);
-ok ('[true]'  eq to_json [\1]);
-ok ('[false]' eq to_json [\0]);
-ok ('[null]'  eq to_json [undef]);
-ok ('[true]'  eq to_json [JSON::XS::true]);
-ok ('[false]' eq to_json [JSON::XS::false]);
+ok ('[1,2,3,4]' eq encode_json decode_json ('[1,2, 3,4]'));
+ok ('[{},[],[],{}]' eq encode_json decode_json ('[{},[], [ ] ,{ }]'));
+ok ('[{"1":[5]}]' eq encode_json [{1 => [5]}]);
+ok ('{"1":2,"3":4}' eq JSON::XS->new->canonical (1)->encode (decode_json '{ "1" : 2, "3" : 4 }'));
+ok ('{"1":2,"3":1.2}' eq JSON::XS->new->canonical (1)->encode (decode_json '{ "1" : 2, "3" : 1.2 }'));
+
+ok ('[true]'  eq encode_json [JSON::XS::true]);
+ok ('[false]' eq encode_json [JSON::XS::false]);
+ok ('[true]'  eq encode_json [\1]);
+ok ('[false]' eq encode_json [\0]);
+ok ('[null]'  eq encode_json [undef]);
+ok ('[true]'  eq encode_json [JSON::XS::true]);
+ok ('[false]' eq encode_json [JSON::XS::false]);
 
 for $v (1, 2, 3, 5, -1, -2, -3, -4, 100, 1000, 10000, -999, -88, -7, 7, 88, 999, -1e5, 1e6, 1e7, 1e8) {
-   ok ($v == ((from_json "[$v]")->[0]));
-   ok ($v == ((from_json to_json [$v])->[0]));
+   ok ($v == ((decode_json "[$v]")->[0]));
+   ok ($v == ((decode_json encode_json [$v])->[0]));
 }
 
-ok (30123 == ((from_json to_json [30123])->[0]));
-ok (32123 == ((from_json to_json [32123])->[0]));
-ok (32456 == ((from_json to_json [32456])->[0]));
-ok (32789 == ((from_json to_json [32789])->[0]));
-ok (32767 == ((from_json to_json [32767])->[0]));
-ok (32768 == ((from_json to_json [32768])->[0]));
+ok (30123 == ((decode_json encode_json [30123])->[0]));
+ok (32123 == ((decode_json encode_json [32123])->[0]));
+ok (32456 == ((decode_json encode_json [32456])->[0]));
+ok (32789 == ((decode_json encode_json [32789])->[0]));
+ok (32767 == ((decode_json encode_json [32767])->[0]));
+ok (32768 == ((decode_json encode_json [32768])->[0]));
 
 my @sparse; @sparse[0,3] = (1, 4);
-ok ("[1,null,null,4]" eq to_json \@sparse);
+ok ("[1,null,null,4]" eq encode_json \@sparse);