Update tests

- Fix json to proper format - Remove deprecated options tests - Show file that is being tested
nikolauska · Feb 11, 2018 · 69f2e95 · 69f2e95
1 parent b28dd76
commit 69f2e95
Show file tree

Hide file tree

Showing 37 changed files with 134 additions and 321 deletions.
diff --git a/test/toml/valid/array-empty.json b/test/toml/valid/array-empty.json
@@ -1,11 +1,3 @@
 {
-    "thevoid": { "type": "array", "value": [
-        {"type": "array", "value": [
-            {"type": "array", "value": [
-                {"type": "array", "value": [
-                    {"type": "array", "value": []}
-                ]}
-            ]}
-        ]}
-    ]}
+  "thevoid": [[[[[]]]]]
 }
diff --git a/test/toml/valid/array-nospaces.json b/test/toml/valid/array-nospaces.json
@@ -1,10 +1,3 @@
 {
-    "ints": {
-        "type": "array",
-        "value": [
-            {"type": "integer", "value": "1"},
-            {"type": "integer", "value": "2"},
-            {"type": "integer", "value": "3"}
-        ]
-    }
+  "ints": [1, 2, 3]
 }
diff --git a/test/toml/valid/arrays-hetergeneous.json b/test/toml/valid/arrays-hetergeneous.json
@@ -1,19 +1,3 @@
 {
-    "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.1"},
-                {"type": "float", "value": "2.1"}
-            ]}
-        ]
-    }
+  "mixed": [[1, 2], ["a", "b"], [1.1, 2.1]]
 }
diff --git a/test/toml/valid/arrays-nested.json b/test/toml/valid/arrays-nested.json
@@ -1,13 +1,3 @@
 {
-    "nest": {
-        "type": "array",
-        "value": [
-            {"type": "array", "value": [
-                {"type": "string", "value": "a"}
-            ]},
-            {"type": "array", "value": [
-                {"type": "string", "value": "b"}
-            ]}
-        ]
-    }
+  "nest": [["a"], ["b"]]
 }
diff --git a/test/toml/valid/arrays.json b/test/toml/valid/arrays.json
@@ -1,34 +1,6 @@
 {
-    "ints": {
-        "type": "array",
-        "value": [
-            {"type": "integer", "value": "1"},
-            {"type": "integer", "value": "2"},
-            {"type": "integer", "value": "3"}
-        ]
-    },
-    "floats": {
-        "type": "array",
-        "value": [
-            {"type": "float", "value": "1.1"},
-            {"type": "float", "value": "2.1"},
-            {"type": "float", "value": "3.1"}
-        ]
-    },
-    "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"}
-        ]
-    }
+  "ints": [1, 2, 3],
+  "floats": [1.1, 2.1, 3.1],
+  "strings": ["a", "b", "c"],
+  "dates": ["1987-07-05T17:45:00Z", "1979-05-27T07:32:00Z", "2006-06-01T11:00:00Z"]
 }
diff --git a/test/toml/valid/bool.json b/test/toml/valid/bool.json
@@ -1,4 +1,4 @@
 {
-    "f": {"type": "bool", "value": "false"},
-    "t": {"type": "bool", "value": "true"}
+  "f": false,
+  "t": true
 }
diff --git a/test/toml/valid/comments-everywhere.json b/test/toml/valid/comments-everywhere.json
@@ -1,12 +1,6 @@
 {
-    "group": {
-        "answer": {"type": "integer", "value": "42"},
-        "more": {
-            "type": "array",
-            "value": [
-                {"type": "integer", "value": "42"},
-                {"type": "integer", "value": "42"}
-            ]
-        }
-    }
+  "group": {
+    "answer": 42,
+    "more": [42, 42]
+  }
 }
diff --git a/test/toml/valid/datetime.json b/test/toml/valid/datetime.json
@@ -1,3 +1,3 @@
 {
-    "bestdayever": {"type": "datetime", "value": "1987-07-05T17:45:00Z"}
+    "bestdayever": "1987-07-05T17:45:00Z"
 }
diff --git a/test/toml/valid/example.json b/test/toml/valid/example.json
@@ -1,14 +1,7 @@
 {
-  "best-day-ever": {"type": "datetime", "value": "1987-07-05T17:45:00Z"},
+  "best-day-ever": "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"}
-      ]
-    }
+    "boring": false,
+    "perfection": [6, 28, 496]
   }
 }
diff --git a/test/toml/valid/float.json b/test/toml/valid/float.json
@@ -1,4 +1,4 @@
 {
-    "pi": {"type": "float", "value": "3.14"},
-    "negpi": {"type": "float", "value": "-3.14"}
+  "pi": 3.14,
+  "negpi": -3.14
 }
diff --git a/test/toml/valid/implicit-and-explicit-after.json b/test/toml/valid/implicit-and-explicit-after.json
@@ -1,10 +1,10 @@
 {
-    "a": {
-        "better": {"type": "integer", "value": "43"},
-        "b": {
-            "c": {
-                "answer": {"type": "integer", "value": "42"}
-            }
-        }
+  "a": {
+  "better": 43,
+    "b": {
+      "c": {
+        "answer": 42
+      }
     }
+  }
 }
diff --git a/test/toml/valid/implicit-and-explicit-before.json b/test/toml/valid/implicit-and-explicit-before.json
@@ -1,10 +1,10 @@
 {
-    "a": {
-        "better": {"type": "integer", "value": "43"},
-        "b": {
-            "c": {
-                "answer": {"type": "integer", "value": "42"}
-            }
-        }
+  "a": {
+    "better": 43,
+    "b": {
+      "c": {
+        "answer": 42
+      }
     }
+  }
 }
diff --git a/test/toml/valid/implicit-groups.json b/test/toml/valid/implicit-groups.json
@@ -1,9 +1,9 @@
 {
-    "a": {
-        "b": {
-            "c": {
-                "answer": {"type": "integer", "value": "42"}
-            }
-        }
+  "a": {
+    "b": {
+      "c": {
+        "answer": 42
+      }
     }
+  }
 }
diff --git a/test/toml/valid/integer.json b/test/toml/valid/integer.json
@@ -1,4 +1,4 @@
 {
-    "answer": {"type": "integer", "value": "42"},
-    "neganswer": {"type": "integer", "value": "-42"}
+  "answer": 42,
+  "neganswer": -42
 }
diff --git a/test/toml/valid/key-equals-nospace.json b/test/toml/valid/key-equals-nospace.json
@@ -1,3 +1,3 @@
 {
-    "answer": {"type": "integer", "value": "42"}
+  "answer": 42
 }
diff --git a/test/toml/valid/key-space.json b/test/toml/valid/key-space.json
@@ -1,3 +1,3 @@
 {
-    "a b": {"type": "integer", "value": "1"}
+  "a b": 1
 }
diff --git a/test/toml/valid/key-special-chars.json b/test/toml/valid/key-special-chars.json
@@ -1,5 +1,3 @@
 {
-    "~!@$^&*()_+-`1234567890[]|/?><.,;:'": {
-        "type": "integer", "value": "1"
-    }
+  "~!@$^&*()_+-`1234567890[]|/?><.,;:'": 1
 }
diff --git a/test/toml/valid/long-float.json b/test/toml/valid/long-float.json
@@ -1,4 +1,4 @@
 {
-    "longpi": {"type": "float", "value": "3.141592653589793"},
-    "neglongpi": {"type": "float", "value": "-3.141592653589793"}
+  "longpi": 3.141592653589793,
+  "neglongpi": -3.141592653589793
 }
diff --git a/test/toml/valid/long-integer.json b/test/toml/valid/long-integer.json
@@ -1,4 +1,4 @@
 {
-    "answer": {"type": "integer", "value": "9223372036854775807"},
-    "neganswer": {"type": "integer", "value": "-9223372036854775808"}
+  "answer": 9223372036854775807,
+  "neganswer": -9223372036854775808
 }
diff --git a/test/toml/valid/multiline-string.json b/test/toml/valid/multiline-string.json
@@ -1,30 +1,9 @@
 {
-    "multiline_empty_one": {
-        "type": "string",
-        "value": ""
-    },
-    "multiline_empty_two": {
-        "type": "string",
-        "value": ""
-    },
-    "multiline_empty_three": {
-        "type": "string",
-        "value": ""
-    },
-    "multiline_empty_four": {
-        "type": "string",
-        "value": ""
-    },
-    "equivalent_one": {
-        "type": "string",
-        "value": "The quick brown fox jumps over the lazy dog."
-    },
-    "equivalent_two": {
-        "type": "string",
-        "value": "The quick brown fox jumps over the lazy dog."
-    },
-    "equivalent_three": {
-        "type": "string",
-        "value": "The quick brown fox jumps over the lazy dog."
-    }
+  "multiline_empty_one": "",
+  "multiline_empty_two": "",
+  "multiline_empty_three": "",
+  "multiline_empty_four": "",
+  "equivalent_one": "The quick brown fox jumps over the lazy dog.",
+  "equivalent_two": "The quick brown fox jumps over the lazy dog.",
+  "equivalent_three": "The quick brown fox jumps over the lazy dog."
 }
diff --git a/test/toml/valid/raw-multiline-string.json b/test/toml/valid/raw-multiline-string.json
@@ -1,14 +1,5 @@
 {
-    "oneline": {
-        "type": "string",
-        "value": "This string has a ' quote character."
-    },
-    "firstnl": {
-        "type": "string",
-        "value": "This string has a ' quote character."
-    },
-    "multiline": {
-        "type": "string",
-        "value": "This string\nhas ' a quote character\nand more than\none newline\nin it."
-    }
+  "oneline": "This string has a ' quote character.",
+  "firstnl": "This string has a ' quote character.",
+  "multiline": "This string\nhas ' a quote character\nand more than\none newline\nin it."
 }
diff --git a/test/toml/valid/raw-string.json b/test/toml/valid/raw-string.json
@@ -1,30 +1,9 @@
 {
-    "backspace": {
-        "type": "string",
-        "value": "This string has a \\b backspace character."
-    },
-    "tab": {
-        "type": "string",
-        "value": "This string has a \\t tab character."
-    },
-    "newline": {
-        "type": "string",
-        "value": "This string has a \\n new line character."
-    },
-    "formfeed": {
-        "type": "string",
-        "value": "This string has a \\f form feed character."
-    },
-    "carriage": {
-        "type": "string",
-        "value": "This string has a \\r carriage return character."
-    },
-    "slash": {
-        "type": "string",
-        "value": "This string has a \\/ slash character."
-    },
-    "backslash": {
-        "type": "string",
-        "value": "This string has a \\\\ backslash character."
-    }
+  "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.",
+  "slash": "This string has a \\/ slash character.",
+  "backslash": "This string has a \\\\ backslash character."
 }
diff --git a/test/toml/valid/string-empty.json b/test/toml/valid/string-empty.json
@@ -1,6 +1,3 @@
 {
-    "answer": {
-        "type": "string",
-        "value": ""
-    }
+  "answer": ""
 }