From 0d8ce979a4d98c895f5f75826e8c49f02a64f311 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 15 Jan 2015 12:44:05 -0800 Subject: Move tests to integration tests --- tests/README.md | 1 + .../array-mixed-types-ints-and-floats.json | 15 ++ tests/invalid.rs | 78 ++++++++++ .../invalid/array-mixed-types-arrays-and-ints.toml | 1 + .../invalid/array-mixed-types-ints-and-floats.toml | 1 + .../array-mixed-types-strings-and-ints.toml | 1 + tests/invalid/datetime-malformed-no-leads.toml | 1 + tests/invalid/datetime-malformed-no-secs.toml | 1 + tests/invalid/datetime-malformed-no-t.toml | 1 + tests/invalid/datetime-malformed-no-z.toml | 1 + tests/invalid/datetime-malformed-with-milli.toml | 1 + tests/invalid/duplicate-key-table.toml | 5 + tests/invalid/duplicate-keys.toml | 2 + tests/invalid/duplicate-tables.toml | 2 + tests/invalid/empty-implicit-table.toml | 1 + tests/invalid/empty-table.toml | 1 + tests/invalid/float-no-leading-zero.toml | 2 + tests/invalid/float-no-trailing-digits.toml | 2 + tests/invalid/key-two-equals.toml | 1 + tests/invalid/string-bad-byte-escape.toml | 1 + tests/invalid/string-bad-escape.toml | 1 + tests/invalid/string-byte-escapes.toml | 1 + tests/invalid/string-no-close.toml | 1 + tests/invalid/table-array-implicit.toml | 14 ++ tests/invalid/table-array-malformed-bracket.toml | 2 + tests/invalid/table-array-malformed-empty.toml | 2 + tests/invalid/table-nested-brackets-close.toml | 2 + tests/invalid/table-nested-brackets-open.toml | 2 + tests/invalid/text-after-array-entries.toml | 4 + tests/invalid/text-after-integer.toml | 1 + tests/invalid/text-after-string.toml | 1 + tests/invalid/text-after-table.toml | 1 + tests/invalid/text-before-array-separator.toml | 4 + tests/invalid/text-in-array.toml | 5 + tests/valid.rs | 168 +++++++++++++++++++++ tests/valid/array-empty.json | 11 ++ tests/valid/array-empty.toml | 1 + tests/valid/array-nospaces.json | 10 ++ tests/valid/array-nospaces.toml | 1 + tests/valid/arrays-hetergeneous.json | 19 +++ tests/valid/arrays-hetergeneous.toml | 1 + tests/valid/arrays-nested.json | 13 ++ tests/valid/arrays-nested.toml | 1 + tests/valid/arrays.json | 34 +++++ tests/valid/arrays.toml | 9 ++ tests/valid/bool.json | 4 + tests/valid/bool.toml | 2 + tests/valid/comments-everywhere.json | 12 ++ tests/valid/comments-everywhere.toml | 24 +++ tests/valid/datetime.json | 3 + tests/valid/datetime.toml | 1 + tests/valid/empty.json | 1 + tests/valid/empty.toml | 0 tests/valid/example.json | 14 ++ tests/valid/example.toml | 5 + tests/valid/float.json | 4 + tests/valid/float.toml | 2 + tests/valid/implicit-and-explicit-after.json | 10 ++ tests/valid/implicit-and-explicit-after.toml | 5 + tests/valid/implicit-and-explicit-before.json | 10 ++ tests/valid/implicit-and-explicit-before.toml | 5 + tests/valid/implicit-groups.json | 9 ++ tests/valid/implicit-groups.toml | 2 + tests/valid/integer.json | 4 + tests/valid/integer.toml | 2 + tests/valid/key-equals-nospace.json | 3 + tests/valid/key-equals-nospace.toml | 1 + tests/valid/key-special-chars.json | 5 + tests/valid/key-special-chars.toml | 1 + tests/valid/key-with-pound.json | 3 + tests/valid/key-with-pound.toml | 1 + tests/valid/long-float.json | 4 + tests/valid/long-float.toml | 2 + tests/valid/long-integer.json | 4 + tests/valid/long-integer.toml | 2 + tests/valid/string-empty.json | 6 + tests/valid/string-empty.toml | 1 + tests/valid/string-escapes.json | 34 +++++ tests/valid/string-escapes.toml | 8 + tests/valid/string-simple.json | 6 + tests/valid/string-simple.toml | 1 + tests/valid/string-with-pound.json | 7 + tests/valid/string-with-pound.toml | 2 + tests/valid/table-array-implicit.json | 7 + tests/valid/table-array-implicit.toml | 2 + tests/valid/table-array-many.json | 16 ++ tests/valid/table-array-many.toml | 11 ++ tests/valid/table-array-nest.json | 18 +++ tests/valid/table-array-nest.toml | 17 +++ tests/valid/table-array-one.json | 8 + tests/valid/table-array-one.toml | 3 + tests/valid/table-empty.json | 3 + tests/valid/table-empty.toml | 1 + tests/valid/table-sub-empty.json | 3 + tests/valid/table-sub-empty.toml | 2 + tests/valid/table-whitespace.json | 3 + tests/valid/table-whitespace.toml | 1 + tests/valid/table-with-pound.json | 5 + tests/valid/table-with-pound.toml | 2 + tests/valid/unicode-escape.json | 3 + tests/valid/unicode-escape.toml | 1 + tests/valid/unicode-literal.json | 3 + tests/valid/unicode-literal.toml | 1 + 103 files changed, 748 insertions(+) create mode 100644 tests/README.md create mode 100644 tests/invalid-encoder/array-mixed-types-ints-and-floats.json create mode 100644 tests/invalid.rs create mode 100644 tests/invalid/array-mixed-types-arrays-and-ints.toml create mode 100644 tests/invalid/array-mixed-types-ints-and-floats.toml create mode 100644 tests/invalid/array-mixed-types-strings-and-ints.toml create mode 100644 tests/invalid/datetime-malformed-no-leads.toml create mode 100644 tests/invalid/datetime-malformed-no-secs.toml create mode 100644 tests/invalid/datetime-malformed-no-t.toml create mode 100644 tests/invalid/datetime-malformed-no-z.toml create mode 100644 tests/invalid/datetime-malformed-with-milli.toml create mode 100644 tests/invalid/duplicate-key-table.toml create mode 100644 tests/invalid/duplicate-keys.toml create mode 100644 tests/invalid/duplicate-tables.toml create mode 100644 tests/invalid/empty-implicit-table.toml create mode 100644 tests/invalid/empty-table.toml create mode 100644 tests/invalid/float-no-leading-zero.toml create mode 100644 tests/invalid/float-no-trailing-digits.toml create mode 100644 tests/invalid/key-two-equals.toml create mode 100644 tests/invalid/string-bad-byte-escape.toml create mode 100644 tests/invalid/string-bad-escape.toml create mode 100644 tests/invalid/string-byte-escapes.toml create mode 100644 tests/invalid/string-no-close.toml create mode 100644 tests/invalid/table-array-implicit.toml create mode 100644 tests/invalid/table-array-malformed-bracket.toml create mode 100644 tests/invalid/table-array-malformed-empty.toml create mode 100644 tests/invalid/table-nested-brackets-close.toml create mode 100644 tests/invalid/table-nested-brackets-open.toml create mode 100644 tests/invalid/text-after-array-entries.toml create mode 100644 tests/invalid/text-after-integer.toml create mode 100644 tests/invalid/text-after-string.toml create mode 100644 tests/invalid/text-after-table.toml create mode 100644 tests/invalid/text-before-array-separator.toml create mode 100644 tests/invalid/text-in-array.toml create mode 100644 tests/valid.rs create mode 100644 tests/valid/array-empty.json create mode 100644 tests/valid/array-empty.toml create mode 100644 tests/valid/array-nospaces.json create mode 100644 tests/valid/array-nospaces.toml create mode 100644 tests/valid/arrays-hetergeneous.json create mode 100644 tests/valid/arrays-hetergeneous.toml create mode 100644 tests/valid/arrays-nested.json create mode 100644 tests/valid/arrays-nested.toml create mode 100644 tests/valid/arrays.json create mode 100644 tests/valid/arrays.toml create mode 100644 tests/valid/bool.json create mode 100644 tests/valid/bool.toml create mode 100644 tests/valid/comments-everywhere.json create mode 100644 tests/valid/comments-everywhere.toml create mode 100644 tests/valid/datetime.json create mode 100644 tests/valid/datetime.toml create mode 100644 tests/valid/empty.json create mode 100644 tests/valid/empty.toml create mode 100644 tests/valid/example.json create mode 100644 tests/valid/example.toml create mode 100644 tests/valid/float.json create mode 100644 tests/valid/float.toml create mode 100644 tests/valid/implicit-and-explicit-after.json create mode 100644 tests/valid/implicit-and-explicit-after.toml create mode 100644 tests/valid/implicit-and-explicit-before.json create mode 100644 tests/valid/implicit-and-explicit-before.toml create mode 100644 tests/valid/implicit-groups.json create mode 100644 tests/valid/implicit-groups.toml create mode 100644 tests/valid/integer.json create mode 100644 tests/valid/integer.toml create mode 100644 tests/valid/key-equals-nospace.json create mode 100644 tests/valid/key-equals-nospace.toml create mode 100644 tests/valid/key-special-chars.json create mode 100644 tests/valid/key-special-chars.toml create mode 100644 tests/valid/key-with-pound.json create mode 100644 tests/valid/key-with-pound.toml create mode 100644 tests/valid/long-float.json create mode 100644 tests/valid/long-float.toml create mode 100644 tests/valid/long-integer.json create mode 100644 tests/valid/long-integer.toml create mode 100644 tests/valid/string-empty.json create mode 100644 tests/valid/string-empty.toml create mode 100644 tests/valid/string-escapes.json create mode 100644 tests/valid/string-escapes.toml create mode 100644 tests/valid/string-simple.json create mode 100644 tests/valid/string-simple.toml create mode 100644 tests/valid/string-with-pound.json create mode 100644 tests/valid/string-with-pound.toml create mode 100644 tests/valid/table-array-implicit.json create mode 100644 tests/valid/table-array-implicit.toml create mode 100644 tests/valid/table-array-many.json create mode 100644 tests/valid/table-array-many.toml create mode 100644 tests/valid/table-array-nest.json create mode 100644 tests/valid/table-array-nest.toml create mode 100644 tests/valid/table-array-one.json create mode 100644 tests/valid/table-array-one.toml create mode 100644 tests/valid/table-empty.json create mode 100644 tests/valid/table-empty.toml create mode 100644 tests/valid/table-sub-empty.json create mode 100644 tests/valid/table-sub-empty.toml create mode 100644 tests/valid/table-whitespace.json create mode 100644 tests/valid/table-whitespace.toml create mode 100644 tests/valid/table-with-pound.json create mode 100644 tests/valid/table-with-pound.toml create mode 100644 tests/valid/unicode-escape.json create mode 100644 tests/valid/unicode-escape.toml create mode 100644 tests/valid/unicode-literal.json create mode 100644 tests/valid/unicode-literal.toml (limited to 'tests') diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..ebbc01c --- /dev/null +++ b/tests/README.md @@ -0,0 +1 @@ +Tests are from https://github.com/BurntSushi/toml-test diff --git a/tests/invalid-encoder/array-mixed-types-ints-and-floats.json b/tests/invalid-encoder/array-mixed-types-ints-and-floats.json new file mode 100644 index 0000000..b7920a0 --- /dev/null +++ b/tests/invalid-encoder/array-mixed-types-ints-and-floats.json @@ -0,0 +1,15 @@ +{ + "ints-and-floats": { + "type": "array", + "value": [ + { + "type": "integer", + "value": "1" + }, + { + "type": "float", + "value": "1.0" + } + ] + } +} diff --git a/tests/invalid.rs b/tests/invalid.rs new file mode 100644 index 0000000..582e25d --- /dev/null +++ b/tests/invalid.rs @@ -0,0 +1,78 @@ +extern crate toml; + +use toml::{Parser}; + +fn run(toml: &str) { + let mut p = Parser::new(toml); + let table = p.parse(); + assert!(p.errors.len() > 0); + assert!(table.is_none()); +} + +macro_rules! test( ($name:ident, $toml:expr) => ( + #[test] + fn $name() { run($toml); } +) ); + +test!(array_mixed_types_arrays_and_ints, + include_str!("invalid/array-mixed-types-arrays-and-ints.toml")); +test!(array_mixed_types_ints_and_floats, + include_str!("invalid/array-mixed-types-ints-and-floats.toml")); +test!(array_mixed_types_strings_and_ints, + include_str!("invalid/array-mixed-types-strings-and-ints.toml")); +test!(datetime_malformed_no_leads, + include_str!("invalid/datetime-malformed-no-leads.toml")); +test!(datetime_malformed_no_secs, + include_str!("invalid/datetime-malformed-no-secs.toml")); +test!(datetime_malformed_no_t, + include_str!("invalid/datetime-malformed-no-t.toml")); +test!(datetime_malformed_no_z, + include_str!("invalid/datetime-malformed-no-z.toml")); +test!(datetime_malformed_with_milli, + include_str!("invalid/datetime-malformed-with-milli.toml")); +test!(duplicate_keys, + include_str!("invalid/duplicate-keys.toml")); +test!(duplicate_key_table, + include_str!("invalid/duplicate-key-table.toml")); +test!(duplicate_tables, + include_str!("invalid/duplicate-tables.toml")); +test!(empty_implicit_table, + include_str!("invalid/empty-implicit-table.toml")); +test!(empty_table, + include_str!("invalid/empty-table.toml")); +test!(float_no_leading_zero, + include_str!("invalid/float-no-leading-zero.toml")); +test!(float_no_trailing_digits, + include_str!("invalid/float-no-trailing-digits.toml")); +test!(key_two_equals, + include_str!("invalid/key-two-equals.toml")); +test!(string_bad_byte_escape, + include_str!("invalid/string-bad-byte-escape.toml")); +test!(string_bad_escape, + include_str!("invalid/string-bad-escape.toml")); +test!(string_byte_escapes, + include_str!("invalid/string-byte-escapes.toml")); +test!(string_no_close, + include_str!("invalid/string-no-close.toml")); +test!(table_array_implicit, + include_str!("invalid/table-array-implicit.toml")); +test!(table_array_malformed_bracket, + include_str!("invalid/table-array-malformed-bracket.toml")); +test!(table_array_malformed_empty, + include_str!("invalid/table-array-malformed-empty.toml")); +test!(table_nested_brackets_close, + include_str!("invalid/table-nested-brackets-close.toml")); +test!(table_nested_brackets_open, + include_str!("invalid/table-nested-brackets-open.toml")); +test!(text_after_array_entries, + include_str!("invalid/text-after-array-entries.toml")); +test!(text_after_integer, + include_str!("invalid/text-after-integer.toml")); +test!(text_after_string, + include_str!("invalid/text-after-string.toml")); +test!(text_after_table, + include_str!("invalid/text-after-table.toml")); +test!(text_before_array_separator, + include_str!("invalid/text-before-array-separator.toml")); +test!(text_in_array, + include_str!("invalid/text-in-array.toml")); diff --git a/tests/invalid/array-mixed-types-arrays-and-ints.toml b/tests/invalid/array-mixed-types-arrays-and-ints.toml new file mode 100644 index 0000000..051ec73 --- /dev/null +++ b/tests/invalid/array-mixed-types-arrays-and-ints.toml @@ -0,0 +1 @@ +arrays-and-ints = [1, ["Arrays are not integers."]] diff --git a/tests/invalid/array-mixed-types-ints-and-floats.toml b/tests/invalid/array-mixed-types-ints-and-floats.toml new file mode 100644 index 0000000..51ebe80 --- /dev/null +++ b/tests/invalid/array-mixed-types-ints-and-floats.toml @@ -0,0 +1 @@ +ints-and-floats = [1, 1.0] diff --git a/tests/invalid/array-mixed-types-strings-and-ints.toml b/tests/invalid/array-mixed-types-strings-and-ints.toml new file mode 100644 index 0000000..f348308 --- /dev/null +++ b/tests/invalid/array-mixed-types-strings-and-ints.toml @@ -0,0 +1 @@ +strings-and-ints = ["hi", 42] diff --git a/tests/invalid/datetime-malformed-no-leads.toml b/tests/invalid/datetime-malformed-no-leads.toml new file mode 100644 index 0000000..123f173 --- /dev/null +++ b/tests/invalid/datetime-malformed-no-leads.toml @@ -0,0 +1 @@ +no-leads = 1987-7-05T17:45:00Z diff --git a/tests/invalid/datetime-malformed-no-secs.toml b/tests/invalid/datetime-malformed-no-secs.toml new file mode 100644 index 0000000..ba93900 --- /dev/null +++ b/tests/invalid/datetime-malformed-no-secs.toml @@ -0,0 +1 @@ +no-secs = 1987-07-05T17:45Z diff --git a/tests/invalid/datetime-malformed-no-t.toml b/tests/invalid/datetime-malformed-no-t.toml new file mode 100644 index 0000000..617e3c5 --- /dev/null +++ b/tests/invalid/datetime-malformed-no-t.toml @@ -0,0 +1 @@ +no-t = 1987-07-0517:45:00Z diff --git a/tests/invalid/datetime-malformed-no-z.toml b/tests/invalid/datetime-malformed-no-z.toml new file mode 100644 index 0000000..cf66b1e --- /dev/null +++ b/tests/invalid/datetime-malformed-no-z.toml @@ -0,0 +1 @@ +no-z = 1987-07-05T17:45:00 diff --git a/tests/invalid/datetime-malformed-with-milli.toml b/tests/invalid/datetime-malformed-with-milli.toml new file mode 100644 index 0000000..eef792f --- /dev/null +++ b/tests/invalid/datetime-malformed-with-milli.toml @@ -0,0 +1 @@ +with-milli = 1987-07-5T17:45:00.12Z diff --git a/tests/invalid/duplicate-key-table.toml b/tests/invalid/duplicate-key-table.toml new file mode 100644 index 0000000..cedf05f --- /dev/null +++ b/tests/invalid/duplicate-key-table.toml @@ -0,0 +1,5 @@ +[fruit] +type = "apple" + +[fruit.type] +apple = "yes" diff --git a/tests/invalid/duplicate-keys.toml b/tests/invalid/duplicate-keys.toml new file mode 100644 index 0000000..9b5aee0 --- /dev/null +++ b/tests/invalid/duplicate-keys.toml @@ -0,0 +1,2 @@ +dupe = false +dupe = true diff --git a/tests/invalid/duplicate-tables.toml b/tests/invalid/duplicate-tables.toml new file mode 100644 index 0000000..8ddf49b --- /dev/null +++ b/tests/invalid/duplicate-tables.toml @@ -0,0 +1,2 @@ +[a] +[a] diff --git a/tests/invalid/empty-implicit-table.toml b/tests/invalid/empty-implicit-table.toml new file mode 100644 index 0000000..0cc36d0 --- /dev/null +++ b/tests/invalid/empty-implicit-table.toml @@ -0,0 +1 @@ +[naughty..naughty] diff --git a/tests/invalid/empty-table.toml b/tests/invalid/empty-table.toml new file mode 100644 index 0000000..fe51488 --- /dev/null +++ b/tests/invalid/empty-table.toml @@ -0,0 +1 @@ +[] diff --git a/tests/invalid/float-no-leading-zero.toml b/tests/invalid/float-no-leading-zero.toml new file mode 100644 index 0000000..cab76bf --- /dev/null +++ b/tests/invalid/float-no-leading-zero.toml @@ -0,0 +1,2 @@ +answer = .12345 +neganswer = -.12345 diff --git a/tests/invalid/float-no-trailing-digits.toml b/tests/invalid/float-no-trailing-digits.toml new file mode 100644 index 0000000..cbff2d0 --- /dev/null +++ b/tests/invalid/float-no-trailing-digits.toml @@ -0,0 +1,2 @@ +answer = 1. +neganswer = -1. diff --git a/tests/invalid/key-two-equals.toml b/tests/invalid/key-two-equals.toml new file mode 100644 index 0000000..25a0378 --- /dev/null +++ b/tests/invalid/key-two-equals.toml @@ -0,0 +1 @@ +key= = 1 diff --git a/tests/invalid/string-bad-byte-escape.toml b/tests/invalid/string-bad-byte-escape.toml new file mode 100644 index 0000000..4c7be59 --- /dev/null +++ b/tests/invalid/string-bad-byte-escape.toml @@ -0,0 +1 @@ +naughty = "\xAg" diff --git a/tests/invalid/string-bad-escape.toml b/tests/invalid/string-bad-escape.toml new file mode 100644 index 0000000..60acb0c --- /dev/null +++ b/tests/invalid/string-bad-escape.toml @@ -0,0 +1 @@ +invalid-escape = "This string has a bad \a escape character." diff --git a/tests/invalid/string-byte-escapes.toml b/tests/invalid/string-byte-escapes.toml new file mode 100644 index 0000000..e94452a --- /dev/null +++ b/tests/invalid/string-byte-escapes.toml @@ -0,0 +1 @@ +answer = "\x33" diff --git a/tests/invalid/string-no-close.toml b/tests/invalid/string-no-close.toml new file mode 100644 index 0000000..0c292fc --- /dev/null +++ b/tests/invalid/string-no-close.toml @@ -0,0 +1 @@ +no-ending-quote = "One time, at band camp diff --git a/tests/invalid/table-array-implicit.toml b/tests/invalid/table-array-implicit.toml new file mode 100644 index 0000000..05f2507 --- /dev/null +++ b/tests/invalid/table-array-implicit.toml @@ -0,0 +1,14 @@ +# This test is a bit tricky. It should fail because the first use of +# `[[albums.songs]]` without first declaring `albums` implies that `albums` +# must be a table. The alternative would be quite weird. Namely, it wouldn't +# comply with the TOML spec: "Each double-bracketed sub-table will belong to +# the most *recently* defined table element *above* it." +# +# This is in contrast to the *valid* test, table-array-implicit where +# `[[albums.songs]]` works by itself, so long as `[[albums]]` isn't declared +# later. (Although, `[albums]` could be.) +[[albums.songs]] +name = "Glory Days" + +[[albums]] +name = "Born in the USA" diff --git a/tests/invalid/table-array-malformed-bracket.toml b/tests/invalid/table-array-malformed-bracket.toml new file mode 100644 index 0000000..39c73b0 --- /dev/null +++ b/tests/invalid/table-array-malformed-bracket.toml @@ -0,0 +1,2 @@ +[[albums] +name = "Born to Run" diff --git a/tests/invalid/table-array-malformed-empty.toml b/tests/invalid/table-array-malformed-empty.toml new file mode 100644 index 0000000..a470ca3 --- /dev/null +++ b/tests/invalid/table-array-malformed-empty.toml @@ -0,0 +1,2 @@ +[[]] +name = "Born to Run" diff --git a/tests/invalid/table-nested-brackets-close.toml b/tests/invalid/table-nested-brackets-close.toml new file mode 100644 index 0000000..c8b5a67 --- /dev/null +++ b/tests/invalid/table-nested-brackets-close.toml @@ -0,0 +1,2 @@ +[a]b] +zyx = 42 diff --git a/tests/invalid/table-nested-brackets-open.toml b/tests/invalid/table-nested-brackets-open.toml new file mode 100644 index 0000000..246d7e9 --- /dev/null +++ b/tests/invalid/table-nested-brackets-open.toml @@ -0,0 +1,2 @@ +[a[b] +zyx = 42 diff --git a/tests/invalid/text-after-array-entries.toml b/tests/invalid/text-after-array-entries.toml new file mode 100644 index 0000000..1a72890 --- /dev/null +++ b/tests/invalid/text-after-array-entries.toml @@ -0,0 +1,4 @@ +array = [ + "Is there life after an array separator?", No + "Entry" +] diff --git a/tests/invalid/text-after-integer.toml b/tests/invalid/text-after-integer.toml new file mode 100644 index 0000000..42de7af --- /dev/null +++ b/tests/invalid/text-after-integer.toml @@ -0,0 +1 @@ +answer = 42 the ultimate answer? diff --git a/tests/invalid/text-after-string.toml b/tests/invalid/text-after-string.toml new file mode 100644 index 0000000..c92a6f1 --- /dev/null +++ b/tests/invalid/text-after-string.toml @@ -0,0 +1 @@ +string = "Is there life after strings?" No. diff --git a/tests/invalid/text-after-table.toml b/tests/invalid/text-after-table.toml new file mode 100644 index 0000000..87da9db --- /dev/null +++ b/tests/invalid/text-after-table.toml @@ -0,0 +1 @@ +[error] this shouldn't be here diff --git a/tests/invalid/text-before-array-separator.toml b/tests/invalid/text-before-array-separator.toml new file mode 100644 index 0000000..9b06a39 --- /dev/null +++ b/tests/invalid/text-before-array-separator.toml @@ -0,0 +1,4 @@ +array = [ + "Is there life before an array separator?" No, + "Entry" +] diff --git a/tests/invalid/text-in-array.toml b/tests/invalid/text-in-array.toml new file mode 100644 index 0000000..a6a6c42 --- /dev/null +++ b/tests/invalid/text-in-array.toml @@ -0,0 +1,5 @@ +array = [ + "Entry 1", + I don't belong, + "Entry 2", +] diff --git a/tests/valid.rs b/tests/valid.rs new file mode 100644 index 0000000..6ff0d80 --- /dev/null +++ b/tests/valid.rs @@ -0,0 +1,168 @@ +extern crate "rustc-serialize" as rustc_serialize; +extern crate toml; + +use std::num::strconv; +use std::collections::BTreeMap; +use rustc_serialize::json::Json; + +use toml::{Parser, Value}; +use toml::Value::{Table, Integer, Float, Boolean, Datetime, Array}; + +fn to_json(toml: Value) -> Json { + fn doit(s: &str, json: Json) -> Json { + let mut map = BTreeMap::new(); + map.insert("type".to_string(), Json::String(s.to_string())); + map.insert("value".to_string(), json); + Json::Object(map) + } + match toml { + Value::String(s) => doit("string", Json::String(s)), + Integer(i) => doit("integer", Json::String(i.to_string())), + Float(f) => doit("float", Json::String({ + let (bytes, _) = + strconv::float_to_str_bytes_common(f, 10, true, + strconv::SignFormat::SignNeg, + strconv::SignificantDigits::DigMax(15), + strconv::ExponentFormat::ExpNone, + false); + let s = String::from_utf8(bytes).unwrap(); + if s.as_slice().contains(".") {s} else {format!("{}.0", s)} + })), + Boolean(b) => doit("bool", Json::String(b.to_string())), + Datetime(s) => doit("datetime", Json::String(s)), + Array(arr) => { + let is_table = match arr.as_slice().first() { + Some(&Table(..)) => true, + _ => false, + }; + let json = Json::Array(arr.into_iter().map(to_json).collect()); + if is_table {json} else {doit("array", json)} + } + Table(table) => Json::Object(table.into_iter().map(|(k, v)| { + (k, to_json(v)) + }).collect()), + } +} + +fn run(toml: &str, json: &str) { + let mut p = Parser::new(toml); + let table = p.parse(); + assert!(p.errors.len() == 0, "had_errors: {:?}", + p.errors.iter().map(|e| { + (e.desc.clone(), toml.slice(e.lo - 5, e.hi + 5)) + }).collect::>()); + assert!(table.is_some()); + let table = table.unwrap(); + + let json = Json::from_str(json).unwrap(); + let toml_json = to_json(Table(table)); + assert!(json == toml_json, + "expected\n{}\ngot\n{}\n", + json.pretty(), + toml_json.pretty()); +} + +macro_rules! test( ($name:ident, $toml:expr, $json:expr) => ( + #[test] + fn $name() { run($toml, $json); } +) ); + +test!(array_empty, + include_str!("valid/array-empty.toml"), + include_str!("valid/array-empty.json")); +test!(array_nospaces, + include_str!("valid/array-nospaces.toml"), + include_str!("valid/array-nospaces.json")); +test!(arrays_hetergeneous, + include_str!("valid/arrays-hetergeneous.toml"), + include_str!("valid/arrays-hetergeneous.json")); +test!(arrays, + include_str!("valid/arrays.toml"), + include_str!("valid/arrays.json")); +test!(arrays_nested, + include_str!("valid/arrays-nested.toml"), + include_str!("valid/arrays-nested.json")); +test!(empty, + include_str!("valid/empty.toml"), + include_str!("valid/empty.json")); +test!(bool, + include_str!("valid/bool.toml"), + include_str!("valid/bool.json")); +test!(datetime, + include_str!("valid/datetime.toml"), + include_str!("valid/datetime.json")); +test!(example, + include_str!("valid/example.toml"), + include_str!("valid/example.json")); +test!(float, + include_str!("valid/float.toml"), + include_str!("valid/float.json")); +test!(implicit_and_explicit_after, + include_str!("valid/implicit-and-explicit-after.toml"), + include_str!("valid/implicit-and-explicit-after.json")); +test!(implicit_and_explicit_before, + include_str!("valid/implicit-and-explicit-before.toml"), + include_str!("valid/implicit-and-explicit-before.json")); +test!(implicit_groups, + include_str!("valid/implicit-groups.toml"), + include_str!("valid/implicit-groups.json")); +test!(integer, + include_str!("valid/integer.toml"), + include_str!("valid/integer.json")); +test!(key_equals_nospace, + include_str!("valid/key-equals-nospace.toml"), + include_str!("valid/key-equals-nospace.json")); +test!(key_special_chars, + include_str!("valid/key-special-chars.toml"), + include_str!("valid/key-special-chars.json")); +test!(key_with_pound, + include_str!("valid/key-with-pound.toml"), + include_str!("valid/key-with-pound.json")); +test!(long_float, + include_str!("valid/long-float.toml"), + include_str!("valid/long-float.json")); +test!(long_integer, + include_str!("valid/long-integer.toml"), + include_str!("valid/long-integer.json")); +test!(string_empty, + include_str!("valid/string-empty.toml"), + include_str!("valid/string-empty.json")); +test!(string_escapes, + include_str!("valid/string-escapes.toml"), + include_str!("valid/string-escapes.json")); +test!(string_simple, + include_str!("valid/string-simple.toml"), + include_str!("valid/string-simple.json")); +test!(string_with_pound, + include_str!("valid/string-with-pound.toml"), + include_str!("valid/string-with-pound.json")); +test!(table_array_implicit, + include_str!("valid/table-array-implicit.toml"), + include_str!("valid/table-array-implicit.json")); +test!(table_array_many, + include_str!("valid/table-array-many.toml"), + include_str!("valid/table-array-many.json")); +test!(table_array_nest, + include_str!("valid/table-array-nest.toml"), + include_str!("valid/table-array-nest.json")); +test!(table_array_one, + include_str!("valid/table-array-one.toml"), + include_str!("valid/table-array-one.json")); +test!(table_empty, + include_str!("valid/table-empty.toml"), + include_str!("valid/table-empty.json")); +test!(table_sub_empty, + include_str!("valid/table-sub-empty.toml"), + include_str!("valid/table-sub-empty.json")); +test!(table_whitespace, + include_str!("valid/table-whitespace.toml"), + include_str!("valid/table-whitespace.json")); +test!(table_with_pound, + include_str!("valid/table-with-pound.toml"), + include_str!("valid/table-with-pound.json")); +test!(unicode_escape, + include_str!("valid/unicode-escape.toml"), + include_str!("valid/unicode-escape.json")); +test!(unicode_literal, + include_str!("valid/unicode-literal.toml"), + include_str!("valid/unicode-literal.json")); diff --git a/tests/valid/array-empty.json b/tests/valid/array-empty.json new file mode 100644 index 0000000..2fbf256 --- /dev/null +++ b/tests/valid/array-empty.json @@ -0,0 +1,11 @@ +{ + "thevoid": { "type": "array", "value": [ + {"type": "array", "value": [ + {"type": "array", "value": [ + {"type": "array", "value": [ + {"type": "array", "value": []} + ]} + ]} + ]} + ]} +} diff --git a/tests/valid/array-empty.toml b/tests/valid/array-empty.toml new file mode 100644 index 0000000..fa58dc6 --- /dev/null +++ b/tests/valid/array-empty.toml @@ -0,0 +1 @@ +thevoid = [[[[[]]]]] diff --git a/tests/valid/array-nospaces.json b/tests/valid/array-nospaces.json new file mode 100644 index 0000000..1833d61 --- /dev/null +++ b/tests/valid/array-nospaces.json @@ -0,0 +1,10 @@ +{ + "ints": { + "type": "array", + "value": [ + {"type": "integer", "value": "1"}, + {"type": "integer", "value": "2"}, + {"type": "integer", "value": "3"} + ] + } +} diff --git a/tests/valid/array-nospaces.toml b/tests/valid/array-nospaces.toml new file mode 100644 index 0000000..6618936 --- /dev/null +++ b/tests/valid/array-nospaces.toml @@ -0,0 +1 @@ +ints = [1,2,3] diff --git a/tests/valid/arrays-hetergeneous.json b/tests/valid/arrays-hetergeneous.json new file mode 100644 index 0000000..e703739 --- /dev/null +++ b/tests/valid/arrays-hetergeneous.json @@ -0,0 +1,19 @@ +{ + "mixed": { + "type": "array", + "value": [ + {"type": "array", "value": [ + {"type": "integer", "value": "1"}, + {"type": "integer", "value": "2"} + ]}, + {"type": "array", "value": [ + {"type": "string", "value": "a"}, + {"type": "string", "value": "b"} + ]}, + {"type": "array", "value": [ + {"type": "float", "value": "1.0"}, + {"type": "float", "value": "2.0"} + ]} + ] + } +} diff --git a/tests/valid/arrays-hetergeneous.toml b/tests/valid/arrays-hetergeneous.toml new file mode 100644 index 0000000..91fcbdf --- /dev/null +++ b/tests/valid/arrays-hetergeneous.toml @@ -0,0 +1 @@ +mixed = [[1, 2], ["a", "b"], [1.0, 2.0]] diff --git a/tests/valid/arrays-nested.json b/tests/valid/arrays-nested.json new file mode 100644 index 0000000..d21920c --- /dev/null +++ b/tests/valid/arrays-nested.json @@ -0,0 +1,13 @@ +{ + "nest": { + "type": "array", + "value": [ + {"type": "array", "value": [ + {"type": "string", "value": "a"} + ]}, + {"type": "array", "value": [ + {"type": "string", "value": "b"} + ]} + ] + } +} diff --git a/tests/valid/arrays-nested.toml b/tests/valid/arrays-nested.toml new file mode 100644 index 0000000..ce33022 --- /dev/null +++ b/tests/valid/arrays-nested.toml @@ -0,0 +1 @@ +nest = [["a"], ["b"]] diff --git a/tests/valid/arrays.json b/tests/valid/arrays.json new file mode 100644 index 0000000..4d16d8a --- /dev/null +++ b/tests/valid/arrays.json @@ -0,0 +1,34 @@ +{ + "ints": { + "type": "array", + "value": [ + {"type": "integer", "value": "1"}, + {"type": "integer", "value": "2"}, + {"type": "integer", "value": "3"} + ] + }, + "floats": { + "type": "array", + "value": [ + {"type": "float", "value": "1.0"}, + {"type": "float", "value": "2.0"}, + {"type": "float", "value": "3.0"} + ] + }, + "strings": { + "type": "array", + "value": [ + {"type": "string", "value": "a"}, + {"type": "string", "value": "b"}, + {"type": "string", "value": "c"} + ] + }, + "dates": { + "type": "array", + "value": [ + {"type": "datetime", "value": "1987-07-05T17:45:00Z"}, + {"type": "datetime", "value": "1979-05-27T07:32:00Z"}, + {"type": "datetime", "value": "2006-06-01T11:00:00Z"} + ] + } +} diff --git a/tests/valid/arrays.toml b/tests/valid/arrays.toml new file mode 100644 index 0000000..6d6440d --- /dev/null +++ b/tests/valid/arrays.toml @@ -0,0 +1,9 @@ +ints = [1, 2, 3] +floats = [1.0, 2.0, 3.0] +strings = ["a", "b", "c"] +dates = [ + 1987-07-05T17:45:00Z, + 1979-05-27T07:32:00Z, + 2006-06-01T11:00:00Z, +] + diff --git a/tests/valid/bool.json b/tests/valid/bool.json new file mode 100644 index 0000000..ae368e9 --- /dev/null +++ b/tests/valid/bool.json @@ -0,0 +1,4 @@ +{ + "f": {"type": "bool", "value": "false"}, + "t": {"type": "bool", "value": "true"} +} diff --git a/tests/valid/bool.toml b/tests/valid/bool.toml new file mode 100644 index 0000000..a8a829b --- /dev/null +++ b/tests/valid/bool.toml @@ -0,0 +1,2 @@ +t = true +f = false diff --git a/tests/valid/comments-everywhere.json b/tests/valid/comments-everywhere.json new file mode 100644 index 0000000..e69a2e9 --- /dev/null +++ b/tests/valid/comments-everywhere.json @@ -0,0 +1,12 @@ +{ + "group": { + "answer": {"type": "integer", "value": "42"}, + "more": { + "type": "array", + "value": [ + {"type": "integer", "value": "42"}, + {"type": "integer", "value": "42"} + ] + } + } +} diff --git a/tests/valid/comments-everywhere.toml b/tests/valid/comments-everywhere.toml new file mode 100644 index 0000000..3dca74c --- /dev/null +++ b/tests/valid/comments-everywhere.toml @@ -0,0 +1,24 @@ +# Top comment. + # Top comment. +# Top comment. + +# [no-extraneous-groups-please] + +[group] # Comment +answer = 42 # Comment +# no-extraneous-keys-please = 999 +# Inbetween comment. +more = [ # Comment + # What about multiple # comments? + # Can you handle it? + # + # Evil. +# Evil. + 42, 42, # Comments within arrays are fun. + # What about multiple # comments? + # Can you handle it? + # + # Evil. +# Evil. +# ] Did I fool you? +] # Hopefully not. diff --git a/tests/valid/datetime.json b/tests/valid/datetime.json new file mode 100644 index 0000000..2ca93ce --- /dev/null +++ b/tests/valid/datetime.json @@ -0,0 +1,3 @@ +{ + "bestdayever": {"type": "datetime", "value": "1987-07-05T17:45:00Z"} +} diff --git a/tests/valid/datetime.toml b/tests/valid/datetime.toml new file mode 100644 index 0000000..2e99340 --- /dev/null +++ b/tests/valid/datetime.toml @@ -0,0 +1 @@ +bestdayever = 1987-07-05T17:45:00Z diff --git a/tests/valid/empty.json b/tests/valid/empty.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/tests/valid/empty.json @@ -0,0 +1 @@ +{} diff --git a/tests/valid/empty.toml b/tests/valid/empty.toml new file mode 100644 index 0000000..e69de29 diff --git a/tests/valid/example.json b/tests/valid/example.json new file mode 100644 index 0000000..48aa907 --- /dev/null +++ b/tests/valid/example.json @@ -0,0 +1,14 @@ +{ + "best-day-ever": {"type": "datetime", "value": "1987-07-05T17:45:00Z"}, + "numtheory": { + "boring": {"type": "bool", "value": "false"}, + "perfection": { + "type": "array", + "value": [ + {"type": "integer", "value": "6"}, + {"type": "integer", "value": "28"}, + {"type": "integer", "value": "496"} + ] + } + } +} diff --git a/tests/valid/example.toml b/tests/valid/example.toml new file mode 100644 index 0000000..8cb02e0 --- /dev/null +++ b/tests/valid/example.toml @@ -0,0 +1,5 @@ +best-day-ever = 1987-07-05T17:45:00Z + +[numtheory] +boring = false +perfection = [6, 28, 496] diff --git a/tests/valid/float.json b/tests/valid/float.json new file mode 100644 index 0000000..b8a2e97 --- /dev/null +++ b/tests/valid/float.json @@ -0,0 +1,4 @@ +{ + "pi": {"type": "float", "value": "3.14"}, + "negpi": {"type": "float", "value": "-3.14"} +} diff --git a/tests/valid/float.toml b/tests/valid/float.toml new file mode 100644 index 0000000..7c528d2 --- /dev/null +++ b/tests/valid/float.toml @@ -0,0 +1,2 @@ +pi = 3.14 +negpi = -3.14 diff --git a/tests/valid/implicit-and-explicit-after.json b/tests/valid/implicit-and-explicit-after.json new file mode 100644 index 0000000..374bd09 --- /dev/null +++ b/tests/valid/implicit-and-explicit-after.json @@ -0,0 +1,10 @@ +{ + "a": { + "better": {"type": "integer", "value": "43"}, + "b": { + "c": { + "answer": {"type": "integer", "value": "42"} + } + } + } +} diff --git a/tests/valid/implicit-and-explicit-after.toml b/tests/valid/implicit-and-explicit-after.toml new file mode 100644 index 0000000..c0e8865 --- /dev/null +++ b/tests/valid/implicit-and-explicit-after.toml @@ -0,0 +1,5 @@ +[a.b.c] +answer = 42 + +[a] +better = 43 diff --git a/tests/valid/implicit-and-explicit-before.json b/tests/valid/implicit-and-explicit-before.json new file mode 100644 index 0000000..374bd09 --- /dev/null +++ b/tests/valid/implicit-and-explicit-before.json @@ -0,0 +1,10 @@ +{ + "a": { + "better": {"type": "integer", "value": "43"}, + "b": { + "c": { + "answer": {"type": "integer", "value": "42"} + } + } + } +} diff --git a/tests/valid/implicit-and-explicit-before.toml b/tests/valid/implicit-and-explicit-before.toml new file mode 100644 index 0000000..eee68ff --- /dev/null +++ b/tests/valid/implicit-and-explicit-before.toml @@ -0,0 +1,5 @@ +[a] +better = 43 + +[a.b.c] +answer = 42 diff --git a/tests/valid/implicit-groups.json b/tests/valid/implicit-groups.json new file mode 100644 index 0000000..fbae7fc --- /dev/null +++ b/tests/valid/implicit-groups.json @@ -0,0 +1,9 @@ +{ + "a": { + "b": { + "c": { + "answer": {"type": "integer", "value": "42"} + } + } + } +} diff --git a/tests/valid/implicit-groups.toml b/tests/valid/implicit-groups.toml new file mode 100644 index 0000000..b6333e4 --- /dev/null +++ b/tests/valid/implicit-groups.toml @@ -0,0 +1,2 @@ +[a.b.c] +answer = 42 diff --git a/tests/valid/integer.json b/tests/valid/integer.json new file mode 100644 index 0000000..61985a1 --- /dev/null +++ b/tests/valid/integer.json @@ -0,0 +1,4 @@ +{ + "answer": {"type": "integer", "value": "42"}, + "neganswer": {"type": "integer", "value": "-42"} +} diff --git a/tests/valid/integer.toml b/tests/valid/integer.toml new file mode 100644 index 0000000..c4f6297 --- /dev/null +++ b/tests/valid/integer.toml @@ -0,0 +1,2 @@ +answer = 42 +neganswer = -42 diff --git a/tests/valid/key-equals-nospace.json b/tests/valid/key-equals-nospace.json new file mode 100644 index 0000000..1f8709a --- /dev/null +++ b/tests/valid/key-equals-nospace.json @@ -0,0 +1,3 @@ +{ + "answer": {"type": "integer", "value": "42"} +} diff --git a/tests/valid/key-equals-nospace.toml b/tests/valid/key-equals-nospace.toml new file mode 100644 index 0000000..560901c --- /dev/null +++ b/tests/valid/key-equals-nospace.toml @@ -0,0 +1 @@ +answer=42 diff --git a/tests/valid/key-special-chars.json b/tests/valid/key-special-chars.json new file mode 100644 index 0000000..6550ebd --- /dev/null +++ b/tests/valid/key-special-chars.json @@ -0,0 +1,5 @@ +{ + "~!@#$^&*()_+-`1234567890[]\\|/?><.,;:'": { + "type": "integer", "value": "1" + } +} diff --git a/tests/valid/key-special-chars.toml b/tests/valid/key-special-chars.toml new file mode 100644 index 0000000..8b3fc51 --- /dev/null +++ b/tests/valid/key-special-chars.toml @@ -0,0 +1 @@ +~!@#$^&*()_+-`1234567890[]\|/?><.,;:' = 1 diff --git a/tests/valid/key-with-pound.json b/tests/valid/key-with-pound.json new file mode 100644 index 0000000..ee39e1d --- /dev/null +++ b/tests/valid/key-with-pound.json @@ -0,0 +1,3 @@ +{ + "key#name": {"type": "integer", "value": "5"} +} diff --git a/tests/valid/key-with-pound.toml b/tests/valid/key-with-pound.toml new file mode 100644 index 0000000..1c54f53 --- /dev/null +++ b/tests/valid/key-with-pound.toml @@ -0,0 +1 @@ +key#name = 5 diff --git a/tests/valid/long-float.json b/tests/valid/long-float.json new file mode 100644 index 0000000..8ceed47 --- /dev/null +++ b/tests/valid/long-float.json @@ -0,0 +1,4 @@ +{ + "longpi": {"type": "float", "value": "3.141592653589793"}, + "neglongpi": {"type": "float", "value": "-3.141592653589793"} +} diff --git a/tests/valid/long-float.toml b/tests/valid/long-float.toml new file mode 100644 index 0000000..9558ae4 --- /dev/null +++ b/tests/valid/long-float.toml @@ -0,0 +1,2 @@ +longpi = 3.141592653589793 +neglongpi = -3.141592653589793 diff --git a/tests/valid/long-integer.json b/tests/valid/long-integer.json new file mode 100644 index 0000000..16c331e --- /dev/null +++ b/tests/valid/long-integer.json @@ -0,0 +1,4 @@ +{ + "answer": {"type": "integer", "value": "9223372036854775807"}, + "neganswer": {"type": "integer", "value": "-9223372036854775808"} +} diff --git a/tests/valid/long-integer.toml b/tests/valid/long-integer.toml new file mode 100644 index 0000000..424a13a --- /dev/null +++ b/tests/valid/long-integer.toml @@ -0,0 +1,2 @@ +answer = 9223372036854775807 +neganswer = -9223372036854775808 diff --git a/tests/valid/string-empty.json b/tests/valid/string-empty.json new file mode 100644 index 0000000..6c26d69 --- /dev/null +++ b/tests/valid/string-empty.json @@ -0,0 +1,6 @@ +{ + "answer": { + "type": "string", + "value": "" + } +} diff --git a/tests/valid/string-empty.toml b/tests/valid/string-empty.toml new file mode 100644 index 0000000..e37e681 --- /dev/null +++ b/tests/valid/string-empty.toml @@ -0,0 +1 @@ +answer = "" diff --git a/tests/valid/string-escapes.json b/tests/valid/string-escapes.json new file mode 100644 index 0000000..ca71d30 --- /dev/null +++ b/tests/valid/string-escapes.json @@ -0,0 +1,34 @@ +{ + "backspace": { + "type": "string", + "value": "This string has a \u0008 backspace character." + }, + "tab": { + "type": "string", + "value": "This string has a \u0009 tab character." + }, + "newline": { + "type": "string", + "value": "This string has a \u000A new line character." + }, + "formfeed": { + "type": "string", + "value": "This string has a \u000C form feed character." + }, + "carriage": { + "type": "string", + "value": "This string has a \u000D carriage return character." + }, + "quote": { + "type": "string", + "value": "This string has a \u0022 quote character." + }, + "slash": { + "type": "string", + "value": "This string has a \u002F slash character." + }, + "backslash": { + "type": "string", + "value": "This string has a \u005C backslash character." + } +} diff --git a/tests/valid/string-escapes.toml b/tests/valid/string-escapes.toml new file mode 100644 index 0000000..2d64500 --- /dev/null +++ b/tests/valid/string-escapes.toml @@ -0,0 +1,8 @@ +backspace = "This string has a \b backspace character." +tab = "This string has a \t tab character." +newline = "This string has a \n new line character." +formfeed = "This string has a \f form feed character." +carriage = "This string has a \r carriage return character." +quote = "This string has a \" quote character." +slash = "This string has a \/ slash character." +backslash = "This string has a \\ backslash character." diff --git a/tests/valid/string-simple.json b/tests/valid/string-simple.json new file mode 100644 index 0000000..2e05f99 --- /dev/null +++ b/tests/valid/string-simple.json @@ -0,0 +1,6 @@ +{ + "answer": { + "type": "string", + "value": "You are not drinking enough whisky." + } +} diff --git a/tests/valid/string-simple.toml b/tests/valid/string-simple.toml new file mode 100644 index 0000000..e17ade6 --- /dev/null +++ b/tests/valid/string-simple.toml @@ -0,0 +1 @@ +answer = "You are not drinking enough whisky." diff --git a/tests/valid/string-with-pound.json b/tests/valid/string-with-pound.json new file mode 100644 index 0000000..33cdc9c --- /dev/null +++ b/tests/valid/string-with-pound.json @@ -0,0 +1,7 @@ +{ + "pound": {"type": "string", "value": "We see no # comments here."}, + "poundcomment": { + "type": "string", + "value": "But there are # some comments here." + } +} diff --git a/tests/valid/string-with-pound.toml b/tests/valid/string-with-pound.toml new file mode 100644 index 0000000..5fd8746 --- /dev/null +++ b/tests/valid/string-with-pound.toml @@ -0,0 +1,2 @@ +pound = "We see no # comments here." +poundcomment = "But there are # some comments here." # Did I # mess you up? diff --git a/tests/valid/table-array-implicit.json b/tests/valid/table-array-implicit.json new file mode 100644 index 0000000..32e4640 --- /dev/null +++ b/tests/valid/table-array-implicit.json @@ -0,0 +1,7 @@ +{ + "albums": { + "songs": [ + {"name": {"type": "string", "value": "Glory Days"}} + ] + } +} diff --git a/tests/valid/table-array-implicit.toml b/tests/valid/table-array-implicit.toml new file mode 100644 index 0000000..3157ac9 --- /dev/null +++ b/tests/valid/table-array-implicit.toml @@ -0,0 +1,2 @@ +[[albums.songs]] +name = "Glory Days" diff --git a/tests/valid/table-array-many.json b/tests/valid/table-array-many.json new file mode 100644 index 0000000..84df2da --- /dev/null +++ b/tests/valid/table-array-many.json @@ -0,0 +1,16 @@ +{ + "people": [ + { + "first_name": {"type": "string", "value": "Bruce"}, + "last_name": {"type": "string", "value": "Springsteen"} + }, + { + "first_name": {"type": "string", "value": "Eric"}, + "last_name": {"type": "string", "value": "Clapton"} + }, + { + "first_name": {"type": "string", "value": "Bob"}, + "last_name": {"type": "string", "value": "Seger"} + } + ] +} diff --git a/tests/valid/table-array-many.toml b/tests/valid/table-array-many.toml new file mode 100644 index 0000000..46062be --- /dev/null +++ b/tests/valid/table-array-many.toml @@ -0,0 +1,11 @@ +[[people]] +first_name = "Bruce" +last_name = "Springsteen" + +[[people]] +first_name = "Eric" +last_name = "Clapton" + +[[people]] +first_name = "Bob" +last_name = "Seger" diff --git a/tests/valid/table-array-nest.json b/tests/valid/table-array-nest.json new file mode 100644 index 0000000..c117afa --- /dev/null +++ b/tests/valid/table-array-nest.json @@ -0,0 +1,18 @@ +{ + "albums": [ + { + "name": {"type": "string", "value": "Born to Run"}, + "songs": [ + {"name": {"type": "string", "value": "Jungleland"}}, + {"name": {"type": "string", "value": "Meeting Across the River"}} + ] + }, + { + "name": {"type": "string", "value": "Born in the USA"}, + "songs": [ + {"name": {"type": "string", "value": "Glory Days"}}, + {"name": {"type": "string", "value": "Dancing in the Dark"}} + ] + } + ] +} diff --git a/tests/valid/table-array-nest.toml b/tests/valid/table-array-nest.toml new file mode 100644 index 0000000..d659a3d --- /dev/null +++ b/tests/valid/table-array-nest.toml @@ -0,0 +1,17 @@ +[[albums]] +name = "Born to Run" + + [[albums.songs]] + name = "Jungleland" + + [[albums.songs]] + name = "Meeting Across the River" + +[[albums]] +name = "Born in the USA" + + [[albums.songs]] + name = "Glory Days" + + [[albums.songs]] + name = "Dancing in the Dark" diff --git a/tests/valid/table-array-one.json b/tests/valid/table-array-one.json new file mode 100644 index 0000000..d75faae --- /dev/null +++ b/tests/valid/table-array-one.json @@ -0,0 +1,8 @@ +{ + "people": [ + { + "first_name": {"type": "string", "value": "Bruce"}, + "last_name": {"type": "string", "value": "Springsteen"} + } + ] +} diff --git a/tests/valid/table-array-one.toml b/tests/valid/table-array-one.toml new file mode 100644 index 0000000..cd7e1b6 --- /dev/null +++ b/tests/valid/table-array-one.toml @@ -0,0 +1,3 @@ +[[people]] +first_name = "Bruce" +last_name = "Springsteen" diff --git a/tests/valid/table-empty.json b/tests/valid/table-empty.json new file mode 100644 index 0000000..6f3873a --- /dev/null +++ b/tests/valid/table-empty.json @@ -0,0 +1,3 @@ +{ + "a": {} +} diff --git a/tests/valid/table-empty.toml b/tests/valid/table-empty.toml new file mode 100644 index 0000000..8bb6a0a --- /dev/null +++ b/tests/valid/table-empty.toml @@ -0,0 +1 @@ +[a] diff --git a/tests/valid/table-sub-empty.json b/tests/valid/table-sub-empty.json new file mode 100644 index 0000000..9787770 --- /dev/null +++ b/tests/valid/table-sub-empty.json @@ -0,0 +1,3 @@ +{ + "a": { "b": {} } +} diff --git a/tests/valid/table-sub-empty.toml b/tests/valid/table-sub-empty.toml new file mode 100644 index 0000000..70b7fe1 --- /dev/null +++ b/tests/valid/table-sub-empty.toml @@ -0,0 +1,2 @@ +[a] +[a.b] diff --git a/tests/valid/table-whitespace.json b/tests/valid/table-whitespace.json new file mode 100644 index 0000000..3a73ec8 --- /dev/null +++ b/tests/valid/table-whitespace.json @@ -0,0 +1,3 @@ +{ + "valid key": {} +} diff --git a/tests/valid/table-whitespace.toml b/tests/valid/table-whitespace.toml new file mode 100644 index 0000000..798756c --- /dev/null +++ b/tests/valid/table-whitespace.toml @@ -0,0 +1 @@ +[valid key] diff --git a/tests/valid/table-with-pound.json b/tests/valid/table-with-pound.json new file mode 100644 index 0000000..5e594e4 --- /dev/null +++ b/tests/valid/table-with-pound.json @@ -0,0 +1,5 @@ +{ + "key#group": { + "answer": {"type": "integer", "value": "42"} + } +} diff --git a/tests/valid/table-with-pound.toml b/tests/valid/table-with-pound.toml new file mode 100644 index 0000000..e7b777e --- /dev/null +++ b/tests/valid/table-with-pound.toml @@ -0,0 +1,2 @@ +[key#group] +answer = 42 diff --git a/tests/valid/unicode-escape.json b/tests/valid/unicode-escape.json new file mode 100644 index 0000000..deda62c --- /dev/null +++ b/tests/valid/unicode-escape.json @@ -0,0 +1,3 @@ +{ + "answer": {"type": "string", "value": "\u03B4"} +} diff --git a/tests/valid/unicode-escape.toml b/tests/valid/unicode-escape.toml new file mode 100644 index 0000000..057ce15 --- /dev/null +++ b/tests/valid/unicode-escape.toml @@ -0,0 +1 @@ +answer = "\u03B4" diff --git a/tests/valid/unicode-literal.json b/tests/valid/unicode-literal.json new file mode 100644 index 0000000..00aa2f8 --- /dev/null +++ b/tests/valid/unicode-literal.json @@ -0,0 +1,3 @@ +{ + "answer": {"type": "string", "value": "δ"} +} diff --git a/tests/valid/unicode-literal.toml b/tests/valid/unicode-literal.toml new file mode 100644 index 0000000..c65723c --- /dev/null +++ b/tests/valid/unicode-literal.toml @@ -0,0 +1 @@ +answer = "δ" -- cgit v1.2.3