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

Update valve api and test

Browse Source
This commit is contained in:
wqy
2022-09-25 01:27:35 +08:00
parent dce54171fb
commit 3de39975ca
5 changed files with 176 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
test_tjnetwork.py
View File

@@ -142,17 +142,17 @@ class TestApi:
nodes = get_nodes(p)
assert len(nodes) == 0
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']
self.leave(p)
def test_reservoir(self):
@@ -544,7 +544,7 @@ class TestApi:
self.leave(p)
'''
def test_valve(self):
p = "test_valve"
self.enter(p)
@@ -581,68 +581,68 @@ class TestApi:
valves = get_links(p)
assert len(valves) == 1
assert get_valve_properties(p, 'v1')['node1'] == 'j1'
assert get_valve_properties(p, 'v1')['node2'] == 'j2'
assert get_valve_properties(p, 'v1')['diameter'] == 10.0
assert get_valve_properties(p, 'v1')['type'] == VALVES_TYPE_FCV
assert get_valve_properties(p, 'v1')['setting'] == 10.0
assert get_valve_properties(p, 'v1')['minor_loss'] == 10.0
assert get_valve(p, 'v1')['node1'] == 'j1'
assert get_valve(p, 'v1')['node2'] == 'j2'
assert get_valve(p, 'v1')['diameter'] == 10.0
assert get_valve(p, 'v1')['type'] == VALVES_TYPE_FCV
assert get_valve(p, 'v1')['setting'] == 10.0
assert get_valve(p, 'v1')['minor_loss'] == 10.0
change_set = set_valve_node1(p, 'v1', 'j2')
change_set = set_valve(p, 'v1', {'node1': 'j2'})
assert len(change_set.operations) == 0
change_set = set_valve_node2(p, 'v1', 'j1')
change_set = set_valve(p, 'v1', {'node2': 'j1'})
assert len(change_set.operations) == 0
change_set = set_valve_type(p, 'v1', "XXX")
change_set = set_valve(p, 'v1', {'type': "XXX"})
assert len(change_set.operations) == 0
change_set = set_valve_node1(p, 'v1', 'j3')
change_set = set_valve(p, 'v1', {'node1': 'j3'})
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == VALVE
assert change_set.operations[0]['id'] == 'v1'
assert change_set.operations[0]['properties'] == 'node1'
assert change_set.operations[0]['properties'] == ['node1']
change_set = set_valve_node2(p, 'v1', 'j4')
change_set = set_valve(p, 'v1', {'node2': 'j4'})
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == VALVE
assert change_set.operations[0]['id'] == 'v1'
assert change_set.operations[0]['properties'] == 'node2'
assert change_set.operations[0]['properties'] == ['node2']
change_set = set_valve_diameter(p, 'v1', 100.0)
change_set = set_valve(p, 'v1', {'diameter': 100.0})
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == VALVE
assert change_set.operations[0]['id'] == 'v1'
assert change_set.operations[0]['properties'] == 'diameter'
assert change_set.operations[0]['properties'] == ['diameter']
change_set = set_valve_type(p, 'v1', VALVES_TYPE_GPV)
change_set = set_valve(p, 'v1', {'type': VALVES_TYPE_GPV})
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == VALVE
assert change_set.operations[0]['id'] == 'v1'
assert change_set.operations[0]['properties'] == 'type'
assert change_set.operations[0]['properties'] == ['type']
change_set = set_valve_setting(p, 'v1', 100.0)
change_set = set_valve(p, 'v1', {'setting': 100.0})
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == VALVE
assert change_set.operations[0]['id'] == 'v1'
assert change_set.operations[0]['properties'] == 'setting'
assert change_set.operations[0]['properties'] == ['setting']
change_set = set_valve_minor_loss(p, 'v1', 100.0)
change_set = set_valve(p, 'v1', {'minor_loss': 100.0})
assert len(change_set.operations) == 1
assert change_set.operations[0]['operation'] == 'update'
assert change_set.operations[0]['type'] == VALVE
assert change_set.operations[0]['id'] == 'v1'
assert change_set.operations[0]['properties'] == 'minor_loss'
assert change_set.operations[0]['properties'] == ['minor_loss']
assert get_valve_properties(p, 'v1')['node1'] == 'j3'
assert get_valve_properties(p, 'v1')['node2'] == 'j4'
assert get_valve_properties(p, 'v1')['diameter'] == 100.0
assert get_valve_properties(p, 'v1')['type'] == VALVES_TYPE_GPV
assert get_valve_properties(p, 'v1')['setting'] == 100.0
assert get_valve_properties(p, 'v1')['minor_loss'] == 100.0
assert get_valve(p, 'v1')['node1'] == 'j3'
assert get_valve(p, 'v1')['node2'] == 'j4'
assert get_valve(p, 'v1')['diameter'] == 100.0
assert get_valve(p, 'v1')['type'] == VALVES_TYPE_GPV
assert get_valve(p, 'v1')['setting'] == 100.0
assert get_valve(p, 'v1')['minor_loss'] == 100.0
change_set = add_valve(p, 'v2', 'j1', 'j2', 10.0, VALVES_TYPE_FCV, 10.0, 10.0)
assert len(change_set.operations) == 1
@@ -674,6 +674,7 @@ class TestApi:
assert change_set.operations[0]['id'] == "v2"
self.leave(p)
'''
if __name__ == '__main__':
pytest.main()