From c6aadcbc4fc39e76b61f8bafe681c6d66f723f62 Mon Sep 17 00:00:00 2001 From: hxy7yx <1595670487@qq.com> Date: Fri, 28 Apr 2023 09:27:45 +0800 Subject: [PATCH] Add tag related functional test cases --- README.md | 43 ----------------- ft/modbus_tcp_test.robot | 84 +++++++++++++++++++++++++++------- ft/tag_test.robot | 24 ++++++++++ plugins/modbus/modbus_qh_tcp.c | 2 +- 4 files changed, 92 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index af372ed3..52ebe95b 100644 --- a/README.md +++ b/README.md @@ -92,49 +92,6 @@ $ ./neuron >Change the log level in the rules in the zlog.conf file. Available levels include INFO, DEBUG, NOTICE, WARN, ERROR and FATAL. > -## Test - -To run all unit testers - -```shell -$ cd build -$ ctest --output-on-failure -``` - -### Functional test - -To run all functional testers - -```shell -$ sudo apt-get install -y mosquitto -$ mosquitto -v & -$ python3 -m pip install -U pip -$ python3 -m pip install -r ft/requirements.txt -$ python3 -m robot --maxerroelines=600 -P ft/ -d ft/reports ft -``` - -### Pressure test - -There are datasets for pressure testing in directory `ft/data/persistence/`. - -To run pressure tests - -```shell -# python dependencies -$ pip3 install -r ft/requirements.txt - -# through http api, on dataset total-10k -$ python3 -m robot -P ft/ --variable neuron_api:http --variable dataset:total-10k -d ft/http-total-10k ft/pressure.test -# through http api, on dataset total-50k -$ python3 -m robot -P ft/ --variable neuron_api:http --variable dataset:total-50k -d ft/http-total-50k ft/pressure.test - -# A MQTT broker is needed if using the mqtt api, mosquitto in this example -$ mosquitto -v & - -# through mqtt api, on dataset simple-1k -$ python3 -m robot -P ft/ --variable neuron_api:mqtt --variable dataset:simple-1k -d ft/mqtt-simple-1k ft/pressure.test -``` - ## License See [LICENSE](./LICENSE). diff --git a/ft/modbus_tcp_test.robot b/ft/modbus_tcp_test.robot index e9bf5822..e1c2a96f 100644 --- a/ft/modbus_tcp_test.robot +++ b/ft/modbus_tcp_test.robot @@ -25,6 +25,12 @@ ${hold_int32} {"name": "hold_int32", "address": "1!400003", "attribute": ${T ${hold_uint32} {"name": "hold_uint32", "address": "1!400015", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_UINT32}} ${hold_float} {"name": "hold_float", "address": "1!400017", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_FLOAT}} ${hold_string} {"name": "hold_string", "address": "1!400020.10", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_STRING}} +${hold_int16_s} {"name": "hold_int16_s", "address": "1!400001", "attribute": ${TAG_ATTRIBUTE_STATIC_RW}, "type": ${TAG_TYPE_INT16}, "value": 1} +${hold_uint16_s} {"name": "hold_uint16_s", "address": "1!400002", "attribute": ${TAG_ATTRIBUTE_STATIC_RW}, "type": ${TAG_TYPE_UINT16}, "value": 1} +${hold_int32_s} {"name": "hold_int32_s", "address": "1!400003", "attribute": ${TAG_ATTRIBUTE_STATIC_RW}, "type": ${TAG_TYPE_INT32}, "value": 1} +${hold_uint32_s} {"name": "hold_uint32_s", "address": "1!400015", "attribute": ${TAG_ATTRIBUTE_STATIC_RW}, "type": ${TAG_TYPE_UINT32}, "value": 1} +${hold_float_s} {"name": "hold_float_s", "address": "1!400017", "attribute": ${TAG_ATTRIBUTE_STATIC_RW}, "type": ${TAG_TYPE_FLOAT}, "value": 1.0} +${hold_string_s} {"name": "hold_string_s", "address": "1!400020.10", "attribute": ${TAG_ATTRIBUTE_STATIC_RW}, "type": ${TAG_TYPE_STRING}, "value": "a"} ${coil_bit_1} {"name": "coil_bit_1", "address": "1!000001", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_BIT}} ${coil_bit_2} {"name": "coil_bit_2", "address": "1!000002", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_BIT}} @@ -49,9 +55,19 @@ ${input_register_string} {"name": "input_register_string", "address": "1!3012 ${hold_int16_address_update} {"name": "hold_int16", "address": "1!400100", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_INT16}} ${hold_int16_type_update} {"name": "hold_int16", "address": "1!400001", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_INT32}} -${input_bit_1_name_wrong} {"name": "input_bit", "address": "1!100001", "attribute": ${TAG_ATTRIBUTE_READ}, "type": ${TAG_TYPE_BIT}} +${input_bit_1_name_wrong} {"name": "input_bit", "address": "1!100001", "attribute": ${TAG_ATTRIBUTE_READ}, "type": ${TAG_TYPE_BIT}} ${input_bit_1_attribute_unmatch} {"name": "input_bit_1", "address": "1!100001", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_BIT}} -${input_bit_1_type_unmatch} {"name": "input_bit_1", "address": "1!100001", "attribute": ${TAG_ATTRIBUTE_READ}, "type": ${TAG_TYPE_INT16}} +${input_bit_1_type_unmatch} {"name": "input_bit_1", "address": "1!100001", "attribute": ${TAG_ATTRIBUTE_READ}, "type": ${TAG_TYPE_INT16}} + +${hold_int16_decimal} {"name": "hold_int16_decimal", "address": "1!400003", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_INT16}, "decimal": 0.1} +${hold_uint16_decimal} {"name": "hold_uint16_decimal", "address": "1!400002", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_UINT16}, "decimal": 0.1} +${hold_int32_decimal} {"name": "hold_int32_decimal", "address": "1!400003", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_INT32}, "decimal": 0.1} +${hold_uint32_decimal} {"name": "hold_uint32_decimal", "address": "1!400015", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_UINT32}, "decimal": 0.1} +${hold_float_decimal} {"name": "hold_float_decimal", "address": "1!400017", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_FLOAT}, "decimal": 0.1} +${hold_double_decimal} {"name": "hold_double_decimal", "address": "1!400027", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_DOUBLE}, "decimal": 0.1} + +${hold_float_precision} {"name": "hold_float_precision", "address": "1!400030", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_FLOAT}, "precision": 2} +${hold_double_precision} {"name": "hold_double_precision", "address": "1!400040", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_DOUBLE}, "precision": 2} *** Test Cases *** Set a node with right settings, it should be success. @@ -64,12 +80,18 @@ Set a node with wrong settings, it should be failure. Set tags with multiple address and types and attribute, it should be success. [Template] Add a ${tag} with right address and type and attribute from ${node}, it will be success. - ${hold_int16} ${modbus_tcp_node} - ${hold_uint16} ${modbus_tcp_node} - ${hold_int32} ${modbus_tcp_node} - ${hold_uint32} ${modbus_tcp_node} - ${hold_float} ${modbus_tcp_node} - ${hold_string} ${modbus_tcp_node} + ${hold_int16} ${modbus_tcp_node} + ${hold_uint16} ${modbus_tcp_node} + ${hold_int32} ${modbus_tcp_node} + ${hold_uint32} ${modbus_tcp_node} + ${hold_float} ${modbus_tcp_node} + ${hold_string} ${modbus_tcp_node} + ${hold_int16_s} ${modbus_tcp_node} + ${hold_uint16_s} ${modbus_tcp_node} + ${hold_int32_s} ${modbus_tcp_node} + ${hold_uint32_s} ${modbus_tcp_node} + ${hold_float_s} ${modbus_tcp_node} + ${hold_string_s} ${modbus_tcp_node} ${coil_bit_1} ${modbus_tcp_node} ${coil_bit_2} ${modbus_tcp_node} @@ -77,11 +99,11 @@ Set tags with multiple address and types and attribute, it should be success. ${coil_bit_4} ${modbus_tcp_node} ${coil_bit_5} ${modbus_tcp_node} - ${input_register_int16} ${modbus_tcp_node} + ${input_register_int16} ${modbus_tcp_node} ${input_register_uint16} ${modbus_tcp_node} - ${input_register_int32} ${modbus_tcp_node} + ${input_register_int32} ${modbus_tcp_node} ${input_register_uint32} ${modbus_tcp_node} - ${input_register_float} ${modbus_tcp_node} + ${input_register_float} ${modbus_tcp_node} ${input_register_string} ${modbus_tcp_node} ${input_bit_1} ${modbus_tcp_node} @@ -92,8 +114,8 @@ Set tags with multiple address and types and attribute, it should be success. Set tags with unmatch address, type or attribute, it should be failure. [Template] Set a ${tag} with unmatch address, type or attribute from ${node}, it will be failure and return ${resp_status} and ${error_code}. - ${input_bit_1_type_unmatch} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_TYPE_NOT_SUPPORT} - ${input_bit_1_attribute_unmatch} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_ATTRIBUTE_NOT_SUPPORT} + ${input_bit_1_type_unmatch} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_TYPE_NOT_SUPPORT} + ${input_bit_1_attribute_unmatch} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_ATTRIBUTE_NOT_SUPPORT} Write and Read all type tag with same slave id in hold register and coil, it should be success. [Template] Write and Read a ${tag} named ${tag_name} from ${node}, using ${check} to check the ${value}, it will be success. @@ -143,13 +165,41 @@ Write and read a tag with same name but different address that in different grou Update a tag with right address and types and attribute, it will be success [Template] Update a ${tag} by a ${tag_update} named ${tag_name} from ${node} , it can read and write, using ${check} to check the ${value}, it will be success. ${hold_int16} ${hold_int16_address_update} hold_int16 ${modbus_tcp_node} Compare Tag Value As Int 120 - ${hold_int16} ${hold_int16_type_update} hold_int16 ${modbus_tcp_node} Compare Tag Value As Int 120 + ${hold_int16} ${hold_int16_type_update} hold_int16 ${modbus_tcp_node} Compare Tag Value As Int 120 + +Add a tag with decimal, it should return success + [Template] Add a ${tag} with right address and type and attribute from ${node}, it will be success. + ${hold_int16_decimal} ${modbus_tcp_node} + ${hold_uint16_decimal} ${modbus_tcp_node} + ${hold_int32_decimal} ${modbus_tcp_node} + ${hold_uint32_decimal} ${modbus_tcp_node} + ${hold_float_decimal} ${modbus_tcp_node} + ${hold_double_decimal} ${modbus_tcp_node} + +Write and read a value to a tag with decimal, it should return success + [Template] Write and Read a ${tag} named ${tag_name} from ${node}, using ${check} to check the ${value}, it will be success. + ${hold_int16_decimal} hold_int16_decimal ${modbus_tcp_node} Compare Tag Value As Int 120 + ${hold_uint16_decimal} hold_uint16_decimal ${modbus_tcp_node} Compare Tag Value As Int 120 + ${hold_int32_decimal} hold_int32_decimal ${modbus_tcp_node} Compare Tag Value As Int 120 + ${hold_uint32_decimal} hold_uint32_decimal ${modbus_tcp_node} Compare Tag Value As Int 120 + ${hold_float_decimal} hold_float_decimal ${modbus_tcp_node} Compare Tag Value As Float 120.5 + ${hold_double_decimal} hold_double_decimal ${modbus_tcp_node} Compare Tag Value As Float 120.5 + +Add a tag with precision, it should return success + [Template] Add a ${tag} with right address and type and attribute from ${node}, it will be success. + ${hold_float_precision} ${modbus_tcp_node} + ${hold_double_precision} ${modbus_tcp_node} + +Write and read a value to a tag with precision, it should return success + [Template] Write and Read a ${tag} named ${tag_name} from ${node}, using ${check} to check the ${value}, it will be success. + ${hold_float_precision} hold_float_precision ${modbus_tcp_node} Compare Tag Value As Float 120.5 + ${hold_double_precision} hold_double_precision ${modbus_tcp_node} Compare Tag Value As Float 1111111111111111111111111111111111111111.1 Update a tag with unmatch address and types and attribute, it should be failure. [Template] Update a ${tag} by a ${tag_update} with the unmatch settings from ${node} , it will be failure and return ${resp_status} and ${error_code}. - ${input_bit_1} ${input_bit_1_attribute_unmatch} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_ATTRIBUTE_NOT_SUPPORT} - ${input_bit_1} ${input_bit_1_type_unmatch} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_TYPE_NOT_SUPPORT} - ${input_bit_1} ${input_bit_1_name_wrong} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_NOT_EXIST} + ${input_bit_1} ${input_bit_1_attribute_unmatch} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_ATTRIBUTE_NOT_SUPPORT} + ${input_bit_1} ${input_bit_1_type_unmatch} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_TYPE_NOT_SUPPORT} + ${input_bit_1} ${input_bit_1_name_wrong} ${modbus_tcp_node} 200 ${NEU_ERR_TAG_NOT_EXIST} Write a value to a tag that don't exit in plc or neuron, it will be failure. [Template] Write a ${value} to a ${tag} with named ${tag_name} that don't exist in neuron or plc from ${node}, it will be failure. diff --git a/ft/tag_test.robot b/ft/tag_test.robot index 1258bf0f..0442ca0e 100644 --- a/ft/tag_test.robot +++ b/ft/tag_test.robot @@ -14,6 +14,8 @@ ${tag1update} {"name": "tag1", "address": "1!400002", "attribute": ${TAG_A ${tag_desc} {"name": "tag_desc", "description": "description info", "address": "1!400001", "attribute": ${TAG_ATTRIBUTE_READ}, "type": ${TAG_TYPE_INT16}} ${tag1_static} {"name": "tag1", "address": "1!400001", "attribute": ${TAG_ATTRIBUTE_STATIC_RW}, "type": ${TAG_TYPE_INT16}, "value": 1} ${tag1_static_no_value} {"name": "tag1", "address": "1!400001", "attribute": ${TAG_ATTRIBUTE_STATIC_RW}, "type": ${TAG_TYPE_INT16}} +${tag_decimal} {"name": "tag_decimal", "address": "1!400003", "attribute": ${TAG_ATTRIBUTE_RW}, "type": ${TAG_TYPE_INT16}, "decimal": 0.1} + *** Test Cases *** Add tags to non-existent node, it should return failure @@ -183,3 +185,25 @@ Add a tag with description, it should return success Should Be Equal As Strings ${res}[tags][0][description] description info Should Be Equal As Strings ${res}[tags][0][attribute] ${TAG_ATTRIBUTE_READ} Should Be Equal As Strings ${res}[tags][0][type] ${TAG_TYPE_INT16} + + [Teardown] Del Tags modbus-node group "tag_desc" + +Add a tag with decimal, it should return success + ${res}= Add Tags modbus-node group ${tag_decimal} + + Check Response Status ${res} 200 + Check Error Code ${res} ${NEU_ERR_SUCCESS} + Should Be Equal As Integers ${res}[index] 1 + + ${res}= Get Tags modbus-node group + + Check Response Status ${res} 200 + ${len} = Get Length ${res}[tags] + Should Be Equal As Integers ${len} 1 + + Should Be Equal As Strings ${res}[tags][0][name] tag_decimal + Should Be Equal As Strings ${res}[tags][0][address] 1!400003 + Should Be Equal As Strings ${res}[tags][0][decimal] 0.1 + Should Be Equal As Strings ${res}[tags][0][attribute] ${TAG_ATTRIBUTE_RW} + Should Be Equal As Strings ${res}[tags][0][type] ${TAG_TYPE_INT16} + diff --git a/plugins/modbus/modbus_qh_tcp.c b/plugins/modbus/modbus_qh_tcp.c index 61904972..d4927678 100644 --- a/plugins/modbus/modbus_qh_tcp.c +++ b/plugins/modbus/modbus_qh_tcp.c @@ -66,7 +66,7 @@ const neu_plugin_module_t neu_plugin_module = { "expands the packet description field to two bytes, limiting the " "maximum length of Modbus tcp packets to 64KB", .module_descr_zh = - "该插件是 modbus-tcp 插件的优化版，数据包描述字段扩展为连个字节,限制 " + "该插件是 modbus-tcp 插件的优化版，数据包描述字段扩展为两个字节,限制 " "Modbus TCP 数据包的最大长度为 64KB。", .intf_funs = &plugin_intf_funs, .kind = NEU_PLUGIN_KIND_SYSTEM,