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

Update reservoir api and test

Browse Source
This commit is contained in:
wqy
2022-09-24 23:51:00 +08:00
parent baeef6c859
commit 277f5a3501
5 changed files with 134 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test_tjnetwork.py
View File

@@ -144,21 +144,17 @@ class TestApi:
self.leave(p)
'''
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(p, 'j1')['links'] == ['p1', 'p2']
assert get_junction(p, 'j2')['links'] == ['p1', 'p2', 'v1']
assert get_junction(p, 'j3')['links'] == ['v1']
'''
# 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(p, 'j1')['links'] == ['p1', 'p2']
# assert get_junction(p, 'j2')['links'] == ['p1', 'p2', 'v1']
# assert get_junction(p, 'j3')['links'] == ['v1']
'''
def test_reservoir(self):
p = "test_reservoir"
self.enter(p)
@@ -172,21 +168,21 @@ class TestApi:
change_set = add_reservoir(p, "r0", 0.0, 10.0, 20.0)
assert len(change_set.operations) == 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 get_reservoir(p, 'r0')['head'] == 20.0
assert get_reservoir(p, 'r0')['head'] == 20.0
change_set = set_reservoir(p, 'r0', {'head': 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_properties(p, 'r0')['head'] == 100.0
assert 'head' in change_set.operations[0]['properties']
assert get_reservoir(p, 'r0')['head'] == 100.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 get_reservoir(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 }
assert get_reservoir(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 }
change_set = set_reservoir(p, 'r0', {'coord': {'x': 100.0, 'y': 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_properties(p, 'r0')['coord'] == { 'x': 100.0, 'y': 200.0 }
assert 'coord' in change_set.operations[0]['properties']
assert get_reservoir(p, 'r0')['coord'] == { 'x': 100.0, 'y': 200.0 }
# TODO: pattern
@@ -201,7 +197,7 @@ class TestApi:
self.leave(p)
'''
def test_tank(self):
p = "test_tank"