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 --- src/test/README.md | 1 - .../array-mixed-types-ints-and-floats.json | 15 -- src/test/invalid.rs | 76 ---------- .../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 - src/test/invalid/datetime-malformed-no-leads.toml | 1 - src/test/invalid/datetime-malformed-no-secs.toml | 1 - src/test/invalid/datetime-malformed-no-t.toml | 1 - src/test/invalid/datetime-malformed-no-z.toml | 1 - .../invalid/datetime-malformed-with-milli.toml | 1 - src/test/invalid/duplicate-key-table.toml | 5 - src/test/invalid/duplicate-keys.toml | 2 - src/test/invalid/duplicate-tables.toml | 2 - src/test/invalid/empty-implicit-table.toml | 1 - src/test/invalid/empty-table.toml | 1 - src/test/invalid/float-no-leading-zero.toml | 2 - src/test/invalid/float-no-trailing-digits.toml | 2 - src/test/invalid/key-two-equals.toml | 1 - src/test/invalid/string-bad-byte-escape.toml | 1 - src/test/invalid/string-bad-escape.toml | 1 - src/test/invalid/string-byte-escapes.toml | 1 - src/test/invalid/string-no-close.toml | 1 - src/test/invalid/table-array-implicit.toml | 14 -- .../invalid/table-array-malformed-bracket.toml | 2 - src/test/invalid/table-array-malformed-empty.toml | 2 - src/test/invalid/table-nested-brackets-close.toml | 2 - src/test/invalid/table-nested-brackets-open.toml | 2 - src/test/invalid/text-after-array-entries.toml | 4 - src/test/invalid/text-after-integer.toml | 1 - src/test/invalid/text-after-string.toml | 1 - src/test/invalid/text-after-table.toml | 1 - src/test/invalid/text-before-array-separator.toml | 4 - src/test/invalid/text-in-array.toml | 5 - src/test/mod.rs | 2 - src/test/valid.rs | 167 --------------------- src/test/valid/array-empty.json | 11 -- src/test/valid/array-empty.toml | 1 - src/test/valid/array-nospaces.json | 10 -- src/test/valid/array-nospaces.toml | 1 - src/test/valid/arrays-hetergeneous.json | 19 --- src/test/valid/arrays-hetergeneous.toml | 1 - src/test/valid/arrays-nested.json | 13 -- src/test/valid/arrays-nested.toml | 1 - src/test/valid/arrays.json | 34 ----- src/test/valid/arrays.toml | 9 -- src/test/valid/bool.json | 4 - src/test/valid/bool.toml | 2 - src/test/valid/comments-everywhere.json | 12 -- src/test/valid/comments-everywhere.toml | 24 --- src/test/valid/datetime.json | 3 - src/test/valid/datetime.toml | 1 - src/test/valid/empty.json | 1 - src/test/valid/empty.toml | 0 src/test/valid/example.json | 14 -- src/test/valid/example.toml | 5 - src/test/valid/float.json | 4 - src/test/valid/float.toml | 2 - src/test/valid/implicit-and-explicit-after.json | 10 -- src/test/valid/implicit-and-explicit-after.toml | 5 - src/test/valid/implicit-and-explicit-before.json | 10 -- src/test/valid/implicit-and-explicit-before.toml | 5 - src/test/valid/implicit-groups.json | 9 -- src/test/valid/implicit-groups.toml | 2 - src/test/valid/integer.json | 4 - src/test/valid/integer.toml | 2 - src/test/valid/key-equals-nospace.json | 3 - src/test/valid/key-equals-nospace.toml | 1 - src/test/valid/key-special-chars.json | 5 - src/test/valid/key-special-chars.toml | 1 - src/test/valid/key-with-pound.json | 3 - src/test/valid/key-with-pound.toml | 1 - src/test/valid/long-float.json | 4 - src/test/valid/long-float.toml | 2 - src/test/valid/long-integer.json | 4 - src/test/valid/long-integer.toml | 2 - src/test/valid/string-empty.json | 6 - src/test/valid/string-empty.toml | 1 - src/test/valid/string-escapes.json | 34 ----- src/test/valid/string-escapes.toml | 8 - src/test/valid/string-simple.json | 6 - src/test/valid/string-simple.toml | 1 - src/test/valid/string-with-pound.json | 7 - src/test/valid/string-with-pound.toml | 2 - src/test/valid/table-array-implicit.json | 7 - src/test/valid/table-array-implicit.toml | 2 - src/test/valid/table-array-many.json | 16 -- src/test/valid/table-array-many.toml | 11 -- src/test/valid/table-array-nest.json | 18 --- src/test/valid/table-array-nest.toml | 17 --- src/test/valid/table-array-one.json | 8 - src/test/valid/table-array-one.toml | 3 - src/test/valid/table-empty.json | 3 - src/test/valid/table-empty.toml | 1 - src/test/valid/table-sub-empty.json | 3 - src/test/valid/table-sub-empty.toml | 2 - src/test/valid/table-whitespace.json | 3 - src/test/valid/table-whitespace.toml | 1 - src/test/valid/table-with-pound.json | 5 - src/test/valid/table-with-pound.toml | 2 - src/test/valid/unicode-escape.json | 3 - src/test/valid/unicode-escape.toml | 1 - src/test/valid/unicode-literal.json | 3 - src/test/valid/unicode-literal.toml | 1 - 104 files changed, 747 deletions(-) delete mode 100644 src/test/README.md delete mode 100644 src/test/invalid-encoder/array-mixed-types-ints-and-floats.json delete mode 100644 src/test/invalid.rs delete mode 100644 src/test/invalid/array-mixed-types-arrays-and-ints.toml delete mode 100644 src/test/invalid/array-mixed-types-ints-and-floats.toml delete mode 100644 src/test/invalid/array-mixed-types-strings-and-ints.toml delete mode 100644 src/test/invalid/datetime-malformed-no-leads.toml delete mode 100644 src/test/invalid/datetime-malformed-no-secs.toml delete mode 100644 src/test/invalid/datetime-malformed-no-t.toml delete mode 100644 src/test/invalid/datetime-malformed-no-z.toml delete mode 100644 src/test/invalid/datetime-malformed-with-milli.toml delete mode 100644 src/test/invalid/duplicate-key-table.toml delete mode 100644 src/test/invalid/duplicate-keys.toml delete mode 100644 src/test/invalid/duplicate-tables.toml delete mode 100644 src/test/invalid/empty-implicit-table.toml delete mode 100644 src/test/invalid/empty-table.toml delete mode 100644 src/test/invalid/float-no-leading-zero.toml delete mode 100644 src/test/invalid/float-no-trailing-digits.toml delete mode 100644 src/test/invalid/key-two-equals.toml delete mode 100644 src/test/invalid/string-bad-byte-escape.toml delete mode 100644 src/test/invalid/string-bad-escape.toml delete mode 100644 src/test/invalid/string-byte-escapes.toml delete mode 100644 src/test/invalid/string-no-close.toml delete mode 100644 src/test/invalid/table-array-implicit.toml delete mode 100644 src/test/invalid/table-array-malformed-bracket.toml delete mode 100644 src/test/invalid/table-array-malformed-empty.toml delete mode 100644 src/test/invalid/table-nested-brackets-close.toml delete mode 100644 src/test/invalid/table-nested-brackets-open.toml delete mode 100644 src/test/invalid/text-after-array-entries.toml delete mode 100644 src/test/invalid/text-after-integer.toml delete mode 100644 src/test/invalid/text-after-string.toml delete mode 100644 src/test/invalid/text-after-table.toml delete mode 100644 src/test/invalid/text-before-array-separator.toml delete mode 100644 src/test/invalid/text-in-array.toml delete mode 100644 src/test/mod.rs delete mode 100644 src/test/valid.rs delete mode 100644 src/test/valid/array-empty.json delete mode 100644 src/test/valid/array-empty.toml delete mode 100644 src/test/valid/array-nospaces.json delete mode 100644 src/test/valid/array-nospaces.toml delete mode 100644 src/test/valid/arrays-hetergeneous.json delete mode 100644 src/test/valid/arrays-hetergeneous.toml delete mode 100644 src/test/valid/arrays-nested.json delete mode 100644 src/test/valid/arrays-nested.toml delete mode 100644 src/test/valid/arrays.json delete mode 100644 src/test/valid/arrays.toml delete mode 100644 src/test/valid/bool.json delete mode 100644 src/test/valid/bool.toml delete mode 100644 src/test/valid/comments-everywhere.json delete mode 100644 src/test/valid/comments-everywhere.toml delete mode 100644 src/test/valid/datetime.json delete mode 100644 src/test/valid/datetime.toml delete mode 100644 src/test/valid/empty.json delete mode 100644 src/test/valid/empty.toml delete mode 100644 src/test/valid/example.json delete mode 100644 src/test/valid/example.toml delete mode 100644 src/test/valid/float.json delete mode 100644 src/test/valid/float.toml delete mode 100644 src/test/valid/implicit-and-explicit-after.json delete mode 100644 src/test/valid/implicit-and-explicit-after.toml delete mode 100644 src/test/valid/implicit-and-explicit-before.json delete mode 100644 src/test/valid/implicit-and-explicit-before.toml delete mode 100644 src/test/valid/implicit-groups.json delete mode 100644 src/test/valid/implicit-groups.toml delete mode 100644 src/test/valid/integer.json delete mode 100644 src/test/valid/integer.toml delete mode 100644 src/test/valid/key-equals-nospace.json delete mode 100644 src/test/valid/key-equals-nospace.toml delete mode 100644 src/test/valid/key-special-chars.json delete mode 100644 src/test/valid/key-special-chars.toml delete mode 100644 src/test/valid/key-with-pound.json delete mode 100644 src/test/valid/key-with-pound.toml delete mode 100644 src/test/valid/long-float.json delete mode 100644 src/test/valid/long-float.toml delete mode 100644 src/test/valid/long-integer.json delete mode 100644 src/test/valid/long-integer.toml delete mode 100644 src/test/valid/string-empty.json delete mode 100644 src/test/valid/string-empty.toml delete mode 100644 src/test/valid/string-escapes.json delete mode 100644 src/test/valid/string-escapes.toml delete mode 100644 src/test/valid/string-simple.json delete mode 100644 src/test/valid/string-simple.toml delete mode 100644 src/test/valid/string-with-pound.json delete mode 100644 src/test/valid/string-with-pound.toml delete mode 100644 src/test/valid/table-array-implicit.json delete mode 100644 src/test/valid/table-array-implicit.toml delete mode 100644 src/test/valid/table-array-many.json delete mode 100644 src/test/valid/table-array-many.toml delete mode 100644 src/test/valid/table-array-nest.json delete mode 100644 src/test/valid/table-array-nest.toml delete mode 100644 src/test/valid/table-array-one.json delete mode 100644 src/test/valid/table-array-one.toml delete mode 100644 src/test/valid/table-empty.json delete mode 100644 src/test/valid/table-empty.toml delete mode 100644 src/test/valid/table-sub-empty.json delete mode 100644 src/test/valid/table-sub-empty.toml delete mode 100644 src/test/valid/table-whitespace.json delete mode 100644 src/test/valid/table-whitespace.toml delete mode 100644 src/test/valid/table-with-pound.json delete mode 100644 src/test/valid/table-with-pound.toml delete mode 100644 src/test/valid/unicode-escape.json delete mode 100644 src/test/valid/unicode-escape.toml delete mode 100644 src/test/valid/unicode-literal.json delete mode 100644 src/test/valid/unicode-literal.toml (limited to 'src/test') diff --git a/src/test/README.md b/src/test/README.md deleted file mode 100644 index ebbc01c..0000000 --- a/src/test/README.md +++ /dev/null @@ -1 +0,0 @@ -Tests are from https://github.com/BurntSushi/toml-test diff --git a/src/test/invalid-encoder/array-mixed-types-ints-and-floats.json b/src/test/invalid-encoder/array-mixed-types-ints-and-floats.json deleted file mode 100644 index b7920a0..0000000 --- a/src/test/invalid-encoder/array-mixed-types-ints-and-floats.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "ints-and-floats": { - "type": "array", - "value": [ - { - "type": "integer", - "value": "1" - }, - { - "type": "float", - "value": "1.0" - } - ] - } -} diff --git a/src/test/invalid.rs b/src/test/invalid.rs deleted file mode 100644 index 4f69ec6..0000000 --- a/src/test/invalid.rs +++ /dev/null @@ -1,76 +0,0 @@ -use {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/src/test/invalid/array-mixed-types-arrays-and-ints.toml b/src/test/invalid/array-mixed-types-arrays-and-ints.toml deleted file mode 100644 index 051ec73..0000000 --- a/src/test/invalid/array-mixed-types-arrays-and-ints.toml +++ /dev/null @@ -1 +0,0 @@ -arrays-and-ints = [1, ["Arrays are not integers."]] diff --git a/src/test/invalid/array-mixed-types-ints-and-floats.toml b/src/test/invalid/array-mixed-types-ints-and-floats.toml deleted file mode 100644 index 51ebe80..0000000 --- a/src/test/invalid/array-mixed-types-ints-and-floats.toml +++ /dev/null @@ -1 +0,0 @@ -ints-and-floats = [1, 1.0] diff --git a/src/test/invalid/array-mixed-types-strings-and-ints.toml b/src/test/invalid/array-mixed-types-strings-and-ints.toml deleted file mode 100644 index f348308..0000000 --- a/src/test/invalid/array-mixed-types-strings-and-ints.toml +++ /dev/null @@ -1 +0,0 @@ -strings-and-ints = ["hi", 42] diff --git a/src/test/invalid/datetime-malformed-no-leads.toml b/src/test/invalid/datetime-malformed-no-leads.toml deleted file mode 100644 index 123f173..0000000 --- a/src/test/invalid/datetime-malformed-no-leads.toml +++ /dev/null @@ -1 +0,0 @@ -no-leads = 1987-7-05T17:45:00Z diff --git a/src/test/invalid/datetime-malformed-no-secs.toml b/src/test/invalid/datetime-malformed-no-secs.toml deleted file mode 100644 index ba93900..0000000 --- a/src/test/invalid/datetime-malformed-no-secs.toml +++ /dev/null @@ -1 +0,0 @@ -no-secs = 1987-07-05T17:45Z diff --git a/src/test/invalid/datetime-malformed-no-t.toml b/src/test/invalid/datetime-malformed-no-t.toml deleted file mode 100644 index 617e3c5..0000000 --- a/src/test/invalid/datetime-malformed-no-t.toml +++ /dev/null @@ -1 +0,0 @@ -no-t = 1987-07-0517:45:00Z diff --git a/src/test/invalid/datetime-malformed-no-z.toml b/src/test/invalid/datetime-malformed-no-z.toml deleted file mode 100644 index cf66b1e..0000000 --- a/src/test/invalid/datetime-malformed-no-z.toml +++ /dev/null @@ -1 +0,0 @@ -no-z = 1987-07-05T17:45:00 diff --git a/src/test/invalid/datetime-malformed-with-milli.toml b/src/test/invalid/datetime-malformed-with-milli.toml deleted file mode 100644 index eef792f..0000000 --- a/src/test/invalid/datetime-malformed-with-milli.toml +++ /dev/null @@ -1 +0,0 @@ -with-milli = 1987-07-5T17:45:00.12Z diff --git a/src/test/invalid/duplicate-key-table.toml b/src/test/invalid/duplicate-key-table.toml deleted file mode 100644 index cedf05f..0000000 --- a/src/test/invalid/duplicate-key-table.toml +++ /dev/null @@ -1,5 +0,0 @@ -[fruit] -type = "apple" - -[fruit.type] -apple = "yes" diff --git a/src/test/invalid/duplicate-keys.toml b/src/test/invalid/duplicate-keys.toml deleted file mode 100644 index 9b5aee0..0000000 --- a/src/test/invalid/duplicate-keys.toml +++ /dev/null @@ -1,2 +0,0 @@ -dupe = false -dupe = true diff --git a/src/test/invalid/duplicate-tables.toml b/src/test/invalid/duplicate-tables.toml deleted file mode 100644 index 8ddf49b..0000000 --- a/src/test/invalid/duplicate-tables.toml +++ /dev/null @@ -1,2 +0,0 @@ -[a] -[a] diff --git a/src/test/invalid/empty-implicit-table.toml b/src/test/invalid/empty-implicit-table.toml deleted file mode 100644 index 0cc36d0..0000000 --- a/src/test/invalid/empty-implicit-table.toml +++ /dev/null @@ -1 +0,0 @@ -[naughty..naughty] diff --git a/src/test/invalid/empty-table.toml b/src/test/invalid/empty-table.toml deleted file mode 100644 index fe51488..0000000 --- a/src/test/invalid/empty-table.toml +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/src/test/invalid/float-no-leading-zero.toml b/src/test/invalid/float-no-leading-zero.toml deleted file mode 100644 index cab76bf..0000000 --- a/src/test/invalid/float-no-leading-zero.toml +++ /dev/null @@ -1,2 +0,0 @@ -answer = .12345 -neganswer = -.12345 diff --git a/src/test/invalid/float-no-trailing-digits.toml b/src/test/invalid/float-no-trailing-digits.toml deleted file mode 100644 index cbff2d0..0000000 --- a/src/test/invalid/float-no-trailing-digits.toml +++ /dev/null @@ -1,2 +0,0 @@ -answer = 1. -neganswer = -1. diff --git a/src/test/invalid/key-two-equals.toml b/src/test/invalid/key-two-equals.toml deleted file mode 100644 index 25a0378..0000000 --- a/src/test/invalid/key-two-equals.toml +++ /dev/null @@ -1 +0,0 @@ -key= = 1 diff --git a/src/test/invalid/string-bad-byte-escape.toml b/src/test/invalid/string-bad-byte-escape.toml deleted file mode 100644 index 4c7be59..0000000 --- a/src/test/invalid/string-bad-byte-escape.toml +++ /dev/null @@ -1 +0,0 @@ -naughty = "\xAg" diff --git a/src/test/invalid/string-bad-escape.toml b/src/test/invalid/string-bad-escape.toml deleted file mode 100644 index 60acb0c..0000000 --- a/src/test/invalid/string-bad-escape.toml +++ /dev/null @@ -1 +0,0 @@ -invalid-escape = "This string has a bad \a escape character." diff --git a/src/test/invalid/string-byte-escapes.toml b/src/test/invalid/string-byte-escapes.toml deleted file mode 100644 index e94452a..0000000 --- a/src/test/invalid/string-byte-escapes.toml +++ /dev/null @@ -1 +0,0 @@ -answer = "\x33" diff --git a/src/test/invalid/string-no-close.toml b/src/test/invalid/string-no-close.toml deleted file mode 100644 index 0c292fc..0000000 --- a/src/test/invalid/string-no-close.toml +++ /dev/null @@ -1 +0,0 @@ -no-ending-quote = "One time, at band camp diff --git a/src/test/invalid/table-array-implicit.toml b/src/test/invalid/table-array-implicit.toml deleted file mode 100644 index 05f2507..0000000 --- a/src/test/invalid/table-array-implicit.toml +++ /dev/null @@ -1,14 +0,0 @@ -# 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/src/test/invalid/table-array-malformed-bracket.toml b/src/test/invalid/table-array-malformed-bracket.toml deleted file mode 100644 index 39c73b0..0000000 --- a/src/test/invalid/table-array-malformed-bracket.toml +++ /dev/null @@ -1,2 +0,0 @@ -[[albums] -name = "Born to Run" diff --git a/src/test/invalid/table-array-malformed-empty.toml b/src/test/invalid/table-array-malformed-empty.toml deleted file mode 100644 index a470ca3..0000000 --- a/src/test/invalid/table-array-malformed-empty.toml +++ /dev/null @@ -1,2 +0,0 @@ -[[]] -name = "Born to Run" diff --git a/src/test/invalid/table-nested-brackets-close.toml b/src/test/invalid/table-nested-brackets-close.toml deleted file mode 100644 index c8b5a67..0000000 --- a/src/test/invalid/table-nested-brackets-close.toml +++ /dev/null @@ -1,2 +0,0 @@ -[a]b] -zyx = 42 diff --git a/src/test/invalid/table-nested-brackets-open.toml b/src/test/invalid/table-nested-brackets-open.toml deleted file mode 100644 index 246d7e9..0000000 --- a/src/test/invalid/table-nested-brackets-open.toml +++ /dev/null @@ -1,2 +0,0 @@ -[a[b] -zyx = 42 diff --git a/src/test/invalid/text-after-array-entries.toml b/src/test/invalid/text-after-array-entries.toml deleted file mode 100644 index 1a72890..0000000 --- a/src/test/invalid/text-after-array-entries.toml +++ /dev/null @@ -1,4 +0,0 @@ -array = [ - "Is there life after an array separator?", No - "Entry" -] diff --git a/src/test/invalid/text-after-integer.toml b/src/test/invalid/text-after-integer.toml deleted file mode 100644 index 42de7af..0000000 --- a/src/test/invalid/text-after-integer.toml +++ /dev/null @@ -1 +0,0 @@ -answer = 42 the ultimate answer? diff --git a/src/test/invalid/text-after-string.toml b/src/test/invalid/text-after-string.toml deleted file mode 100644 index c92a6f1..0000000 --- a/src/test/invalid/text-after-string.toml +++ /dev/null @@ -1 +0,0 @@ -string = "Is there life after strings?" No. diff --git a/src/test/invalid/text-after-table.toml b/src/test/invalid/text-after-table.toml deleted file mode 100644 index 87da9db..0000000 --- a/src/test/invalid/text-after-table.toml +++ /dev/null @@ -1 +0,0 @@ -[error] this shouldn't be here diff --git a/src/test/invalid/text-before-array-separator.toml b/src/test/invalid/text-before-array-separator.toml deleted file mode 100644 index 9b06a39..0000000 --- a/src/test/invalid/text-before-array-separator.toml +++ /dev/null @@ -1,4 +0,0 @@ -array = [ - "Is there life before an array separator?" No, - "Entry" -] diff --git a/src/test/invalid/text-in-array.toml b/src/test/invalid/text-in-array.toml deleted file mode 100644 index a6a6c42..0000000 --- a/src/test/invalid/text-in-array.toml +++ /dev/null @@ -1,5 +0,0 @@ -array = [ - "Entry 1", - I don't belong, - "Entry 2", -] diff --git a/src/test/mod.rs b/src/test/mod.rs deleted file mode 100644 index 6f2c7bd..0000000 --- a/src/test/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod valid; -mod invalid; diff --git a/src/test/valid.rs b/src/test/valid.rs deleted file mode 100644 index 289fa24..0000000 --- a/src/test/valid.rs +++ /dev/null @@ -1,167 +0,0 @@ -extern crate serialize; - -use std::num::strconv; -use std::collections::BTreeMap; -use self::serialize::json::{self, Json}; - -use {Parser, Value}; -use 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/src/test/valid/array-empty.json b/src/test/valid/array-empty.json deleted file mode 100644 index 2fbf256..0000000 --- a/src/test/valid/array-empty.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "thevoid": { "type": "array", "value": [ - {"type": "array", "value": [ - {"type": "array", "value": [ - {"type": "array", "value": [ - {"type": "array", "value": []} - ]} - ]} - ]} - ]} -} diff --git a/src/test/valid/array-empty.toml b/src/test/valid/array-empty.toml deleted file mode 100644 index fa58dc6..0000000 --- a/src/test/valid/array-empty.toml +++ /dev/null @@ -1 +0,0 @@ -thevoid = [[[[[]]]]] diff --git a/src/test/valid/array-nospaces.json b/src/test/valid/array-nospaces.json deleted file mode 100644 index 1833d61..0000000 --- a/src/test/valid/array-nospaces.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "ints": { - "type": "array", - "value": [ - {"type": "integer", "value": "1"}, - {"type": "integer", "value": "2"}, - {"type": "integer", "value": "3"} - ] - } -} diff --git a/src/test/valid/array-nospaces.toml b/src/test/valid/array-nospaces.toml deleted file mode 100644 index 6618936..0000000 --- a/src/test/valid/array-nospaces.toml +++ /dev/null @@ -1 +0,0 @@ -ints = [1,2,3] diff --git a/src/test/valid/arrays-hetergeneous.json b/src/test/valid/arrays-hetergeneous.json deleted file mode 100644 index e703739..0000000 --- a/src/test/valid/arrays-hetergeneous.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "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/src/test/valid/arrays-hetergeneous.toml b/src/test/valid/arrays-hetergeneous.toml deleted file mode 100644 index 91fcbdf..0000000 --- a/src/test/valid/arrays-hetergeneous.toml +++ /dev/null @@ -1 +0,0 @@ -mixed = [[1, 2], ["a", "b"], [1.0, 2.0]] diff --git a/src/test/valid/arrays-nested.json b/src/test/valid/arrays-nested.json deleted file mode 100644 index d21920c..0000000 --- a/src/test/valid/arrays-nested.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "nest": { - "type": "array", - "value": [ - {"type": "array", "value": [ - {"type": "string", "value": "a"} - ]}, - {"type": "array", "value": [ - {"type": "string", "value": "b"} - ]} - ] - } -} diff --git a/src/test/valid/arrays-nested.toml b/src/test/valid/arrays-nested.toml deleted file mode 100644 index ce33022..0000000 --- a/src/test/valid/arrays-nested.toml +++ /dev/null @@ -1 +0,0 @@ -nest = [["a"], ["b"]] diff --git a/src/test/valid/arrays.json b/src/test/valid/arrays.json deleted file mode 100644 index 4d16d8a..0000000 --- a/src/test/valid/arrays.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "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/src/test/valid/arrays.toml b/src/test/valid/arrays.toml deleted file mode 100644 index 6d6440d..0000000 --- a/src/test/valid/arrays.toml +++ /dev/null @@ -1,9 +0,0 @@ -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/src/test/valid/bool.json b/src/test/valid/bool.json deleted file mode 100644 index ae368e9..0000000 --- a/src/test/valid/bool.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "f": {"type": "bool", "value": "false"}, - "t": {"type": "bool", "value": "true"} -} diff --git a/src/test/valid/bool.toml b/src/test/valid/bool.toml deleted file mode 100644 index a8a829b..0000000 --- a/src/test/valid/bool.toml +++ /dev/null @@ -1,2 +0,0 @@ -t = true -f = false diff --git a/src/test/valid/comments-everywhere.json b/src/test/valid/comments-everywhere.json deleted file mode 100644 index e69a2e9..0000000 --- a/src/test/valid/comments-everywhere.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "group": { - "answer": {"type": "integer", "value": "42"}, - "more": { - "type": "array", - "value": [ - {"type": "integer", "value": "42"}, - {"type": "integer", "value": "42"} - ] - } - } -} diff --git a/src/test/valid/comments-everywhere.toml b/src/test/valid/comments-everywhere.toml deleted file mode 100644 index 3dca74c..0000000 --- a/src/test/valid/comments-everywhere.toml +++ /dev/null @@ -1,24 +0,0 @@ -# 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/src/test/valid/datetime.json b/src/test/valid/datetime.json deleted file mode 100644 index 2ca93ce..0000000 --- a/src/test/valid/datetime.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bestdayever": {"type": "datetime", "value": "1987-07-05T17:45:00Z"} -} diff --git a/src/test/valid/datetime.toml b/src/test/valid/datetime.toml deleted file mode 100644 index 2e99340..0000000 --- a/src/test/valid/datetime.toml +++ /dev/null @@ -1 +0,0 @@ -bestdayever = 1987-07-05T17:45:00Z diff --git a/src/test/valid/empty.json b/src/test/valid/empty.json deleted file mode 100644 index 0967ef4..0000000 --- a/src/test/valid/empty.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/src/test/valid/empty.toml b/src/test/valid/empty.toml deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/valid/example.json b/src/test/valid/example.json deleted file mode 100644 index 48aa907..0000000 --- a/src/test/valid/example.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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/src/test/valid/example.toml b/src/test/valid/example.toml deleted file mode 100644 index 8cb02e0..0000000 --- a/src/test/valid/example.toml +++ /dev/null @@ -1,5 +0,0 @@ -best-day-ever = 1987-07-05T17:45:00Z - -[numtheory] -boring = false -perfection = [6, 28, 496] diff --git a/src/test/valid/float.json b/src/test/valid/float.json deleted file mode 100644 index b8a2e97..0000000 --- a/src/test/valid/float.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "pi": {"type": "float", "value": "3.14"}, - "negpi": {"type": "float", "value": "-3.14"} -} diff --git a/src/test/valid/float.toml b/src/test/valid/float.toml deleted file mode 100644 index 7c528d2..0000000 --- a/src/test/valid/float.toml +++ /dev/null @@ -1,2 +0,0 @@ -pi = 3.14 -negpi = -3.14 diff --git a/src/test/valid/implicit-and-explicit-after.json b/src/test/valid/implicit-and-explicit-after.json deleted file mode 100644 index 374bd09..0000000 --- a/src/test/valid/implicit-and-explicit-after.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "a": { - "better": {"type": "integer", "value": "43"}, - "b": { - "c": { - "answer": {"type": "integer", "value": "42"} - } - } - } -} diff --git a/src/test/valid/implicit-and-explicit-after.toml b/src/test/valid/implicit-and-explicit-after.toml deleted file mode 100644 index c0e8865..0000000 --- a/src/test/valid/implicit-and-explicit-after.toml +++ /dev/null @@ -1,5 +0,0 @@ -[a.b.c] -answer = 42 - -[a] -better = 43 diff --git a/src/test/valid/implicit-and-explicit-before.json b/src/test/valid/implicit-and-explicit-before.json deleted file mode 100644 index 374bd09..0000000 --- a/src/test/valid/implicit-and-explicit-before.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "a": { - "better": {"type": "integer", "value": "43"}, - "b": { - "c": { - "answer": {"type": "integer", "value": "42"} - } - } - } -} diff --git a/src/test/valid/implicit-and-explicit-before.toml b/src/test/valid/implicit-and-explicit-before.toml deleted file mode 100644 index eee68ff..0000000 --- a/src/test/valid/implicit-and-explicit-before.toml +++ /dev/null @@ -1,5 +0,0 @@ -[a] -better = 43 - -[a.b.c] -answer = 42 diff --git a/src/test/valid/implicit-groups.json b/src/test/valid/implicit-groups.json deleted file mode 100644 index fbae7fc..0000000 --- a/src/test/valid/implicit-groups.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "a": { - "b": { - "c": { - "answer": {"type": "integer", "value": "42"} - } - } - } -} diff --git a/src/test/valid/implicit-groups.toml b/src/test/valid/implicit-groups.toml deleted file mode 100644 index b6333e4..0000000 --- a/src/test/valid/implicit-groups.toml +++ /dev/null @@ -1,2 +0,0 @@ -[a.b.c] -answer = 42 diff --git a/src/test/valid/integer.json b/src/test/valid/integer.json deleted file mode 100644 index 61985a1..0000000 --- a/src/test/valid/integer.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "answer": {"type": "integer", "value": "42"}, - "neganswer": {"type": "integer", "value": "-42"} -} diff --git a/src/test/valid/integer.toml b/src/test/valid/integer.toml deleted file mode 100644 index c4f6297..0000000 --- a/src/test/valid/integer.toml +++ /dev/null @@ -1,2 +0,0 @@ -answer = 42 -neganswer = -42 diff --git a/src/test/valid/key-equals-nospace.json b/src/test/valid/key-equals-nospace.json deleted file mode 100644 index 1f8709a..0000000 --- a/src/test/valid/key-equals-nospace.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "answer": {"type": "integer", "value": "42"} -} diff --git a/src/test/valid/key-equals-nospace.toml b/src/test/valid/key-equals-nospace.toml deleted file mode 100644 index 560901c..0000000 --- a/src/test/valid/key-equals-nospace.toml +++ /dev/null @@ -1 +0,0 @@ -answer=42 diff --git a/src/test/valid/key-special-chars.json b/src/test/valid/key-special-chars.json deleted file mode 100644 index 6550ebd..0000000 --- a/src/test/valid/key-special-chars.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "~!@#$^&*()_+-`1234567890[]\\|/?><.,;:'": { - "type": "integer", "value": "1" - } -} diff --git a/src/test/valid/key-special-chars.toml b/src/test/valid/key-special-chars.toml deleted file mode 100644 index 8b3fc51..0000000 --- a/src/test/valid/key-special-chars.toml +++ /dev/null @@ -1 +0,0 @@ -~!@#$^&*()_+-`1234567890[]\|/?><.,;:' = 1 diff --git a/src/test/valid/key-with-pound.json b/src/test/valid/key-with-pound.json deleted file mode 100644 index ee39e1d..0000000 --- a/src/test/valid/key-with-pound.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "key#name": {"type": "integer", "value": "5"} -} diff --git a/src/test/valid/key-with-pound.toml b/src/test/valid/key-with-pound.toml deleted file mode 100644 index 1c54f53..0000000 --- a/src/test/valid/key-with-pound.toml +++ /dev/null @@ -1 +0,0 @@ -key#name = 5 diff --git a/src/test/valid/long-float.json b/src/test/valid/long-float.json deleted file mode 100644 index 8ceed47..0000000 --- a/src/test/valid/long-float.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "longpi": {"type": "float", "value": "3.141592653589793"}, - "neglongpi": {"type": "float", "value": "-3.141592653589793"} -} diff --git a/src/test/valid/long-float.toml b/src/test/valid/long-float.toml deleted file mode 100644 index 9558ae4..0000000 --- a/src/test/valid/long-float.toml +++ /dev/null @@ -1,2 +0,0 @@ -longpi = 3.141592653589793 -neglongpi = -3.141592653589793 diff --git a/src/test/valid/long-integer.json b/src/test/valid/long-integer.json deleted file mode 100644 index 16c331e..0000000 --- a/src/test/valid/long-integer.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "answer": {"type": "integer", "value": "9223372036854775807"}, - "neganswer": {"type": "integer", "value": "-9223372036854775808"} -} diff --git a/src/test/valid/long-integer.toml b/src/test/valid/long-integer.toml deleted file mode 100644 index 424a13a..0000000 --- a/src/test/valid/long-integer.toml +++ /dev/null @@ -1,2 +0,0 @@ -answer = 9223372036854775807 -neganswer = -9223372036854775808 diff --git a/src/test/valid/string-empty.json b/src/test/valid/string-empty.json deleted file mode 100644 index 6c26d69..0000000 --- a/src/test/valid/string-empty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "answer": { - "type": "string", - "value": "" - } -} diff --git a/src/test/valid/string-empty.toml b/src/test/valid/string-empty.toml deleted file mode 100644 index e37e681..0000000 --- a/src/test/valid/string-empty.toml +++ /dev/null @@ -1 +0,0 @@ -answer = "" diff --git a/src/test/valid/string-escapes.json b/src/test/valid/string-escapes.json deleted file mode 100644 index ca71d30..0000000 --- a/src/test/valid/string-escapes.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "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/src/test/valid/string-escapes.toml b/src/test/valid/string-escapes.toml deleted file mode 100644 index 2d64500..0000000 --- a/src/test/valid/string-escapes.toml +++ /dev/null @@ -1,8 +0,0 @@ -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/src/test/valid/string-simple.json b/src/test/valid/string-simple.json deleted file mode 100644 index 2e05f99..0000000 --- a/src/test/valid/string-simple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "answer": { - "type": "string", - "value": "You are not drinking enough whisky." - } -} diff --git a/src/test/valid/string-simple.toml b/src/test/valid/string-simple.toml deleted file mode 100644 index e17ade6..0000000 --- a/src/test/valid/string-simple.toml +++ /dev/null @@ -1 +0,0 @@ -answer = "You are not drinking enough whisky." diff --git a/src/test/valid/string-with-pound.json b/src/test/valid/string-with-pound.json deleted file mode 100644 index 33cdc9c..0000000 --- a/src/test/valid/string-with-pound.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pound": {"type": "string", "value": "We see no # comments here."}, - "poundcomment": { - "type": "string", - "value": "But there are # some comments here." - } -} diff --git a/src/test/valid/string-with-pound.toml b/src/test/valid/string-with-pound.toml deleted file mode 100644 index 5fd8746..0000000 --- a/src/test/valid/string-with-pound.toml +++ /dev/null @@ -1,2 +0,0 @@ -pound = "We see no # comments here." -poundcomment = "But there are # some comments here." # Did I # mess you up? diff --git a/src/test/valid/table-array-implicit.json b/src/test/valid/table-array-implicit.json deleted file mode 100644 index 32e4640..0000000 --- a/src/test/valid/table-array-implicit.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "albums": { - "songs": [ - {"name": {"type": "string", "value": "Glory Days"}} - ] - } -} diff --git a/src/test/valid/table-array-implicit.toml b/src/test/valid/table-array-implicit.toml deleted file mode 100644 index 3157ac9..0000000 --- a/src/test/valid/table-array-implicit.toml +++ /dev/null @@ -1,2 +0,0 @@ -[[albums.songs]] -name = "Glory Days" diff --git a/src/test/valid/table-array-many.json b/src/test/valid/table-array-many.json deleted file mode 100644 index 84df2da..0000000 --- a/src/test/valid/table-array-many.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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/src/test/valid/table-array-many.toml b/src/test/valid/table-array-many.toml deleted file mode 100644 index 46062be..0000000 --- a/src/test/valid/table-array-many.toml +++ /dev/null @@ -1,11 +0,0 @@ -[[people]] -first_name = "Bruce" -last_name = "Springsteen" - -[[people]] -first_name = "Eric" -last_name = "Clapton" - -[[people]] -first_name = "Bob" -last_name = "Seger" diff --git a/src/test/valid/table-array-nest.json b/src/test/valid/table-array-nest.json deleted file mode 100644 index c117afa..0000000 --- a/src/test/valid/table-array-nest.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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/src/test/valid/table-array-nest.toml b/src/test/valid/table-array-nest.toml deleted file mode 100644 index d659a3d..0000000 --- a/src/test/valid/table-array-nest.toml +++ /dev/null @@ -1,17 +0,0 @@ -[[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/src/test/valid/table-array-one.json b/src/test/valid/table-array-one.json deleted file mode 100644 index d75faae..0000000 --- a/src/test/valid/table-array-one.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "people": [ - { - "first_name": {"type": "string", "value": "Bruce"}, - "last_name": {"type": "string", "value": "Springsteen"} - } - ] -} diff --git a/src/test/valid/table-array-one.toml b/src/test/valid/table-array-one.toml deleted file mode 100644 index cd7e1b6..0000000 --- a/src/test/valid/table-array-one.toml +++ /dev/null @@ -1,3 +0,0 @@ -[[people]] -first_name = "Bruce" -last_name = "Springsteen" diff --git a/src/test/valid/table-empty.json b/src/test/valid/table-empty.json deleted file mode 100644 index 6f3873a..0000000 --- a/src/test/valid/table-empty.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "a": {} -} diff --git a/src/test/valid/table-empty.toml b/src/test/valid/table-empty.toml deleted file mode 100644 index 8bb6a0a..0000000 --- a/src/test/valid/table-empty.toml +++ /dev/null @@ -1 +0,0 @@ -[a] diff --git a/src/test/valid/table-sub-empty.json b/src/test/valid/table-sub-empty.json deleted file mode 100644 index 9787770..0000000 --- a/src/test/valid/table-sub-empty.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "a": { "b": {} } -} diff --git a/src/test/valid/table-sub-empty.toml b/src/test/valid/table-sub-empty.toml deleted file mode 100644 index 70b7fe1..0000000 --- a/src/test/valid/table-sub-empty.toml +++ /dev/null @@ -1,2 +0,0 @@ -[a] -[a.b] diff --git a/src/test/valid/table-whitespace.json b/src/test/valid/table-whitespace.json deleted file mode 100644 index 3a73ec8..0000000 --- a/src/test/valid/table-whitespace.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "valid key": {} -} diff --git a/src/test/valid/table-whitespace.toml b/src/test/valid/table-whitespace.toml deleted file mode 100644 index 798756c..0000000 --- a/src/test/valid/table-whitespace.toml +++ /dev/null @@ -1 +0,0 @@ -[valid key] diff --git a/src/test/valid/table-with-pound.json b/src/test/valid/table-with-pound.json deleted file mode 100644 index 5e594e4..0000000 --- a/src/test/valid/table-with-pound.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "key#group": { - "answer": {"type": "integer", "value": "42"} - } -} diff --git a/src/test/valid/table-with-pound.toml b/src/test/valid/table-with-pound.toml deleted file mode 100644 index e7b777e..0000000 --- a/src/test/valid/table-with-pound.toml +++ /dev/null @@ -1,2 +0,0 @@ -[key#group] -answer = 42 diff --git a/src/test/valid/unicode-escape.json b/src/test/valid/unicode-escape.json deleted file mode 100644 index deda62c..0000000 --- a/src/test/valid/unicode-escape.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "answer": {"type": "string", "value": "\u03B4"} -} diff --git a/src/test/valid/unicode-escape.toml b/src/test/valid/unicode-escape.toml deleted file mode 100644 index 057ce15..0000000 --- a/src/test/valid/unicode-escape.toml +++ /dev/null @@ -1 +0,0 @@ -answer = "\u03B4" diff --git a/src/test/valid/unicode-literal.json b/src/test/valid/unicode-literal.json deleted file mode 100644 index 00aa2f8..0000000 --- a/src/test/valid/unicode-literal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "answer": {"type": "string", "value": "δ"} -} diff --git a/src/test/valid/unicode-literal.toml b/src/test/valid/unicode-literal.toml deleted file mode 100644 index c65723c..0000000 --- a/src/test/valid/unicode-literal.toml +++ /dev/null @@ -1 +0,0 @@ -answer = "δ" -- cgit v1.2.3