Skip to content

Commit 85b4c05

Browse files
hexaforcesoneda-yuya
hexaforce
and
soneda-yuya
authored
feat(server): update alias validation[VIZ-1535] [VIZ-1558] (#1580)
Co-authored-by: yuya-soneda <soneda.yuya@gmail.com>
1 parent 6fa63dd commit 85b4c05

Some content is hidden

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

45 files changed

+1445
-440
lines changed

‎server/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ schematyper:
111111
deep-copy:
112112
(cd pkg/property && deep-copy --type Initializer --pointer-receiver -o initializer_gen.go .)
113113

114+
error-msg:
115+
go generate ./pkg/i18n/...
116+
114117
# =======================
115118
# Tools
116119
# =======================

‎server/e2e/gql_custom_property_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestUpdateCustomProperties(t *testing.T) {
1717
"visualizer": "CESIUM",
1818
"coreSupport": true,
1919
})
20-
_, _, sId := createScene(e, pId)
20+
sId := createScene(e, pId)
2121
lId := addTestNLSLayerSimple(e, sId)
2222

2323
proId1 := RandomString(10)
@@ -114,7 +114,7 @@ func TestChangeCustomPropertyTitle(t *testing.T) {
114114
"visualizer": "CESIUM",
115115
"coreSupport": true,
116116
})
117-
_, _, sId := createScene(e, pId)
117+
sId := createScene(e, pId)
118118
lId := addTestNLSLayerSimple(e, sId)
119119

120120
// change XXX -> ZZZ
@@ -241,7 +241,7 @@ func TestRemoveCustomProperty(t *testing.T) {
241241
"visualizer": "CESIUM",
242242
"coreSupport": true,
243243
})
244-
_, _, sId := createScene(e, pId)
244+
sId := createScene(e, pId)
245245
lId := addTestNLSLayerSimple(e, sId)
246246

247247
// remove XXX

‎server/e2e/gql_featureCollection_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func TestFeatureCollectionCRUD(t *testing.T) {
183183
"visualizer": "CESIUM",
184184
"coreSupport": true,
185185
})
186-
_, _, sId := createScene(e, pId)
186+
sId := createScene(e, pId)
187187

188188
_, res := fetchSceneForNewLayers(e, sId)
189189
res.Object().

‎server/e2e/gql_nlslayer_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ func TestNLSLayerCRUD(t *testing.T) {
399399
Value("node").Object().
400400
Value("updatedAt").Raw().(string)
401401

402-
_, _, sId := createScene(e, pId)
402+
sId := createScene(e, pId)
403403

404404
_, res := fetchSceneForNewLayers(e, sId)
405405

@@ -792,7 +792,7 @@ func TestInfoboxBlocksCRUD(t *testing.T) {
792792
Value("node").Object().
793793
Value("updatedAt").Raw().(string)
794794

795-
_, _, sId := createScene(e, pId)
795+
sId := createScene(e, pId)
796796

797797
// fetch scene
798798
_, res := fetchSceneForNewLayers(e, sId)
@@ -863,7 +863,7 @@ func TestInfoboxProperty(t *testing.T) {
863863
"visualizer": "CESIUM",
864864
"coreSupport": true,
865865
})
866-
_, _, sId := createScene(e, pId)
866+
sId := createScene(e, pId)
867867

868868
// fetch scene
869869
_, res := fetchSceneForNewLayers(e, sId)
@@ -921,7 +921,7 @@ func TestPhotoOverlayProperty(t *testing.T) {
921921
"visualizer": "CESIUM",
922922
"coreSupport": true,
923923
})
924-
_, _, sId := createScene(e, pId)
924+
sId := createScene(e, pId)
925925

926926
// fetch scene
927927
_, res := fetchSceneForNewLayers(e, sId)
@@ -1002,7 +1002,7 @@ func TestCustomProperties(t *testing.T) {
10021002
Value("node").Object().
10031003
Value("updatedAt").Raw().(string)
10041004

1005-
_, _, sId := createScene(e, pId)
1005+
sId := createScene(e, pId)
10061006

10071007
_, res := fetchSceneForNewLayers(e, sId)
10081008
res.Object().

‎server/e2e/gql_project_export_import_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func compareValue(t *testing.T, key string, e, a *httpexpect.Value) {
9191
if isIgnore(`"id":`, expectedLine, actualLine) ||
9292
isIgnore(`"propertyId":`, expectedLine, actualLine) ||
9393
isIgnore(`"sceneId":`, expectedLine, actualLine) ||
94+
isIgnore(`"alias":`, expectedLine, actualLine) ||
9495
(isID(expectedLine) && isID(actualLine)) {
9596
continue
9697
}

‎server/e2e/gql_property_schema_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func TestPropertySchemaOrder(t *testing.T) {
1616
"visualizer": "CESIUM",
1717
"coreSupport": true,
1818
})
19-
_, _, sId := createScene(e, pId)
19+
sId := createScene(e, pId)
2020
res := getScene(e, sId, language.Und.String())
2121

2222
propID := res.Path("$.property.id").Raw().(string)

0 commit comments

Comments
 (0)