Skip to content

Commit d97def5

Browse files
arp242arp242
committed
Update toml-test
1 parent d10101f commit d97def5

File tree

193 files changed

+1398
-3578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+1398
-3578
lines changed

‎internal/toml-test/runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ type Test struct {
101101

102102
Skipped bool // Skipped this test?
103103
Failure string // Failure message.
104-
Key string // TOML key the failure occurred on; may be blank.
104+
Key string // TOML key the failure occured on; may be blank.
105105
Encoder bool // Encoder test?
106106
Input string // The test case that we sent to the external program.
107107
Output string // Output from the external program.

‎internal/toml-test/tests/valid/array/array-subtables.json

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
{
2-
"arr": [
3-
{
4-
"subtab": {
5-
"val": {
6-
"type": "integer",
7-
"value": "1"
2+
"arr": [
3+
{
4+
"subtab": {
5+
"val": {"type": "integer", "value": "1"}
6+
}
7+
},
8+
{
9+
"subtab": {
10+
"val": {"type": "integer", "value": "2"}
11+
}
812
}
9-
}
10-
},
11-
{
12-
"subtab": {
13-
"val": {
14-
"type": "integer",
15-
"value": "2"
16-
}
17-
}
18-
}
19-
]
13+
]
2014
}

‎internal/toml-test/tests/valid/array/array.json

Lines changed: 24 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,26 @@
11
{
2-
"comments": [
3-
{
4-
"type": "integer",
5-
"value": "1"
6-
},
7-
{
8-
"type": "integer",
9-
"value": "2"
10-
}
11-
],
12-
"dates": [
13-
{
14-
"type": "datetime",
15-
"value": "1987-07-05T17:45:00Z"
16-
},
17-
{
18-
"type": "datetime",
19-
"value": "1979-05-27T07:32:00Z"
20-
},
21-
{
22-
"type": "datetime",
23-
"value": "2006-06-01T11:00:00Z"
24-
}
25-
],
26-
"floats": [
27-
{
28-
"type": "float",
29-
"value": "1.1"
30-
},
31-
{
32-
"type": "float",
33-
"value": "2.1"
34-
},
35-
{
36-
"type": "float",
37-
"value": "3.1"
38-
}
39-
],
40-
"ints": [
41-
{
42-
"type": "integer",
43-
"value": "1"
44-
},
45-
{
46-
"type": "integer",
47-
"value": "2"
48-
},
49-
{
50-
"type": "integer",
51-
"value": "3"
52-
}
53-
],
54-
"strings": [
55-
{
56-
"type": "string",
57-
"value": "a"
58-
},
59-
{
60-
"type": "string",
61-
"value": "b"
62-
},
63-
{
64-
"type": "string",
65-
"value": "c"
66-
}
67-
]
2+
"comments": [
3+
{"type": "integer", "value": "1"},
4+
{"type": "integer", "value": "2"}
5+
],
6+
"dates": [
7+
{"type": "datetime", "value": "1987-07-05T17:45:00Z"},
8+
{"type": "datetime", "value": "1979-05-27T07:32:00Z"},
9+
{"type": "datetime", "value": "2006-06-01T11:00:00Z"}
10+
],
11+
"floats": [
12+
{"type": "float", "value": "1.1"},
13+
{"type": "float", "value": "2.1"},
14+
{"type": "float", "value": "3.1"}
15+
],
16+
"ints": [
17+
{"type": "integer", "value": "1"},
18+
{"type": "integer", "value": "2"},
19+
{"type": "integer", "value": "3"}
20+
],
21+
"strings": [
22+
{"type": "string", "value": "a"},
23+
{"type": "string", "value": "b"},
24+
{"type": "string", "value": "c"}
25+
]
6826
}

‎internal/toml-test/tests/valid/array/bool.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
2-
"a": [
3-
{
4-
"type": "bool",
5-
"value": "true"
6-
},
7-
{
8-
"type": "bool",
9-
"value": "false"
10-
}
11-
]
2+
"a": [
3+
{"type": "bool", "value": "true"},
4+
{"type": "bool", "value": "false"}
5+
]
126
}

‎internal/toml-test/tests/valid/array/empty.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
{
2-
"thevoid": [
3-
[
4-
[
5-
[
6-
[]
7-
]
8-
]
9-
]
10-
]
2+
"thevoid": [[[[[]]]]]
113
}

‎internal/toml-test/tests/valid/array/hetergeneous.json

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,16 @@
11
{
2-
"mixed": [
3-
[
4-
{
5-
"type": "integer",
6-
"value": "1"
7-
},
8-
{
9-
"type": "integer",
10-
"value": "2"
11-
}
12-
],
13-
[
14-
{
15-
"type": "string",
16-
"value": "a"
17-
},
18-
{
19-
"type": "string",
20-
"value": "b"
21-
}
22-
],
23-
[
24-
{
25-
"type": "float",
26-
"value": "1.1"
27-
},
28-
{
29-
"type": "float",
30-
"value": "2.1"
31-
}
2+
"mixed": [
3+
[
4+
{"type": "integer", "value": "1"},
5+
{"type": "integer", "value": "2"}
6+
],
7+
[
8+
{"type": "string", "value": "a"},
9+
{"type": "string", "value": "b"}
10+
],
11+
[
12+
{"type": "float", "value": "1.1"},
13+
{"type": "float", "value": "2.1"}
14+
]
3215
]
33-
]
3416
}

‎internal/toml-test/tests/valid/array/mixed-int-array.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
{
2-
"arrays-and-ints": [
3-
{
4-
"type": "integer",
5-
"value": "1"
6-
},
7-
[
8-
{
9-
"type": "string",
10-
"value": "Arrays are not integers."
11-
}
2+
"arrays-and-ints": [
3+
{"type": "integer", "value": "1"},
4+
[{"type": "string", "value": "Arrays are not integers."}]
125
]
13-
]
146
}

‎internal/toml-test/tests/valid/array/mixed-int-float.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
2-
"ints-and-floats": [
3-
{
4-
"type": "integer",
5-
"value": "1"
6-
},
7-
{
8-
"type": "float",
9-
"value": "1.1"
10-
}
11-
]
2+
"ints-and-floats": [
3+
{"type": "integer", "value": "1"},
4+
{"type": "float", "value": "1.1"}
5+
]
126
}

‎internal/toml-test/tests/valid/array/mixed-int-string.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
2-
"strings-and-ints": [
3-
{
4-
"type": "string",
5-
"value": "hi"
6-
},
7-
{
8-
"type": "integer",
9-
"value": "42"
10-
}
11-
]
2+
"strings-and-ints": [
3+
{"type": "string", "value": "hi"},
4+
{"type": "integer", "value": "42"}
5+
]
126
}

‎internal/toml-test/tests/valid/array/mixed-string-table.json

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
11
{
2-
"contributors": [
3-
{
4-
"type": "string",
5-
"value": "Foo Bar \u003c[email protected]\u003e"
6-
},
7-
{
8-
"email": {
9-
"type": "string",
10-
"value": "[email protected]"
11-
},
12-
"name": {
13-
"type": "string",
14-
"value": "Baz Qux"
15-
},
16-
"url": {
17-
"type": "string",
18-
"value": "https://example.com/bazqux"
19-
}
20-
}
21-
],
22-
"mixed": [
23-
{
24-
"k": {
25-
"type": "string",
26-
"value": "a"
27-
}
28-
},
29-
{
30-
"type": "string",
31-
"value": "b"
32-
},
33-
{
34-
"type": "integer",
35-
"value": "1"
36-
}
37-
]
2+
"contributors": [
3+
{"type": "string", "value": "Foo Bar \u003c[email protected]\u003e"},
4+
{
5+
"email": {"type": "string", "value": "[email protected]"},
6+
"name": {"type": "string", "value": "Baz Qux"},
7+
"url": {"type": "string", "value": "https://example.com/bazqux"}
8+
}
9+
],
10+
"mixed": [
11+
{
12+
"k": {"type": "string", "value": "a"}
13+
},
14+
{"type": "string", "value": "b"},
15+
{"type": "integer", "value": "1"}
16+
]
3817
}

‎internal/toml-test/tests/valid/array/nested-double.json

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
11
{
2-
"nest": [
3-
[
4-
[
5-
{
6-
"type": "string",
7-
"value": "a"
8-
}
9-
],
10-
[
11-
{
12-
"type": "integer",
13-
"value": "1"
14-
},
15-
{
16-
"type": "integer",
17-
"value": "2"
18-
},
2+
"nest": [[
3+
[{"type": "string", "value": "a"}],
194
[
20-
{
21-
"type": "integer",
22-
"value": "3"
23-
}
5+
{"type": "integer", "value": "1"},
6+
{"type": "integer", "value": "2"},
7+
[{"type": "integer", "value": "3"}]
248
]
25-
]
26-
]
27-
]
9+
]]
2810
}

‎internal/toml-test/tests/valid/array/nested-inline-table.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"a": [
3-
{
4-
"b": {}
5-
}
6-
]
2+
"a": [{
3+
"b": {}
4+
}]
75
}

‎internal/toml-test/tests/valid/array/nested.json

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
{
2-
"nest": [
3-
[
4-
{
5-
"type": "string",
6-
"value": "a"
7-
}
8-
],
9-
[
10-
{
11-
"type": "string",
12-
"value": "b"
13-
}
2+
"nest": [
3+
[{"type": "string", "value": "a"}],
4+
[{"type": "string", "value": "b"}]
145
]
15-
]
166
}

0 commit comments

Comments
 (0)