Refine link getter api
This commit is contained in:
@@ -348,13 +348,13 @@ class TestApi:
|
||||
pipes = get_links(p)
|
||||
assert len(pipes) == 1
|
||||
|
||||
assert get_pipe_node1(p, 'p1') == 'j1'
|
||||
assert get_pipe_node2(p, 'p1') == 'j2'
|
||||
assert get_pipe_length(p, 'p1') == 10.0
|
||||
assert get_pipe_diameter(p, 'p1') == 10.0
|
||||
assert get_pipe_roughness(p, 'p1') == 10.0
|
||||
assert get_pipe_minor_loss(p, 'p1') == 10.0
|
||||
assert get_pipe_status(p, 'p1') == PIPE_STATUS_CLOSED
|
||||
assert get_pipe_properties(p, 'p1')['node1'] == 'j1'
|
||||
assert get_pipe_properties(p, 'p1')['node2'] == 'j2'
|
||||
assert get_pipe_properties(p, 'p1')['length'] == 10.0
|
||||
assert get_pipe_properties(p, 'p1')['diameter'] == 10.0
|
||||
assert get_pipe_properties(p, 'p1')['roughness'] == 10.0
|
||||
assert get_pipe_properties(p, 'p1')['minor_loss'] == 10.0
|
||||
assert get_pipe_properties(p, 'p1')['status'] == PIPE_STATUS_CLOSED
|
||||
|
||||
change_set = set_pipe_node1(p, 'p1', 'j2')
|
||||
assert len(change_set.operations) == 0
|
||||
@@ -412,13 +412,13 @@ class TestApi:
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'status'
|
||||
|
||||
assert get_pipe_node1(p, 'p1') == 'j3'
|
||||
assert get_pipe_node2(p, 'p1') == 'j4'
|
||||
assert get_pipe_length(p, 'p1') == 100.0
|
||||
assert get_pipe_diameter(p, 'p1') == 100.0
|
||||
assert get_pipe_roughness(p, 'p1') == 100.0
|
||||
assert get_pipe_minor_loss(p, 'p1') == 100.0
|
||||
assert get_pipe_status(p, 'p1') == PIPE_STATUS_OPEN
|
||||
assert get_pipe_properties(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pipe_properties(p, 'p1')['node2'] == 'j4'
|
||||
assert get_pipe_properties(p, 'p1')['length'] == 100.0
|
||||
assert get_pipe_properties(p, 'p1')['diameter'] == 100.0
|
||||
assert get_pipe_properties(p, 'p1')['roughness'] == 100.0
|
||||
assert get_pipe_properties(p, 'p1')['minor_loss'] == 100.0
|
||||
assert get_pipe_properties(p, 'p1')['status'] == PIPE_STATUS_OPEN
|
||||
|
||||
change_set = add_pipe(p, 'p2', 'j1', 'j2', 10.0, 10.0, 10.0, 10.0, PIPE_STATUS_CLOSED)
|
||||
assert len(change_set.operations) == 1
|
||||
@@ -485,8 +485,8 @@ class TestApi:
|
||||
pumps = get_links(p)
|
||||
assert len(pumps) == 1
|
||||
|
||||
assert get_pump_node1(p, 'p1') == 'j1'
|
||||
assert get_pump_node2(p, 'p1') == 'j2'
|
||||
assert get_pump_properties(p, 'p1')['node1'] == 'j1'
|
||||
assert get_pump_properties(p, 'p1')['node2'] == 'j2'
|
||||
|
||||
change_set = set_pump_node1(p, 'p1', 'j2')
|
||||
assert len(change_set.operations) == 0
|
||||
@@ -507,8 +507,8 @@ class TestApi:
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node2'
|
||||
|
||||
assert get_pump_node1(p, 'p1') == 'j3'
|
||||
assert get_pump_node2(p, 'p1') == 'j4'
|
||||
assert get_pump_properties(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pump_properties(p, 'p1')['node2'] == 'j4'
|
||||
|
||||
change_set = add_pump(p, 'p2', 'j1', 'j2')
|
||||
assert len(change_set.operations) == 1
|
||||
@@ -578,12 +578,12 @@ class TestApi:
|
||||
valves = get_links(p)
|
||||
assert len(valves) == 1
|
||||
|
||||
assert get_valve_node1(p, 'v1') == 'j1'
|
||||
assert get_valve_node2(p, 'v1') == 'j2'
|
||||
assert get_valve_diameter(p, 'v1') == 10.0
|
||||
assert get_valve_type(p, 'v1') == VALVES_TYPE_FCV
|
||||
assert get_valve_setting(p, 'v1') == 10.0
|
||||
assert get_valve_minor_loss(p, 'v1') == 10.0
|
||||
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
|
||||
|
||||
change_set = set_valve_node1(p, 'v1', 'j2')
|
||||
assert len(change_set.operations) == 0
|
||||
@@ -634,12 +634,12 @@ class TestApi:
|
||||
assert change_set.operations[0]['id'] == 'v1'
|
||||
assert change_set.operations[0]['property'] == 'minor_loss'
|
||||
|
||||
assert get_valve_node1(p, 'v1') == 'j3'
|
||||
assert get_valve_node2(p, 'v1') == 'j4'
|
||||
assert get_valve_diameter(p, 'v1') == 100.0
|
||||
assert get_valve_type(p, 'v1') == VALVES_TYPE_GPV
|
||||
assert get_valve_setting(p, 'v1') == 100.0
|
||||
assert get_valve_minor_loss(p, 'v1') == 100.0
|
||||
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
|
||||
|
||||
change_set = add_valve(p, 'v2', 'j1', 'j2', 10.0, VALVES_TYPE_FCV, 10.0, 10.0)
|
||||
assert len(change_set.operations) == 1
|
||||
|
||||
Reference in New Issue
Block a user