Skip to content

Commit cadb080

Browse files
Zhaoningxcarlescufi
authored andcommitted
tests: subsys: modbus cases move to new ztest API
Move test to use new ztest API. Signed-off-by: NingX Zhao <[email protected]>
1 parent ac50f8a commit cadb080

File tree

2 files changed

+65
-49
lines changed

2 files changed

+65
-49
lines changed

tests/subsys/modbus/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
CONFIG_LOG=y
55
CONFIG_ZTEST=y
6+
CONFIG_ZTEST_NEW_API=y
67
CONFIG_SERIAL=y
78
CONFIG_UART_INTERRUPT_DRIVEN=y
89
CONFIG_UART_LINE_CTRL=n

tests/subsys/modbus/src/main.c

Lines changed: 64 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,69 @@
66

77
#include "test_modbus.h"
88

9-
void test_main(void)
9+
ZTEST(modbus, test_setup_low_none)
1010
{
11-
ztest_test_suite(modbus_client_test,
12-
ztest_unit_test(test_server_setup_low_none),
13-
ztest_unit_test(test_client_setup_low_none),
14-
ztest_unit_test(test_coil_wr_rd),
15-
ztest_unit_test(test_di_rd),
16-
ztest_unit_test(test_input_reg),
17-
ztest_unit_test(test_holding_reg),
18-
ztest_unit_test(test_diagnostic),
19-
ztest_unit_test(test_client_disable),
20-
ztest_unit_test(test_server_disable),
21-
ztest_unit_test(test_server_setup_low_odd),
22-
ztest_unit_test(test_client_setup_low_odd),
23-
ztest_unit_test(test_coil_wr_rd),
24-
ztest_unit_test(test_di_rd),
25-
ztest_unit_test(test_input_reg),
26-
ztest_unit_test(test_holding_reg),
27-
ztest_unit_test(test_diagnostic),
28-
ztest_unit_test(test_client_disable),
29-
ztest_unit_test(test_server_disable),
30-
ztest_unit_test(test_server_setup_high_even),
31-
ztest_unit_test(test_client_setup_high_even),
32-
ztest_unit_test(test_coil_wr_rd),
33-
ztest_unit_test(test_di_rd),
34-
ztest_unit_test(test_input_reg),
35-
ztest_unit_test(test_holding_reg),
36-
ztest_unit_test(test_diagnostic),
37-
ztest_unit_test(test_client_disable),
38-
ztest_unit_test(test_server_disable),
39-
ztest_unit_test(test_server_setup_ascii),
40-
ztest_unit_test(test_client_setup_ascii),
41-
ztest_unit_test(test_coil_wr_rd),
42-
ztest_unit_test(test_di_rd),
43-
ztest_unit_test(test_input_reg),
44-
ztest_unit_test(test_holding_reg),
45-
ztest_unit_test(test_diagnostic),
46-
ztest_unit_test(test_client_disable),
47-
ztest_unit_test(test_server_disable),
48-
ztest_unit_test(test_server_setup_raw),
49-
ztest_unit_test(test_client_setup_raw),
50-
ztest_unit_test(test_coil_wr_rd),
51-
ztest_unit_test(test_di_rd),
52-
ztest_unit_test(test_input_reg),
53-
ztest_unit_test(test_holding_reg),
54-
ztest_unit_test(test_diagnostic),
55-
ztest_unit_test(test_client_disable),
56-
ztest_unit_test(test_server_disable)
57-
);
58-
ztest_run_test_suite(modbus_client_test);
11+
test_server_setup_low_none();
12+
test_client_setup_low_none();
13+
test_coil_wr_rd();
14+
test_di_rd();
15+
test_input_reg();
16+
test_holding_reg();
17+
test_diagnostic();
18+
test_client_disable();
19+
test_server_disable();
5920
}
21+
22+
ZTEST(modbus, test_setup_low_odd)
23+
{
24+
test_server_setup_low_odd();
25+
test_client_setup_low_odd();
26+
test_coil_wr_rd();
27+
test_di_rd();
28+
test_input_reg();
29+
test_holding_reg();
30+
test_diagnostic();
31+
test_client_disable();
32+
test_server_disable();
33+
}
34+
35+
ZTEST(modbus, test_setup_high_even)
36+
{
37+
test_server_setup_high_even();
38+
test_client_setup_high_even();
39+
test_coil_wr_rd();
40+
test_di_rd();
41+
test_input_reg();
42+
test_holding_reg();
43+
test_diagnostic();
44+
test_client_disable();
45+
test_server_disable();
46+
}
47+
48+
ZTEST(modbus, test_setup_ascii)
49+
{
50+
test_server_setup_ascii();
51+
test_client_setup_ascii();
52+
test_coil_wr_rd();
53+
test_di_rd();
54+
test_input_reg();
55+
test_holding_reg();
56+
test_diagnostic();
57+
test_client_disable();
58+
test_server_disable();
59+
}
60+
61+
ZTEST(modbus, test_setup_raw)
62+
{
63+
test_server_setup_raw();
64+
test_client_setup_raw();
65+
test_coil_wr_rd();
66+
test_di_rd();
67+
test_input_reg();
68+
test_holding_reg();
69+
test_diagnostic();
70+
test_client_disable();
71+
test_server_disable();
72+
}
73+
74+
ZTEST_SUITE(modbus, NULL, NULL, NULL, NULL, NULL);

0 commit comments

Comments
 (0)