GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-24 02:39:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1965 from hxy7yx/main-2

Browse Source 
increase test coverage
This commit is contained in:
fengzeroz
2024-04-29 15:55:31 +08:00
committed by GitHub
parent d724c52cb2 407f650fe1
commit bbbb7c2b1a
3 changed files with 100 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simulator/modbus_s.c
+1 -1
View File
@@ -384,7 +384,7 @@ static void modbus_write(struct modbus_register *reg, uint8_t function,
break;
case MODBUS_WRITE_M_COIL:
for (int i = 0; i < ntohs(address->n_reg); i++) {
uint8_t x = (value[ntohs(address->n_reg) / 8] >> (i % 8)) & 0x1;
uint8_t x = (value[i / 8] >> (i % 8)) & 0x1;
nlog_info("write coil byte: %d, %d\n", x, i);
if (x > 0) {
tests/ft/driver/test_modbus.py
+80
View File
@@ -108,6 +108,37 @@ hold_bytes = [{"name": "hold_bytes", "address": "1!400040.10",
hold_double = [{"name": "hold_double", "address": "1!400050",
"attribute": config.NEU_TAG_ATTRIBUTE_RW_SUBSCRIBE, "type": config.NEU_TYPE_DOUBLE}]
hold_bit_0 = [{"name": "hold_bit_0", "address": "1!400001.0",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_1 = [{"name": "hold_bit_1", "address": "1!400001.1",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_2 = [{"name": "hold_bit_2", "address": "1!400001.2",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_3 = [{"name": "hold_bit_3", "address": "1!400001.3",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_4 = [{"name": "hold_bit_4", "address": "1!400001.4",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_5 = [{"name": "hold_bit_5", "address": "1!400001.5",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_6 = [{"name": "hold_bit_6", "address": "1!400001.6",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_7 = [{"name": "hold_bit_7", "address": "1!400001.7",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_8 = [{"name": "hold_bit_8", "address": "1!400001.8",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_9 = [{"name": "hold_bit_9", "address": "1!400001.9",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_10 = [{"name": "hold_bit_10", "address": "1!400001.10",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_11 = [{"name": "hold_bit_11", "address": "1!400001.11",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_12 = [{"name": "hold_bit_12", "address": "1!400001.12",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_13 = [{"name": "hold_bit_13", "address": "1!400001.13",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
hold_bit_14 = [{"name": "hold_bit_14", "address": "1!400001.14",
"attribute": config.NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": config.NEU_TYPE_BIT}]
coil_bit_1 = [{"name": "coil_bit_1", "address": "1!000001",
"attribute": config.NEU_TAG_ATTRIBUTE_RW, "type": config.NEU_TYPE_BIT}]
coil_bit_2 = [{"name": "coil_bit_2", "address": "1!000002",
@@ -330,6 +361,22 @@ class TestModbus:
api.add_tags_check(node=param[0], group='group', tags=hold_string)
api.add_tags_check(node=param[0], group='group', tags=hold_bytes)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_0)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_1)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_2)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_3)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_4)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_5)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_6)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_7)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_8)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_9)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_10)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_11)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_12)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_13)
api.add_tags_check(node=param[0], group='group', tags=hold_bit_14)
api.add_tags_check(
node=param[0], group='group', tags=input_register_bit)
api.add_tags_check(
@@ -520,6 +567,39 @@ class TestModbus:
assert len(bytes) == 10
assert bytes == [0x1, 0x2, 0x3, 0x4, 0, 0, 0, 0, 0, 0]
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_0[0]['name'])
assert 0 == api.read_tag(
node=param[0], group='group', tag=hold_bit_1[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_2[0]['name'])
assert 0 == api.read_tag(
node=param[0], group='group', tag=hold_bit_3[0]['name'])
assert 0 == api.read_tag(
node=param[0], group='group', tag=hold_bit_4[0]['name'])
assert 0 == api.read_tag(
node=param[0], group='group', tag=hold_bit_5[0]['name'])
assert 0 == api.read_tag(
node=param[0], group='group', tag=hold_bit_6[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_7[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_8[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_9[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_10[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_11[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_12[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_13[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit_14[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=hold_bit[0]['name'])
assert 1 == api.read_tag(
node=param[0], group='group', tag=coil_bit_1[0]['name'])
assert 0 == api.read_tag(
tests/ft/persist/test_persist.py
+19 -1
View File
@@ -3,7 +3,8 @@ from neuron.config import *
from neuron.common import description
import neuron.process as process
from neuron.error import *
import shutil
import os
hold_bit = [{"name": "hold_bit", "address": "1!400001.15",
"attribute": NEU_TAG_ATTRIBUTE_READ_SUBSCRIBE, "type": NEU_TYPE_BIT}]
@@ -438,4 +439,21 @@ class TestPersist:
group_names = [group['group'] for group in response.json()['groups']]
assert "group-2" not in group_names
p.stop()
@description(given="upload pem in certs", when="login", then="success")
def test_jwt(self):
if not os.path.exists('./build/certs/'):
os.makedirs('./build/certs/')
shutil.copyfile('./build/config/neuron.pem', './build/certs/neuron.pem')
p = process.NeuronProcess()
p.start()
response = api.login()
assert 200 == response.status_code
shutil.rmtree('./build/certs/')
p.stop()