Update pipe api and test
This commit is contained in:
@@ -314,7 +314,7 @@ class TestApi:
|
||||
|
||||
self.leave(p)
|
||||
|
||||
'''
|
||||
|
||||
def test_pipe(self):
|
||||
p = "test_pipe"
|
||||
self.enter(p)
|
||||
@@ -351,77 +351,77 @@ class TestApi:
|
||||
pipes = get_links(p)
|
||||
assert len(pipes) == 1
|
||||
|
||||
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
|
||||
assert get_pipe(p, 'p1')['node1'] == 'j1'
|
||||
assert get_pipe(p, 'p1')['node2'] == 'j2'
|
||||
assert get_pipe(p, 'p1')['length'] == 10.0
|
||||
assert get_pipe(p, 'p1')['diameter'] == 10.0
|
||||
assert get_pipe(p, 'p1')['roughness'] == 10.0
|
||||
assert get_pipe(p, 'p1')['minor_loss'] == 10.0
|
||||
assert get_pipe(p, 'p1')['status'] == PIPE_STATUS_CLOSED
|
||||
|
||||
change_set = set_pipe_node1(p, 'p1', 'j2')
|
||||
change_set = set_pipe(p, 'p1', {'node1': 'j2'})
|
||||
assert len(change_set.operations) == 0
|
||||
change_set = set_pipe_node2(p, 'p1', 'j1')
|
||||
change_set = set_pipe(p, 'p1', {'node2': 'j1'})
|
||||
assert len(change_set.operations) == 0
|
||||
change_set = set_pipe_status(p, 'p1', "XXX")
|
||||
change_set = set_pipe(p, 'p1', {'status': 'XXX'})
|
||||
assert len(change_set.operations) == 0
|
||||
|
||||
change_set = set_pipe_node1(p, 'p1', 'j3')
|
||||
change_set = set_pipe(p, 'p1', {'node1': 'j3'})
|
||||
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]['properties'] == 'node1'
|
||||
assert change_set.operations[0]['properties'] == ['node1']
|
||||
|
||||
change_set = set_pipe_node2(p, 'p1', 'j4')
|
||||
change_set = set_pipe(p, 'p1', {'node2': '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]['properties'] == 'node2'
|
||||
assert change_set.operations[0]['properties'] == ['node2']
|
||||
|
||||
change_set = set_pipe_length(p, 'p1', 100.0)
|
||||
change_set = set_pipe(p, 'p1', {'length': 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]['properties'] == 'length'
|
||||
assert change_set.operations[0]['properties'] == ['length']
|
||||
|
||||
change_set = set_pipe_diameter(p, 'p1', 100.0)
|
||||
change_set = set_pipe(p, 'p1', {'diameter': 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]['properties'] == 'diameter'
|
||||
assert change_set.operations[0]['properties'] == ['diameter']
|
||||
|
||||
change_set = set_pipe_roughness(p, 'p1', 100.0)
|
||||
change_set = set_pipe(p, 'p1', {'roughness': 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]['properties'] == 'roughness'
|
||||
assert change_set.operations[0]['properties'] == ['roughness']
|
||||
|
||||
change_set = set_pipe_minor_loss(p, 'p1', 100.0)
|
||||
change_set = set_pipe(p, 'p1', {'minor_loss': 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]['properties'] == 'minor_loss'
|
||||
assert change_set.operations[0]['properties'] == ['minor_loss']
|
||||
|
||||
change_set = set_pipe_status(p, 'p1', PIPE_STATUS_OPEN)
|
||||
change_set = set_pipe(p, 'p1', {'status': 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]['properties'] == 'status'
|
||||
assert change_set.operations[0]['properties'] == ['status']
|
||||
|
||||
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
|
||||
assert get_pipe(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pipe(p, 'p1')['node2'] == 'j4'
|
||||
assert get_pipe(p, 'p1')['length'] == 100.0
|
||||
assert get_pipe(p, 'p1')['diameter'] == 100.0
|
||||
assert get_pipe(p, 'p1')['roughness'] == 100.0
|
||||
assert get_pipe(p, 'p1')['minor_loss'] == 100.0
|
||||
assert get_pipe(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
|
||||
@@ -454,7 +454,7 @@ class TestApi:
|
||||
|
||||
self.leave(p)
|
||||
|
||||
|
||||
'''
|
||||
def test_pump(self):
|
||||
p = "test_pump"
|
||||
self.enter(p)
|
||||
|
||||
Reference in New Issue
Block a user