From 93f5321c89d0611ef635ad33ea091ed01ab0b09a Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 16 Feb 2023 21:21:37 +0800 Subject: [PATCH] Test scada_model.status --- test_tjnetwork.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/test_tjnetwork.py b/test_tjnetwork.py index e8191a4..8697c92 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -3677,6 +3677,7 @@ class TestApi: assert sm['address'] == None assert sm['sm_type'] == None assert sm['model_id'] == None + assert sm['status'] == SCADA_STATUS_OFFLINE add_scada_model(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device_0', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j0'})) sm0 = get_scada_model(p, 'sm0') @@ -3696,8 +3697,9 @@ class TestApi: assert sm1['address'] == 'xxx' assert sm1['sm_type'] == SCADA_TYPE_PRESSURE assert sm1['model_id'] == 'j1' + assert sm1['status'] == SCADA_STATUS_OFFLINE - add_scada_model(p, ChangeSet({'id': 'sm2', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device_2', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'p1'})) + add_scada_model(p, ChangeSet({'id': 'sm2', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device_2', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'p1', 'status': SCADA_STATUS_ONLINE})) sm2 = get_scada_model(p, 'sm2') assert sm2['id'] == 'sm2' assert sm2['x'] == 0.0 @@ -3707,8 +3709,9 @@ class TestApi: assert sm2['address'] == 'xxx' assert sm2['sm_type'] == SCADA_TYPE_PRESSURE assert sm2['model_id'] == 'p1' + assert sm2['status'] == SCADA_STATUS_ONLINE - set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j0'})) + set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j0', 'status': SCADA_STATUS_ONLINE})) sm = get_scada_model(p, 'sm') assert sm['id'] == 'sm' assert sm['x'] == 0.0 @@ -3718,8 +3721,9 @@ class TestApi: assert sm['address'] == None assert sm['sm_type'] == None assert sm['model_id'] == None + assert sm['status'] == SCADA_STATUS_OFFLINE - set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1'})) + set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1', 'status': SCADA_STATUS_ONLINE})) sm = get_scada_model(p, 'sm') assert sm['id'] == 'sm' assert sm['x'] == 0.0 @@ -3729,6 +3733,7 @@ class TestApi: assert sm['address'] == 'xxx' assert sm['sm_type'] == SCADA_TYPE_PRESSURE assert sm['model_id'] == 'j1' + assert sm['status'] == SCADA_STATUS_ONLINE delete_scada_model(p, ChangeSet({'id': 'sm'})) sm = get_scada_model(p, 'sm') @@ -3753,7 +3758,7 @@ class TestApi: add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) add_junction(p, ChangeSet({'id': 'j2', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) - cs = add_scada_model(p, ChangeSet({'id': 'sm', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1'})).operations[0] + cs = add_scada_model(p, ChangeSet({'id': 'sm', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1', 'status': SCADA_STATUS_ONLINE})).operations[0] assert cs['operation'] == API_ADD assert cs['type'] == 'scada_model' assert cs['id'] == 'sm' @@ -3764,6 +3769,7 @@ class TestApi: assert cs['address'] == 'xxx' assert cs['sm_type'] == SCADA_TYPE_PRESSURE assert cs['model_id'] == 'j1' + assert cs['status'] == SCADA_STATUS_ONLINE cs = execute_undo(p).operations[0] assert cs['operation'] == API_DELETE @@ -3781,8 +3787,9 @@ class TestApi: assert cs['address'] == 'xxx' assert cs['sm_type'] == SCADA_TYPE_PRESSURE assert cs['model_id'] == 'j1' + assert cs['status'] == SCADA_STATUS_ONLINE - cs = set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name_', 'address': 'xxx_', 'sm_type': SCADA_TYPE_DEMAND, 'model_id': 'j2'})).operations[0] + cs = set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name_', 'address': 'xxx_', 'sm_type': SCADA_TYPE_DEMAND, 'model_id': 'j2', 'status': SCADA_STATUS_OFFLINE})).operations[0] assert cs['operation'] == API_UPDATE assert cs['type'] == 'scada_model' assert cs['id'] == 'sm' @@ -3793,6 +3800,7 @@ class TestApi: assert cs['address'] == 'xxx_' assert cs['sm_type'] == SCADA_TYPE_DEMAND assert cs['model_id'] == 'j2' + assert cs['status'] == SCADA_STATUS_OFFLINE cs = execute_undo(p).operations[0] assert cs['operation'] == API_UPDATE @@ -3805,6 +3813,7 @@ class TestApi: assert cs['address'] == 'xxx' assert cs['sm_type'] == SCADA_TYPE_PRESSURE assert cs['model_id'] == 'j1' + assert cs['status'] == SCADA_STATUS_ONLINE cs = execute_redo(p).operations[0] assert cs['operation'] == API_UPDATE @@ -3817,6 +3826,7 @@ class TestApi: assert cs['address'] == 'xxx_' assert cs['sm_type'] == SCADA_TYPE_DEMAND assert cs['model_id'] == 'j2' + assert cs['status'] == SCADA_STATUS_OFFLINE cs = delete_scada_model(p, ChangeSet({'id': 'sm'})).operations[0] assert cs['operation'] == API_DELETE @@ -3834,6 +3844,7 @@ class TestApi: assert cs['address'] == 'xxx_' assert cs['sm_type'] == SCADA_TYPE_DEMAND assert cs['model_id'] == 'j2' + assert cs['status'] == SCADA_STATUS_OFFLINE cs = execute_redo(p).operations[0] assert cs['operation'] == API_DELETE