From 8c70af523d9a212ff8ee42cdcb65596201da948a Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 29 Mar 2023 22:46:04 +0800 Subject: [PATCH] Fix test case --- test_tjnetwork.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 7f80fbe..1628e2d 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -4322,8 +4322,8 @@ class TestApi: devices = get_scada_devices(p) assert len(devices) == 2 - assert devices[0] == 'sm0' - assert devices[1] == 'sm1' + assert devices[0] == 'd0' + assert devices[1] == 'd1' delete_scada_device(p, ChangeSet({'id': 'd0'})) d = get_scada_device(p, 'd0') @@ -4333,6 +4333,8 @@ class TestApi: d = get_scada_device(p, 'd1') assert d == {} + assert get_scada_devices(p) == [] + add_scada_device(p, ChangeSet({'id': 'd0'})) d = get_scada_device(p, 'd0') assert d['id'] == 'd0' @@ -4341,12 +4343,19 @@ class TestApi: d = get_scada_device(p, 'd1') assert d['id'] == 'd1' + devices = get_scada_devices(p) + assert len(devices) == 2 + assert devices[0] == 'd0' + assert devices[1] == 'd1' + clean_scada_device(p) d = get_scada_device(p, 'd0') assert d == {} d = get_scada_device(p, 'd1') assert d == {} + assert get_scada_devices(p) == [] + self.leave(p) @@ -4862,6 +4871,8 @@ class TestApi: sm = get_scada_element(p, 'sm1') assert sm == {} + assert get_scada_elements(p) == [] + add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'status': SCADA_ELEMENT_STATUS_OFFLINE})) sm = get_scada_element(p, 'sm0') assert sm['id'] == 'sm0' @@ -4880,12 +4891,19 @@ class TestApi: assert sm['model_id'] == 'p1' assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE + elements = get_scada_elements(p) + assert len(elements) == 2 + assert elements[0] == 'sm0' + assert elements[1] == 'sm1' + clean_scada_element(p) sm = get_scada_element(p, 'sm0') assert sm == {} sm = get_scada_element(p, 'sm1') assert sm == {} + assert get_scada_elements(p) == [] + self.leave(p)