Skip to content

Commit 48e800f

Browse files
Merge pull request #13 from Geode-solutions/feat/unit_tests
Feat/unit tests
2 parents ea4cf8b + b2bbc8c commit 48e800f

33 files changed

+427
-211
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ env/
44
venv/
55
.vscode/
66
__pycache__/
7+
.env
78
data/
89
/node_modules
9-
schemas.json
10+
latest_logs
11+
schemas.json

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
"files": [
3636
"schemas.json"
3737
]
38-
}
38+
}

src/opengeodeweb_viewer/config.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import os
2+
from sys import platform
3+
4+
5+
def default_config():
6+
os.environ["HOST"] = "0.0.0.0"
7+
os.environ["PORT"] = "1234"
8+
9+
10+
def prod_config():
11+
default_config()
12+
os.environ["DATA_FOLDER_PATH"] = "/data/"
13+
14+
15+
def dev_config():
16+
default_config()
17+
if platform == "linux":
18+
os.environ["DATA_FOLDER_PATH"] = "/temp/OpenGeodeWeb_Data/"
19+
elif platform == "win32":
20+
os.environ["DATA_FOLDER_PATH"] = os.path.join(
21+
"C:/Users", os.getlogin(), "OpenGeodeWeb_Data"
22+
)
23+
if not os.path.exists(os.environ.get("DATA_FOLDER_PATH")):
24+
os.mkdir(os.environ.get("DATA_FOLDER_PATH"))
25+
26+
27+
def test_config():
28+
default_config()
29+
os.environ["DATA_FOLDER_PATH"] = os.path.join(
30+
os.path.dirname(__file__), "..", "..", "tests", "data"
31+
)

src/opengeodeweb_viewer/function.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,12 @@ def validate_schemas(params, schema):
66
try:
77
validate(instance=params, schema=schema)
88
except ValidationError as e:
9-
print(400, f"Validation error: {e.message}")
9+
print(f"Validation error: {e.message}", flush=True)
10+
raise Exception(
11+
{
12+
"code": 400,
13+
"route": schema["rpc"],
14+
"name": "Bad request",
15+
"description": e.message,
16+
}
17+
)
Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"rpc": "toggle_object_visibility",
2+
"rpc": "apply_textures",
33
"type": "object",
44
"properties": {
55
"id": {
@@ -8,14 +8,21 @@
88
"textures": {
99
"type": "array",
1010
"elements": {
11-
"type": "string"
11+
"type": "object",
12+
"properties": {
13+
"texture_name": {
14+
"type": "string"
15+
},
16+
"texture_file_name": {
17+
"type": "string"
18+
}
19+
},
20+
"required": ["texture_name", "texture_file_name"],
21+
"additionalProperties": false
1222
},
1323
"minItems": 1
1424
}
1525
},
16-
"required": [
17-
"id",
18-
"textures"
19-
],
26+
"required": ["id", "textures"],
2027
"additionalProperties": false
21-
}
28+
}

src/opengeodeweb_viewer/rpc/schemas/create_object_pipeline.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"type": "string"
1010
}
1111
},
12-
"required": [
13-
"id",
14-
"file_name"
15-
],
12+
"required": ["id", "file_name"],
1613
"additionalProperties": false
17-
}
14+
}

src/opengeodeweb_viewer/rpc/schemas/create_visualization.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"properties": {},
55
"required": [],
66
"additionalProperties": false
7-
}
7+
}

src/opengeodeweb_viewer/rpc/schemas/delete_object_pipeline.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"type": "string"
77
}
88
},
9-
"required": [
10-
"id"
11-
],
9+
"required": ["id"],
1210
"additionalProperties": false
13-
}
11+
}

src/opengeodeweb_viewer/rpc/schemas/get_point_position.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
"type": "object",
44
"properties": {
55
"x": {
6-
"type": "int16"
6+
"type": "integer"
77
},
88
"y": {
9-
"type": "int16"
9+
"type": "integer"
1010
}
1111
},
12-
"required": [
13-
"x",
14-
"y"
15-
],
12+
"required": ["x", "y"],
1613
"additionalProperties": false
17-
}
14+
}

src/opengeodeweb_viewer/rpc/schemas/point_size.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
"type": "string"
77
},
88
"size": {
9-
"type": "float64"
9+
"type": "number"
1010
}
1111
},
12-
"required": [
13-
"id",
14-
"size"
15-
],
12+
"required": ["id", "size"],
1613
"additionalProperties": false
17-
}
14+
}

src/opengeodeweb_viewer/rpc/schemas/reset_camera.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"properties": {},
55
"required": [],
66
"additionalProperties": false
7-
}
7+
}

src/opengeodeweb_viewer/rpc/schemas/set_color.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@
66
"type": "string"
77
},
88
"red": {
9-
"type": "uint8"
9+
"type": "integer",
10+
"minimum": 0,
11+
"maximum": 255
1012
},
1113
"green": {
12-
"type": "uint8"
14+
"type": "integer",
15+
"minimum": 0,
16+
"maximum": 255
1317
},
1418
"blue": {
15-
"type": "uint8"
19+
"type": "integer",
20+
"minimum": 0,
21+
"maximum": 255
1622
}
1723
},
18-
"required": [
19-
"id",
20-
"red",
21-
"green",
22-
"blue"
23-
],
24+
"required": ["id", "red", "green", "blue"],
2425
"additionalProperties": false
25-
}
26+
}

src/opengeodeweb_viewer/rpc/schemas/set_vertex_attribute.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"type": "string"
1010
}
1111
},
12-
"required": [
13-
"id",
14-
"name"
15-
],
12+
"required": ["id", "name"],
1613
"additionalProperties": false
17-
}
14+
}

src/opengeodeweb_viewer/rpc/schemas/toggle_edge_visibility.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"type": "boolean"
1010
}
1111
},
12-
"required": [
13-
"id",
14-
"visibility"
15-
],
12+
"required": ["id", "visibility"],
1613
"additionalProperties": false
17-
}
14+
}

src/opengeodeweb_viewer/rpc/schemas/toggle_object_visibility.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"type": "boolean"
1010
}
1111
},
12-
"required": [
13-
"id",
14-
"is_visible"
15-
],
12+
"required": ["id", "is_visible"],
1613
"additionalProperties": false
17-
}
14+
}

src/opengeodeweb_viewer/rpc/schemas/toggle_point_visibility.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"type": "boolean"
1010
}
1111
},
12-
"required": [
13-
"id",
14-
"visibility"
15-
],
12+
"required": ["id", "visibility"],
1613
"additionalProperties": false
17-
}
14+
}

src/opengeodeweb_viewer/rpc/schemas/update_data.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"type": "string"
77
}
88
},
9-
"required": [
10-
"id"
11-
],
9+
"required": ["id"],
1210
"additionalProperties": false
13-
}
11+
}

0 commit comments

Comments
 (0)