Update tank api and test
This commit is contained in:
wqy
@@ -101,7 +101,7 @@ class TestApi:
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == JUNCTION
|
||||
assert change_set.operations[0]['id'] == 'j0'
|
||||
assert 'demand' in change_set.operations[0]['properties']
|
||||
assert change_set.operations[0]['properties'] == ['demand']
|
||||
assert get_junction(p, 'j0')['demand'] == 100.0
|
||||
|
||||
# TODO: pattern
|
||||
@@ -173,7 +173,7 @@ class TestApi:
|
||||
change_set = set_reservoir(p, 'r0', {'head': 100.0})
|
||||
assert change_set.operations[0]['type'] == RESERVOIR
|
||||
assert change_set.operations[0]['id'] == 'r0'
|
||||
assert 'head' in change_set.operations[0]['properties']
|
||||
assert change_set.operations[0]['properties'] == ['head']
|
||||
assert get_reservoir(p, 'r0')['head'] == 100.0
|
||||
|
||||
assert get_reservoir(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 }
|
||||
@@ -181,7 +181,7 @@ class TestApi:
|
||||
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 'coord' in change_set.operations[0]['properties']
|
||||
assert change_set.operations[0]['properties'] == ['coord']
|
||||
assert get_reservoir(p, 'r0')['coord'] == { 'x': 100.0, 'y': 200.0 }
|
||||
|
||||
# TODO: pattern
|
||||
@@ -197,7 +197,7 @@ class TestApi:
|
||||
|
||||
self.leave(p)
|
||||
|
||||
'''
|
||||
|
||||
def test_tank(self):
|
||||
p = "test_tank"
|
||||
|
||||
@@ -223,73 +223,73 @@ class TestApi:
|
||||
assert tanks[0] == 't0'
|
||||
assert tanks[1] == 't1'
|
||||
|
||||
assert get_tank_properties(p, 't0')['elevation'] == 10.0
|
||||
change_set = set_tank_elevation(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['elevation'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'elevation': 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_properties(p, 't0')['elevation'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['elevation']
|
||||
assert get_tank(p, 't0')['elevation'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['init_level'] == 10.0
|
||||
change_set = set_tank_init_level(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['init_level'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'init_level': 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_properties(p, 't0')['init_level'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['init_level']
|
||||
assert get_tank(p, 't0')['init_level'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['min_level'] == 10.0
|
||||
change_set = set_tank_min_level(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['min_level'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'min_level': 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_properties(p, 't0')['min_level'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['min_level']
|
||||
assert get_tank(p, 't0')['min_level'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['max_level'] == 10.0
|
||||
change_set = set_tank_max_level(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['max_level'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'max_level': 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_properties(p, 't0')['max_level'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['max_level']
|
||||
assert get_tank(p, 't0')['max_level'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['diameter'] == 10.0
|
||||
change_set = set_tank_diameter(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['diameter'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'diameter': 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_properties(p, 't0')['diameter'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['diameter']
|
||||
assert get_tank(p, 't0')['diameter'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['min_vol'] == 10.0
|
||||
change_set = set_tank_min_vol(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['min_vol'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'min_vol': 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_properties(p, 't0')['min_vol'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['min_vol']
|
||||
assert get_tank(p, 't0')['min_vol'] == 100.0
|
||||
|
||||
# TODO: vol_curve
|
||||
|
||||
assert get_tank_properties(p, 't') == None
|
||||
assert get_tank_properties(p, 't0')['overflow'] == None
|
||||
change_set = set_tank_overflow(p, 't0', "XXX")
|
||||
assert get_tank(p, 't') == None
|
||||
assert get_tank(p, 't0')['overflow'] == None
|
||||
change_set = set_tank(p, 't0', {'overflow': "XXX"})
|
||||
assert len(change_set.operations) == 0
|
||||
change_set = set_tank_overflow(p, 't0', OVERFLOW_YES)
|
||||
change_set = set_tank(p, 't0', {'overflow': OVERFLOW_YES})
|
||||
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'] == 'overflow'
|
||||
assert get_tank_properties(p, 't0')['overflow'] == OVERFLOW_YES
|
||||
assert change_set.operations[0]['properties'] == ['overflow']
|
||||
assert get_tank(p, 't0')['overflow'] == OVERFLOW_YES
|
||||
|
||||
change_set = delete_tank(p, "t0")
|
||||
assert len(change_set.operations) == 1
|
||||
@@ -314,7 +314,7 @@ class TestApi:
|
||||
|
||||
self.leave(p)
|
||||
|
||||
|
||||
'''
|
||||
def test_pipe(self):
|
||||
p = "test_pipe"
|
||||
self.enter(p)
|
||||
@@ -371,49 +371,49 @@ class TestApi:
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node1'
|
||||
assert change_set.operations[0]['properties'] == 'node1'
|
||||
|
||||
change_set = set_pipe_node2(p, 'p1', 'j4')
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node2'
|
||||
assert change_set.operations[0]['properties'] == 'node2'
|
||||
|
||||
change_set = set_pipe_length(p, 'p1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'length'
|
||||
assert change_set.operations[0]['properties'] == 'length'
|
||||
|
||||
change_set = set_pipe_diameter(p, 'p1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'diameter'
|
||||
assert change_set.operations[0]['properties'] == 'diameter'
|
||||
|
||||
change_set = set_pipe_roughness(p, 'p1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'roughness'
|
||||
assert change_set.operations[0]['properties'] == 'roughness'
|
||||
|
||||
change_set = set_pipe_minor_loss(p, 'p1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'minor_loss'
|
||||
assert change_set.operations[0]['properties'] == 'minor_loss'
|
||||
|
||||
change_set = set_pipe_status(p, 'p1', PIPE_STATUS_OPEN)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'status'
|
||||
assert change_set.operations[0]['properties'] == 'status'
|
||||
|
||||
assert get_pipe_properties(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pipe_properties(p, 'p1')['node2'] == 'j4'
|
||||
@@ -501,14 +501,14 @@ class TestApi:
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PUMP
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node1'
|
||||
assert change_set.operations[0]['properties'] == 'node1'
|
||||
|
||||
change_set = set_pump_node2(p, 'p1', 'j4')
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PUMP
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node2'
|
||||
assert change_set.operations[0]['properties'] == 'node2'
|
||||
|
||||
assert get_pump_properties(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pump_properties(p, 'p1')['node2'] == 'j4'
|
||||
@@ -600,42 +600,42 @@ class TestApi:
|
||||
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]['property'] == 'node1'
|
||||
assert change_set.operations[0]['properties'] == 'node1'
|
||||
|
||||
change_set = set_valve_node2(p, 'v1', '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]['property'] == 'node2'
|
||||
assert change_set.operations[0]['properties'] == 'node2'
|
||||
|
||||
change_set = set_valve_diameter(p, 'v1', 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]['property'] == 'diameter'
|
||||
assert change_set.operations[0]['properties'] == 'diameter'
|
||||
|
||||
change_set = set_valve_type(p, 'v1', 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]['property'] == 'type'
|
||||
assert change_set.operations[0]['properties'] == 'type'
|
||||
|
||||
change_set = set_valve_setting(p, 'v1', 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]['property'] == 'setting'
|
||||
assert change_set.operations[0]['properties'] == 'setting'
|
||||
|
||||
change_set = set_valve_minor_loss(p, 'v1', 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]['property'] == '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'
|
||||
|
||||
Reference in New Issue
Block a user