GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-29 15:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1956 from hxy7yx/main-1

Browse Source 
test(tag):fix utf8 check & improve ft cov
This commit is contained in:
fengzeroz
2024-04-23 13:43:55 +08:00
committed by GitHub
parent f0d19af977 4c10678318
commit 600e5ee56f
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/base/tag.c
+3 -3
View File
@@ -320,7 +320,7 @@ bool neu_datatag_string_is_utf8(char *data, int len)
// 0XXX_XXXX
i++;
continue;
} else if ((num = pre_num(data[i])) > 2) {
} else if ((num = pre_num(data[i])) > 1) {
// 110X_XXXX 10XX_XXXX
// 1110_XXXX 10XX_XXXX 10XX_XXXX
// 1111_0XXX 10XX_XXXX 10XX_XXXX 10XX_XXXX
@@ -358,7 +358,7 @@ int neu_datatag_string_ltoh(char *str, int len)
return neu_datatag_string_htol(str, len);
}
int neu_datatag_string_etod(char *str, int len)
/*int neu_datatag_string_etod(char *str, int len)
{
for (int i = 0; i < len; i += 2) {
str[i + 1] = str[i];
@@ -432,7 +432,7 @@ int neu_datatag_string_toe(char *str, int len, int buf_len)
free(t);
return len * 2;
}
}*/
int neu_tag_get_static_value(const neu_datatag_t *tag, neu_value_u *value)
{
tests/ft/driver/test_modbus.py
+24 -9
View File
@@ -299,9 +299,9 @@ hold_double_B = [{"name": "hold_double_B", "address": "1!400445#B",
"attribute": config.NEU_TAG_ATTRIBUTE_RW, "type": config.NEU_TYPE_DOUBLE}]
hold_double_L = [{"name": "hold_double_L", "address": "1!400449#L",
"attribute": config.NEU_TAG_ATTRIBUTE_RW, "type": config.NEU_TYPE_DOUBLE}]
hold_string_H = [{"name": "hold_string_H", "address": "1!400710.4",
hold_string_H = [{"name": "hold_string_H", "address": "1!400710.4H",
"attribute": config.NEU_TAG_ATTRIBUTE_RW, "type": config.NEU_TYPE_STRING}]
hold_string_L = [{"name": "hold_string_L", "address": "1!400720.4",
hold_string_L = [{"name": "hold_string_L", "address": "1!400710.4L",
"attribute": config.NEU_TAG_ATTRIBUTE_RW, "type": config.NEU_TYPE_STRING}]
hold_string_l1 = [{"name": "hold_string_l1", "address": "1!400501.127",
@@ -312,6 +312,11 @@ hold_string_l2 = [{"name": "hold_string_l2", "address": "1!400628.127",
hold_int16_device_err = [{"name": "hold_int16_device_err", "address": "1!409000",
"attribute": config.NEU_TAG_ATTRIBUTE_RW, "type": config.NEU_TYPE_INT16}]
hold_uint16_utf8 = [{"name": "hold_uint16_utf8", "address": "1!401100",
"attribute": config.NEU_TAG_ATTRIBUTE_RW, "type": config.NEU_TYPE_UINT16}]
hold_string_utf8 = [{"name": "hold_string_utf8", "address": "1!401100.4",
"attribute": config.NEU_TAG_ATTRIBUTE_RW, "type": config.NEU_TYPE_STRING}]
class TestModbus:
@description(given="created modbus node", when="add multiple tags", then="add success")
@@ -590,8 +595,6 @@ class TestModbus:
assert 200 == response.status_code
assert 1 == len(response.json()["tags"])
@description(given="created modbus node and tags", when="read tags synchronously", then="read fail")
def test_read_tags_sync(self, param):
assert error.NEU_ERR_PLUGIN_NOT_SUPPORT_READ_SYNC == api.read_tag_error(
@@ -787,6 +790,20 @@ class TestModbus:
assert 513.11 == api.read_tag(
node=param[0], group='group', tag=hold_double_decimal[0]['name'])
@description(given="created modbus node and tags", when="write/read tags, check utf8", then="write/read success")
def test_write_read_tags_utf8(self, param):
api.add_tags_check(node=param[0], group='group', tags=hold_uint16_utf8)
api.add_tags_check(node=param[0], group='group', tags=hold_string_utf8)
api.write_tag_check(
node=param[0], group='group', tag=hold_uint16_utf8[0]['name'], value=0xc2a3)
time.sleep(0.3)
assert 0xc2a3 == api.read_tag(
node=param[0], group='group', tag=hold_uint16_utf8[0]['name'])
assert "£" == api.read_tag(
node=param[0], group='group', tag=hold_string_utf8[0]['name'])
@description(given="created modbus node/tag", when="read/write decimal/bias tag", then="read success")
def test_read_decimal_bias_tag(self, param):
tags = [
@@ -855,7 +872,7 @@ class TestModbus:
api.write_tags_check(node=param[0], group=grp, tag_values=tag_values)
# 2. read value + bias
api.update_tags_check(node=param[0], group=grp, tags=tags_bias)
time.sleep(0.2)
time.sleep(0.3)
resp_values = api.read_tags(node=param[0], group=grp).json()['tags']
assert len(tag_values) == len(resp_values)
for tag, value, resp in zip(tags_bias, tag_values, resp_values):
@@ -864,7 +881,7 @@ class TestModbus:
# 3. read value * decimal + bias
api.update_tags_check(
node=param[0], group=grp, tags=tags_decimal_bias)
time.sleep(0.2)
time.sleep(0.3)
resp_values = api.read_tags(node=param[0], group=grp).json()['tags']
assert len(tag_values) == len(resp_values)
for tag, value, resp in zip(tags_decimal_bias, tag_values, resp_values):
@@ -1076,8 +1093,6 @@ class TestModbus:
api.write_tag_check(
node=param[0], group='group', tag=hold_string_H[0]['name'], value='abcd')
api.write_tag_check(
node=param[0], group='group', tag=hold_string_L[0]['name'], value='ABCD')
time.sleep(0.3)
assert 1234== api.read_tag(
@@ -1117,7 +1132,7 @@ class TestModbus:
assert "abcd" == api.read_tag(
node=param[0], group='group', tag=hold_string_H[0]['name'])
assert "ABCD" == api.read_tag(
assert "badc" == api.read_tag(
node=param[0], group='group', tag=hold_string_L[0]['name'])
@description(given="created modbus node/tag", when="read consecutive tags with a length exceeding the protocol limit", then="read success")