| Index: tests/utils/json_test.dart
|
| diff --git a/tests/utils/json_test.dart b/tests/utils/json_test.dart
|
| index 7d350e3f1d2c2b5ea7a644566652b79c0fa34eed..ad811d792614a303ce251db2085dcb1420663267 100644
|
| --- a/tests/utils/json_test.dart
|
| +++ b/tests/utils/json_test.dart
|
| @@ -5,7 +5,7 @@
|
| library jsonTest;
|
|
|
| import "package:expect/expect.dart";
|
| -import 'dart:json';
|
| +import 'dart:convert';
|
|
|
| main() {
|
| testEscaping();
|
| @@ -15,82 +15,82 @@ main() {
|
|
|
| void testParse() {
|
| // Scalars.
|
| - Expect.equals(5, parse(' 5 '));
|
| - Expect.equals(-42, parse(' -42 '));
|
| - Expect.equals(3, parse(' 3e0 '));
|
| - Expect.equals(3.14, parse(' 3.14 '));
|
| - Expect.equals(1.0E-06, parse(' 1.0E-06 '));
|
| - Expect.equals(0, parse("0"));
|
| - Expect.equals(1, parse("1"));
|
| - Expect.equals(0.1, parse("0.1"));
|
| - Expect.equals(1.1, parse("1.1"));
|
| - Expect.equals(1.1, parse("1.100000"));
|
| - Expect.equals(1.111111, parse("1.111111"));
|
| - Expect.equals(-0, parse("-0"));
|
| - Expect.equals(-1, parse("-1"));
|
| - Expect.equals(-0.1, parse("-0.1"));
|
| - Expect.equals(-1.1, parse("-1.1"));
|
| - Expect.equals(-1.1, parse("-1.100000"));
|
| - Expect.equals(-1.111111, parse("-1.111111"));
|
| - Expect.equals(11, parse("1.1e1"));
|
| - Expect.equals(11, parse("1.1e+1"));
|
| - Expect.equals(0.11, parse("1.1e-1"));
|
| - Expect.equals(11, parse("1.1E1"));
|
| - Expect.equals(11, parse("1.1E+1"));
|
| - Expect.equals(0.11, parse("1.1E-1"));
|
| - Expect.equals(1E0, parse(" 1E0"));
|
| - Expect.equals(1E+0, parse(" 1E+0"));
|
| - Expect.equals(1E-0, parse(" 1E-0"));
|
| - Expect.equals(1E00, parse(" 1E00"));
|
| - Expect.equals(1E+00, parse(" 1E+00"));
|
| - Expect.equals(1E-00, parse(" 1E-00"));
|
| - Expect.equals(1E+10, parse(" 1E+10"));
|
| - Expect.equals(1E+010, parse(" 1E+010"));
|
| - Expect.equals(1E+0010, parse(" 1E+0010"));
|
| - Expect.equals(1E10, parse(" 1E10"));
|
| - Expect.equals(1E010, parse(" 1E010"));
|
| - Expect.equals(1E0010, parse(" 1E0010"));
|
| - Expect.equals(1E-10, parse(" 1E-10"));
|
| - Expect.equals(1E-0010, parse(" 1E-0010"));
|
| - Expect.equals(1E0, parse(" 1e0"));
|
| - Expect.equals(1E+0, parse(" 1e+0"));
|
| - Expect.equals(1E-0, parse(" 1e-0"));
|
| - Expect.equals(1E00, parse(" 1e00"));
|
| - Expect.equals(1E+00, parse(" 1e+00"));
|
| - Expect.equals(1E-00, parse(" 1e-00"));
|
| - Expect.equals(1E+10, parse(" 1e+10"));
|
| - Expect.equals(1E+010, parse(" 1e+010"));
|
| - Expect.equals(1E+0010, parse(" 1e+0010"));
|
| - Expect.equals(1E10, parse(" 1e10"));
|
| - Expect.equals(1E010, parse(" 1e010"));
|
| - Expect.equals(1E0010, parse(" 1e0010"));
|
| - Expect.equals(1E-10, parse(" 1e-10"));
|
| - Expect.equals(1E-0010, parse(" 1e-0010"));
|
| - Expect.equals(true, parse(' true '));
|
| - Expect.equals(false, parse(' false'));
|
| - Expect.equals(null, parse(' null '));
|
| - Expect.equals(null, parse('\n\rnull\t'));
|
| - Expect.equals('hi there" bob', parse(' "hi there\\" bob" '));
|
| - Expect.equals('', parse(' "" '));
|
| + Expect.equals(5, JSON.decode(' 5 '));
|
| + Expect.equals(-42, JSON.decode(' -42 '));
|
| + Expect.equals(3, JSON.decode(' 3e0 '));
|
| + Expect.equals(3.14, JSON.decode(' 3.14 '));
|
| + Expect.equals(1.0E-06, JSON.decode(' 1.0E-06 '));
|
| + Expect.equals(0, JSON.decode("0"));
|
| + Expect.equals(1, JSON.decode("1"));
|
| + Expect.equals(0.1, JSON.decode("0.1"));
|
| + Expect.equals(1.1, JSON.decode("1.1"));
|
| + Expect.equals(1.1, JSON.decode("1.100000"));
|
| + Expect.equals(1.111111, JSON.decode("1.111111"));
|
| + Expect.equals(-0, JSON.decode("-0"));
|
| + Expect.equals(-1, JSON.decode("-1"));
|
| + Expect.equals(-0.1, JSON.decode("-0.1"));
|
| + Expect.equals(-1.1, JSON.decode("-1.1"));
|
| + Expect.equals(-1.1, JSON.decode("-1.100000"));
|
| + Expect.equals(-1.111111, JSON.decode("-1.111111"));
|
| + Expect.equals(11, JSON.decode("1.1e1"));
|
| + Expect.equals(11, JSON.decode("1.1e+1"));
|
| + Expect.equals(0.11, JSON.decode("1.1e-1"));
|
| + Expect.equals(11, JSON.decode("1.1E1"));
|
| + Expect.equals(11, JSON.decode("1.1E+1"));
|
| + Expect.equals(0.11, JSON.decode("1.1E-1"));
|
| + Expect.equals(1E0, JSON.decode(" 1E0"));
|
| + Expect.equals(1E+0, JSON.decode(" 1E+0"));
|
| + Expect.equals(1E-0, JSON.decode(" 1E-0"));
|
| + Expect.equals(1E00, JSON.decode(" 1E00"));
|
| + Expect.equals(1E+00, JSON.decode(" 1E+00"));
|
| + Expect.equals(1E-00, JSON.decode(" 1E-00"));
|
| + Expect.equals(1E+10, JSON.decode(" 1E+10"));
|
| + Expect.equals(1E+010, JSON.decode(" 1E+010"));
|
| + Expect.equals(1E+0010, JSON.decode(" 1E+0010"));
|
| + Expect.equals(1E10, JSON.decode(" 1E10"));
|
| + Expect.equals(1E010, JSON.decode(" 1E010"));
|
| + Expect.equals(1E0010, JSON.decode(" 1E0010"));
|
| + Expect.equals(1E-10, JSON.decode(" 1E-10"));
|
| + Expect.equals(1E-0010, JSON.decode(" 1E-0010"));
|
| + Expect.equals(1E0, JSON.decode(" 1e0"));
|
| + Expect.equals(1E+0, JSON.decode(" 1e+0"));
|
| + Expect.equals(1E-0, JSON.decode(" 1e-0"));
|
| + Expect.equals(1E00, JSON.decode(" 1e00"));
|
| + Expect.equals(1E+00, JSON.decode(" 1e+00"));
|
| + Expect.equals(1E-00, JSON.decode(" 1e-00"));
|
| + Expect.equals(1E+10, JSON.decode(" 1e+10"));
|
| + Expect.equals(1E+010, JSON.decode(" 1e+010"));
|
| + Expect.equals(1E+0010, JSON.decode(" 1e+0010"));
|
| + Expect.equals(1E10, JSON.decode(" 1e10"));
|
| + Expect.equals(1E010, JSON.decode(" 1e010"));
|
| + Expect.equals(1E0010, JSON.decode(" 1e0010"));
|
| + Expect.equals(1E-10, JSON.decode(" 1e-10"));
|
| + Expect.equals(1E-0010, JSON.decode(" 1e-0010"));
|
| + Expect.equals(true, JSON.decode(' true '));
|
| + Expect.equals(false, JSON.decode(' false'));
|
| + Expect.equals(null, JSON.decode(' null '));
|
| + Expect.equals(null, JSON.decode('\n\rnull\t'));
|
| + Expect.equals('hi there" bob', JSON.decode(' "hi there\\" bob" '));
|
| + Expect.equals('', JSON.decode(' "" '));
|
|
|
| // Lists.
|
| - Expect.listEquals([], parse(' [] '));
|
| - Expect.listEquals(["entry"], parse(' ["entry"] '));
|
| - Expect.listEquals([true, false], parse(' [true, false] '));
|
| - Expect.listEquals([1, 2, 3], parse(' [ 1 , 2 , 3 ] '));
|
| + Expect.listEquals([], JSON.decode(' [] '));
|
| + Expect.listEquals(["entry"], JSON.decode(' ["entry"] '));
|
| + Expect.listEquals([true, false], JSON.decode(' [true, false] '));
|
| + Expect.listEquals([1, 2, 3], JSON.decode(' [ 1 , 2 , 3 ] '));
|
|
|
| // Maps.
|
| - Expect.mapEquals({}, parse(' {} '));
|
| - Expect.mapEquals({"key": "value"}, parse(' {"key": "value" } '));
|
| + Expect.mapEquals({}, JSON.decode(' {} '));
|
| + Expect.mapEquals({"key": "value"}, JSON.decode(' {"key": "value" } '));
|
| Expect.mapEquals({"key1": 1, "key2": 2},
|
| - parse(' {"key1": 1, "key2": 2} '));
|
| + JSON.decode(' {"key1": 1, "key2": 2} '));
|
| Expect.mapEquals({"key1": 1},
|
| - parse(' { "key1" : 1 } '));
|
| + JSON.decode(' { "key1" : 1 } '));
|
| }
|
|
|
| void testParseInvalid() {
|
| void testString(String s) {
|
| - Expect.throws(() => parse(s), (e) => e is FormatException);
|
| + Expect.throws(() => JSON.decode(s), (e) => e is FormatException);
|
| }
|
| // Scalars
|
| testString("");
|
| @@ -136,43 +136,43 @@ void testParseInvalid() {
|
| }
|
|
|
| void testEscaping() {
|
| - Expect.stringEquals('""', stringify(''));
|
| - Expect.stringEquals('"\\u0000"', stringify('\u0000'));
|
| - Expect.stringEquals('"\\u0001"', stringify('\u0001'));
|
| - Expect.stringEquals('"\\u0002"', stringify('\u0002'));
|
| - Expect.stringEquals('"\\u0003"', stringify('\u0003'));
|
| - Expect.stringEquals('"\\u0004"', stringify('\u0004'));
|
| - Expect.stringEquals('"\\u0005"', stringify('\u0005'));
|
| - Expect.stringEquals('"\\u0006"', stringify('\u0006'));
|
| - Expect.stringEquals('"\\u0007"', stringify('\u0007'));
|
| - Expect.stringEquals('"\\b"', stringify('\u0008'));
|
| - Expect.stringEquals('"\\t"', stringify('\u0009'));
|
| - Expect.stringEquals('"\\n"', stringify('\u000a'));
|
| - Expect.stringEquals('"\\u000b"', stringify('\u000b'));
|
| - Expect.stringEquals('"\\f"', stringify('\u000c'));
|
| - Expect.stringEquals('"\\r"', stringify('\u000d'));
|
| - Expect.stringEquals('"\\u000e"', stringify('\u000e'));
|
| - Expect.stringEquals('"\\u000f"', stringify('\u000f'));
|
| - Expect.stringEquals('"\\u0010"', stringify('\u0010'));
|
| - Expect.stringEquals('"\\u0011"', stringify('\u0011'));
|
| - Expect.stringEquals('"\\u0012"', stringify('\u0012'));
|
| - Expect.stringEquals('"\\u0013"', stringify('\u0013'));
|
| - Expect.stringEquals('"\\u0014"', stringify('\u0014'));
|
| - Expect.stringEquals('"\\u0015"', stringify('\u0015'));
|
| - Expect.stringEquals('"\\u0016"', stringify('\u0016'));
|
| - Expect.stringEquals('"\\u0017"', stringify('\u0017'));
|
| - Expect.stringEquals('"\\u0018"', stringify('\u0018'));
|
| - Expect.stringEquals('"\\u0019"', stringify('\u0019'));
|
| - Expect.stringEquals('"\\u001a"', stringify('\u001a'));
|
| - Expect.stringEquals('"\\u001b"', stringify('\u001b'));
|
| - Expect.stringEquals('"\\u001c"', stringify('\u001c'));
|
| - Expect.stringEquals('"\\u001d"', stringify('\u001d'));
|
| - Expect.stringEquals('"\\u001e"', stringify('\u001e'));
|
| - Expect.stringEquals('"\\u001f"', stringify('\u001f'));
|
| - Expect.stringEquals('"\\\""', stringify('"'));
|
| - Expect.stringEquals('"\\\\"', stringify('\\'));
|
| + Expect.stringEquals('""', JSON.encode(''));
|
| + Expect.stringEquals('"\\u0000"', JSON.encode('\u0000'));
|
| + Expect.stringEquals('"\\u0001"', JSON.encode('\u0001'));
|
| + Expect.stringEquals('"\\u0002"', JSON.encode('\u0002'));
|
| + Expect.stringEquals('"\\u0003"', JSON.encode('\u0003'));
|
| + Expect.stringEquals('"\\u0004"', JSON.encode('\u0004'));
|
| + Expect.stringEquals('"\\u0005"', JSON.encode('\u0005'));
|
| + Expect.stringEquals('"\\u0006"', JSON.encode('\u0006'));
|
| + Expect.stringEquals('"\\u0007"', JSON.encode('\u0007'));
|
| + Expect.stringEquals('"\\b"', JSON.encode('\u0008'));
|
| + Expect.stringEquals('"\\t"', JSON.encode('\u0009'));
|
| + Expect.stringEquals('"\\n"', JSON.encode('\u000a'));
|
| + Expect.stringEquals('"\\u000b"', JSON.encode('\u000b'));
|
| + Expect.stringEquals('"\\f"', JSON.encode('\u000c'));
|
| + Expect.stringEquals('"\\r"', JSON.encode('\u000d'));
|
| + Expect.stringEquals('"\\u000e"', JSON.encode('\u000e'));
|
| + Expect.stringEquals('"\\u000f"', JSON.encode('\u000f'));
|
| + Expect.stringEquals('"\\u0010"', JSON.encode('\u0010'));
|
| + Expect.stringEquals('"\\u0011"', JSON.encode('\u0011'));
|
| + Expect.stringEquals('"\\u0012"', JSON.encode('\u0012'));
|
| + Expect.stringEquals('"\\u0013"', JSON.encode('\u0013'));
|
| + Expect.stringEquals('"\\u0014"', JSON.encode('\u0014'));
|
| + Expect.stringEquals('"\\u0015"', JSON.encode('\u0015'));
|
| + Expect.stringEquals('"\\u0016"', JSON.encode('\u0016'));
|
| + Expect.stringEquals('"\\u0017"', JSON.encode('\u0017'));
|
| + Expect.stringEquals('"\\u0018"', JSON.encode('\u0018'));
|
| + Expect.stringEquals('"\\u0019"', JSON.encode('\u0019'));
|
| + Expect.stringEquals('"\\u001a"', JSON.encode('\u001a'));
|
| + Expect.stringEquals('"\\u001b"', JSON.encode('\u001b'));
|
| + Expect.stringEquals('"\\u001c"', JSON.encode('\u001c'));
|
| + Expect.stringEquals('"\\u001d"', JSON.encode('\u001d'));
|
| + Expect.stringEquals('"\\u001e"', JSON.encode('\u001e'));
|
| + Expect.stringEquals('"\\u001f"', JSON.encode('\u001f'));
|
| + Expect.stringEquals('"\\\""', JSON.encode('"'));
|
| + Expect.stringEquals('"\\\\"', JSON.encode('\\'));
|
| Expect.stringEquals('"Got \\b, \\f, \\n, \\r, \\t, \\u0000, \\\\, and \\"."',
|
| - stringify('Got \b, \f, \n, \r, \t, \u0000, \\, and ".'));
|
| + JSON.encode('Got \b, \f, \n, \r, \t, \u0000, \\, and ".'));
|
| Expect.stringEquals('"Got \\b\\f\\n\\r\\t\\u0000\\\\\\"."',
|
| - stringify('Got \b\f\n\r\t\u0000\\".'));
|
| + JSON.encode('Got \b\f\n\r\t\u0000\\".'));
|
| }
|
|
|