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/invalid/array-mixed-types-arrays-and-ints.toml | 1 - src/test/invalid/array-mixed-types-ints-and-floats.toml | 1 - src/test/invalid/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 - src/test/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 -------------- src/test/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 ----- 31 files changed, 66 deletions(-) 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 (limited to 'src/test/invalid') 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", -] -- cgit v1.2.3