OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine node getter api

Browse Source
This commit is contained in:
wqy
2022-09-22 21:41:26 +08:00
parent 345ce9a98d
commit 90f02752e9
6 changed files with 126 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
test_tjnetwork.py
View File

@@ -74,6 +74,7 @@ class TestApi:
self.leave(p)
def test_junction(self):
p = "test_junction"
self.enter(p)
@@ -83,21 +84,22 @@ class TestApi:
assert change_set.operations[0]['operation'] == 'add'
assert change_set.operations[0]['type'] == JUNCTION
assert change_set.operations[0]['id'] == "j0"
coord = get_junction_coord(p, 'j0')
coord = get_junction_properties(p, 'j0')['coord']
assert coord['x'] == 0.0
assert coord['y'] == 10.0
z = get_junction_elevation(p, 'j0')
z = get_junction_properties(p, 'j0')['elevation']
assert z == 20.0
assert get_junction_demand(p, 'j') == None
assert get_junction_demand(p, 'j0') == "NULL"
assert get_junction_properties(p, 'j') == None
assert get_junction_properties(p, 'j0')['demand'] == None
assert get_junction_properties(p, 'j0')['demand'] == None
change_set = set_junction_demand(p, 'j0', 100.0)
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == JUNCTION
assert change_set.operations[0]['id'] == 'j0'
assert change_set.operations[0]['property'] == 'demand'
assert get_junction_demand(p, 'j0') == 100.0
assert get_junction_properties(p, 'j0')['demand'] == 100.0
# TODO: pattern
@@ -137,8 +139,19 @@ class TestApi:
nodes = get_nodes(p)
assert len(nodes) == 0
add_junction(p, 'j1', 0.0, 0.0, 0.0)
add_junction(p, 'j2', 10.0, 10.0, 10.0)
add_junction(p, 'j3', 10.0, 10.0, 10.0)
add_pipe(p, 'p1', 'j1', 'j2')
add_pump(p, 'p2', 'j1', 'j2')
add_valve(p, 'v1', 'j2', 'j3')
assert get_junction_properties(p, 'j1')['links'] == ['p1', 'p2']
assert get_junction_properties(p, 'j2')['links'] == ['p1', 'p2', 'v1']
assert get_junction_properties(p, 'j3')['links'] == ['v1']
self.leave(p)
def test_reservoir(self):
p = "test_reservoir"
self.enter(p)
@@ -152,19 +165,21 @@ class TestApi:
change_set = add_reservoir(p, "r0", 0.0, 10.0, 20.0)
assert len(change_set.operations) == 0
assert get_reservoir_head(p, 'r0') == 20.0
assert get_reservoir_properties(p, 'r0')['head'] == 20.0
assert get_reservoir_properties(p, 'r0')['head'] == 20.0
change_set = set_reservoir_head(p, 'r0', 100.0)
assert change_set.operations[0]['type'] == RESERVOIR
assert change_set.operations[0]['id'] == 'r0'
assert change_set.operations[0]['property'] == 'head'
assert get_reservoir_head(p, 'r0') == 100.0
assert get_reservoir_properties(p, 'r0')['head'] == 100.0
assert get_reservoir_coord(p, 'r0') == { 'x': 0.0, 'y': 10.0 }
assert get_reservoir_properties(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 }
assert get_reservoir_properties(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 }
change_set = set_reservoir_coord(p, 'r0', 100.0, 200.0)
assert change_set.operations[0]['type'] == RESERVOIR
assert change_set.operations[0]['id'] == 'r0'
assert change_set.operations[0]['property'] == 'coord'
assert get_reservoir_coord(p, 'r0') == { 'x': 100.0, 'y': 200.0 }
assert get_reservoir_properties(p, 'r0')['coord'] == { 'x': 100.0, 'y': 200.0 }
# TODO: pattern
@@ -179,6 +194,7 @@ class TestApi:
self.leave(p)
def test_tank(self):
p = "test_tank"
@@ -204,64 +220,64 @@ class TestApi:
assert tanks[0] == 't0'
assert tanks[1] == 't1'
assert get_tank_elevation(p, 't0') == 10.0
assert get_tank_properties(p, 't0')['elevation'] == 10.0
change_set = set_tank_elevation(p, 't0', 100.0)
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == TANK
assert change_set.operations[0]['id'] == "t0"
assert change_set.operations[0]['property'] == 'elevation'
assert get_tank_elevation(p, 't0') == 100.0
assert get_tank_properties(p, 't0')['elevation'] == 100.0
assert get_tank_init_level(p, 't0') == 10.0
assert get_tank_properties(p, 't0')['init_level'] == 10.0
change_set = set_tank_init_level(p, 't0', 100.0)
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == TANK
assert change_set.operations[0]['id'] == "t0"
assert change_set.operations[0]['property'] == 'init_level'
assert get_tank_init_level(p, 't0') == 100.0
assert get_tank_properties(p, 't0')['init_level'] == 100.0
assert get_tank_min_level(p, 't0') == 10.0
assert get_tank_properties(p, 't0')['min_level'] == 10.0
change_set = set_tank_min_level(p, 't0', 100.0)
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == TANK
assert change_set.operations[0]['id'] == "t0"
assert change_set.operations[0]['property'] == 'min_level'
assert get_tank_min_level(p, 't0') == 100.0
assert get_tank_properties(p, 't0')['min_level'] == 100.0
assert get_tank_max_level(p, 't0') == 10.0
assert get_tank_properties(p, 't0')['max_level'] == 10.0
change_set = set_tank_max_level(p, 't0', 100.0)
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == TANK
assert change_set.operations[0]['id'] == "t0"
assert change_set.operations[0]['property'] == 'max_level'
assert get_tank_max_level(p, 't0') == 100.0
assert get_tank_properties(p, 't0')['max_level'] == 100.0
assert get_tank_diameter(p, 't0') == 10.0
assert get_tank_properties(p, 't0')['diameter'] == 10.0
change_set = set_tank_diameter(p, 't0', 100.0)
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == TANK
assert change_set.operations[0]['id'] == "t0"
assert change_set.operations[0]['property'] == 'diameter'
assert get_tank_diameter(p, 't0') == 100.0
assert get_tank_properties(p, 't0')['diameter'] == 100.0
assert get_tank_min_vol(p, 't0') == 10.0
assert get_tank_properties(p, 't0')['min_vol'] == 10.0
change_set = set_tank_min_vol(p, 't0', 100.0)
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == TANK
assert change_set.operations[0]['id'] == "t0"
assert change_set.operations[0]['property'] == 'min_vol'
assert get_tank_min_vol(p, 't0') == 100.0
assert get_tank_properties(p, 't0')['min_vol'] == 100.0
# TODO: vol_curve
assert get_tank_overflow(p, 't') == None
assert get_tank_overflow(p, 't0') == 'NULL'
assert get_tank_properties(p, 't') == None
assert get_tank_properties(p, 't0')['overflow'] == None
change_set = set_tank_overflow(p, 't0', "XXX")
assert len(change_set.operations) == 0
change_set = set_tank_overflow(p, 't0', OVERFLOW_YES)
@@ -270,7 +286,7 @@ class TestApi:
assert change_set.operations[0]['type'] == TANK
assert change_set.operations[0]['id'] == "t0"
assert change_set.operations[0]['property'] == 'overflow'
assert get_tank_overflow(p, 't0') == OVERFLOW_YES
assert get_tank_properties(p, 't0')['overflow'] == OVERFLOW_YES
change_set = delete_tank(p, "t0")
assert len(change_set.operations) == 1
@@ -295,6 +311,7 @@ class TestApi:
self.leave(p)
def test_pipe(self):
p = "test_pipe"
self.enter(p)
@@ -434,6 +451,7 @@ class TestApi:
self.leave(p)
def test_pump(self):
p = "test_pump"
self.enter(p)
@@ -523,6 +541,7 @@ class TestApi:
self.leave(p)
def test_valve(self):
p = "test_valve"
self.enter(p)