luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix d2oracle test

Browse source
This commit is contained in:
Alexander Wang 2023-02-19 08:22:20 -08:00
parent f1ac119c09
commit 1a11eb00cb
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
3 changed files with 121 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
d2oracle/edit_test.go
View file

@ -2220,7 +2220,7 @@ a.b.c: {
`, `,
}, },
{ {
name: "near", name: "invalid-near",
text: `x: { text: `x: {
near: y near: y
@ -2234,6 +2234,33 @@ y
near: x.y near: x.y
y y
} }
`,
expErr: `failed to move: "y" to "x.y": failed to recompile:
x: {
near: x.y
y
}
d2/testdata/d2oracle/TestMove/invalid-near.d2:2:9: near keys cannot be set to an descendant`,
},
{
name: "near",
text: `x: {
near: y
}
a
y
`,
key: `y`,
newKey: `a.y`,
exp: `x: {
near: a.y
}
a: {
y
}
`, `,
}, },
{ {

4
testdata/d2oracle/TestMove/invalid-near.exp.json generated vendored Normal file
View file

@ -0,0 +1,4 @@
{
"graph": null,
"err": "failed to move: \"y\" to \"x.y\": failed to recompile:\nx: {\n near: x.y\n y\n}\n\nd2/testdata/d2oracle/TestMove/invalid-near.d2:2:9: near keys cannot be set to an descendant"
}

100
testdata/d2oracle/TestMove/near.exp.json generated vendored
View file

@ -2,11 +2,11 @@
"graph": { "graph": {
"name": "", "name": "",
"ast": { "ast": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-4:0:23", "range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-6:0:30",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-3:1:22", "range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-2:1:18",
"key": { "key": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-0:1:1", "range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-0:1:1",
"path": [ "path": [
@ -26,7 +26,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,0:3:3-3:0:21", "range": "d2/testdata/d2oracle/TestMove/near.d2,0:3:3-2:0:17",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -53,8 +53,13 @@
"range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16", "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16",
"value": [ "value": [
{ {
"string": "x.y", "string": "a.y",
"raw_string": "x.y" "raw_string": "a.y"
}
]
}
}
}
} }
] ]
} }
@ -63,13 +68,37 @@
}, },
{ {
"map_key": { "map_key": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,2:2:19-2:3:20", "range": "d2/testdata/d2oracle/TestMove/near.d2,3:0:19-5:1:29",
"key": { "key": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,2:2:19-2:3:20", "range": "d2/testdata/d2oracle/TestMove/near.d2,3:0:19-3:1:20",
"path": [ "path": [
{ {
"unquoted_string": { "unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,2:2:19-2:3:20", "range": "d2/testdata/d2oracle/TestMove/near.d2,3:0:19-3:1:20",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,3:3:22-5:0:28",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,4:2:26-4:3:27",
"key": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,4:2:26-4:3:27",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,4:2:26-4:3:27",
"value": [ "value": [
{ {
"string": "y", "string": "y",
@ -160,8 +189,8 @@
"range": ",0:0:0-0:1:1", "range": ",0:0:0-0:1:1",
"value": [ "value": [
{ {
"string": "x", "string": "a",
"raw_string": "x" "raw_string": "a"
} }
] ]
} }
@ -191,6 +220,53 @@
}, },
"zIndex": 0 "zIndex": 0
}, },
{
"id": "a",
"id_val": "a",
"label_dimensions": {
"width": 0,
"height": 0
},
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,3:0:19-3:1:20",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,3:0:19-3:1:20",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "a"
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
},
{ {
"id": "y", "id": "y",
"id_val": "y", "id_val": "y",
@ -201,11 +277,11 @@
"references": [ "references": [
{ {
"key": { "key": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,2:2:19-2:3:20", "range": "d2/testdata/d2oracle/TestMove/near.d2,4:2:26-4:3:27",
"path": [ "path": [
{ {
"unquoted_string": { "unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/near.d2,2:2:19-2:3:20", "range": "d2/testdata/d2oracle/TestMove/near.d2,4:2:26-4:3:27",
"value": [ "value": [
{ {
"string": "y", "string": "y",