From 5319c7b0425d7237d1f19aaea817f56ca249c7df Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Tue, 2 Mar 2021 21:59:29 +0100 Subject: [PATCH] tests: modbus: remove _rtu_ from modbus test Remove _rtu_ from modbus test. Signed-off-by: Johann Fischer --- .../{modbus_rtu => modbus}/CMakeLists.txt | 2 +- .../boards/frdm_k64f.overlay | 0 .../boards/reel_board.overlay | 0 tests/subsys/{modbus_rtu => modbus}/prj.conf | 0 tests/subsys/modbus/src/main.c | 50 +++++++++++++++++ .../{modbus_rtu => modbus}/src/test_modbus.h | 30 +++++------ .../src/test_modbus_client.c | 40 +++++++------- .../src/test_modbus_server.c | 54 +++++++++---------- .../{modbus_rtu => modbus}/testcase.yaml | 0 tests/subsys/modbus_rtu/src/main.c | 50 ----------------- 10 files changed, 113 insertions(+), 113 deletions(-) rename tests/subsys/{modbus_rtu => modbus}/CMakeLists.txt (91%) rename tests/subsys/{modbus_rtu => modbus}/boards/frdm_k64f.overlay (100%) rename tests/subsys/{modbus_rtu => modbus}/boards/reel_board.overlay (100%) rename tests/subsys/{modbus_rtu => modbus}/prj.conf (100%) create mode 100644 tests/subsys/modbus/src/main.c rename tests/subsys/{modbus_rtu => modbus}/src/test_modbus.h (57%) rename tests/subsys/{modbus_rtu => modbus}/src/test_modbus_client.c (90%) rename tests/subsys/{modbus_rtu => modbus}/src/test_modbus_server.c (77%) rename tests/subsys/{modbus_rtu => modbus}/testcase.yaml (100%) delete mode 100644 tests/subsys/modbus_rtu/src/main.c diff --git a/tests/subsys/modbus_rtu/CMakeLists.txt b/tests/subsys/modbus/CMakeLists.txt similarity index 91% rename from tests/subsys/modbus_rtu/CMakeLists.txt rename to tests/subsys/modbus/CMakeLists.txt index 3dd3e840e96..782c66e1191 100644 --- a/tests/subsys/modbus_rtu/CMakeLists.txt +++ b/tests/subsys/modbus/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(test_modbus_rtu) +project(test_modbus) target_sources(app PRIVATE src/main.c diff --git a/tests/subsys/modbus_rtu/boards/frdm_k64f.overlay b/tests/subsys/modbus/boards/frdm_k64f.overlay similarity index 100% rename from tests/subsys/modbus_rtu/boards/frdm_k64f.overlay rename to tests/subsys/modbus/boards/frdm_k64f.overlay diff --git a/tests/subsys/modbus_rtu/boards/reel_board.overlay b/tests/subsys/modbus/boards/reel_board.overlay similarity index 100% rename from tests/subsys/modbus_rtu/boards/reel_board.overlay rename to tests/subsys/modbus/boards/reel_board.overlay diff --git a/tests/subsys/modbus_rtu/prj.conf b/tests/subsys/modbus/prj.conf similarity index 100% rename from tests/subsys/modbus_rtu/prj.conf rename to tests/subsys/modbus/prj.conf diff --git a/tests/subsys/modbus/src/main.c b/tests/subsys/modbus/src/main.c new file mode 100644 index 00000000000..78636515b77 --- /dev/null +++ b/tests/subsys/modbus/src/main.c @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2020 PHYTEC Messtechnik GmbH + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "test_modbus.h" + +void test_main(void) +{ + ztest_test_suite(modbus_client_test, + ztest_unit_test(test_server_setup_low_none), + ztest_unit_test(test_client_setup_low_none), + ztest_unit_test(test_coil_wr_rd), + ztest_unit_test(test_di_rd), + ztest_unit_test(test_input_reg), + ztest_unit_test(test_holding_reg), + ztest_unit_test(test_diagnostic), + ztest_unit_test(test_client_disable), + ztest_unit_test(test_server_disable), + ztest_unit_test(test_server_setup_low_odd), + ztest_unit_test(test_client_setup_low_odd), + ztest_unit_test(test_coil_wr_rd), + ztest_unit_test(test_di_rd), + ztest_unit_test(test_input_reg), + ztest_unit_test(test_holding_reg), + ztest_unit_test(test_diagnostic), + ztest_unit_test(test_client_disable), + ztest_unit_test(test_server_disable), + ztest_unit_test(test_server_setup_high_even), + ztest_unit_test(test_client_setup_high_even), + ztest_unit_test(test_coil_wr_rd), + ztest_unit_test(test_di_rd), + ztest_unit_test(test_input_reg), + ztest_unit_test(test_holding_reg), + ztest_unit_test(test_diagnostic), + ztest_unit_test(test_client_disable), + ztest_unit_test(test_server_disable), + ztest_unit_test(test_server_setup_ascii), + ztest_unit_test(test_client_setup_ascii), + ztest_unit_test(test_coil_wr_rd), + ztest_unit_test(test_di_rd), + ztest_unit_test(test_input_reg), + ztest_unit_test(test_holding_reg), + ztest_unit_test(test_diagnostic), + ztest_unit_test(test_client_disable), + ztest_unit_test(test_server_disable) + ); + ztest_run_test_suite(modbus_client_test); +} diff --git a/tests/subsys/modbus_rtu/src/test_modbus.h b/tests/subsys/modbus/src/test_modbus.h similarity index 57% rename from tests/subsys/modbus_rtu/src/test_modbus.h rename to tests/subsys/modbus/src/test_modbus.h index 26079341284..71d5ad15050 100644 --- a/tests/subsys/modbus_rtu/src/test_modbus.h +++ b/tests/subsys/modbus/src/test_modbus.h @@ -30,21 +30,21 @@ #define MB_TEST_IFACE_SERVER 0 #endif -void test_server_rtu_setup_low_none(void); -void test_server_rtu_setup_low_odd(void); -void test_server_rtu_setup_high_even(void); -void test_server_rtu_setup_ascii(void); -void test_server_rtu_disable(void); +void test_server_setup_low_none(void); +void test_server_setup_low_odd(void); +void test_server_setup_high_even(void); +void test_server_setup_ascii(void); +void test_server_disable(void); -void test_client_rtu_setup_low_none(void); -void test_client_rtu_setup_low_odd(void); -void test_client_rtu_setup_high_even(void); -void test_client_rtu_setup_ascii(void); -void test_rtu_coil_wr_rd(void); -void test_rtu_di_rd(void); -void test_rtu_input_reg(void); -void test_rtu_holding_reg(void); -void test_rtu_diagnostic(void); -void test_client_rtu_disable(void); +void test_client_setup_low_none(void); +void test_client_setup_low_odd(void); +void test_client_setup_high_even(void); +void test_client_setup_ascii(void); +void test_coil_wr_rd(void); +void test_di_rd(void); +void test_input_reg(void); +void test_holding_reg(void); +void test_diagnostic(void); +void test_client_disable(void); #endif /* __TEST_MODBUS_H__ */ diff --git a/tests/subsys/modbus_rtu/src/test_modbus_client.c b/tests/subsys/modbus/src/test_modbus_client.c similarity index 90% rename from tests/subsys/modbus_rtu/src/test_modbus_client.c rename to tests/subsys/modbus/src/test_modbus_client.c index d08a7ca56b9..649f27dbba0 100644 --- a/tests/subsys/modbus_rtu/src/test_modbus_client.c +++ b/tests/subsys/modbus/src/test_modbus_client.c @@ -16,7 +16,7 @@ const static uint8_t node = MB_TEST_NODE_ADDR; const static uint16_t offset_oor = 32; const static uint16_t fp_offset_oor = fp_offset + offset_oor; -void test_rtu_coil_wr_rd(void) +void test_coil_wr_rd(void) { const uint8_t coil_qty = 16; uint8_t coil[3] = {0}; @@ -55,7 +55,7 @@ void test_rtu_coil_wr_rd(void) zassert_not_equal(err, 0, "FC15 out of range request not failed"); } -void test_rtu_di_rd(void) +void test_di_rd(void) { const uint8_t di_qty = 16; uint8_t di[4] = {0}; @@ -74,7 +74,7 @@ void test_rtu_di_rd(void) zassert_not_equal(err, 0, "FC02 out of range request not failed"); } -void test_rtu_input_reg(void) +void test_input_reg(void) { uint16_t ir[8] = {0}; int err; @@ -95,7 +95,7 @@ void test_rtu_input_reg(void) zassert_not_equal(err, 0, "FC04 out of range request not failed"); } -void test_rtu_holding_reg(void) +void test_holding_reg(void) { uint16_t hr_wr[8] = {0, 2, 1, 3, 5, 4, 7, 6}; uint16_t hr_rd[8] = {0}; @@ -182,7 +182,7 @@ void test_rtu_holding_reg(void) "FC16FP verify failed"); } -void test_rtu_diagnostic(void) +void test_diagnostic(void) { uint16_t data = 0xcafe; int err; @@ -196,7 +196,7 @@ void test_rtu_diagnostic(void) zassert_not_equal(err, 0, "FC08 not supported request not failed"); } -void test_client_rtu_setup_low_none(void) +void test_client_setup_low_none(void) { int err; @@ -206,7 +206,7 @@ void test_client_rtu_setup_low_none(void) zassert_equal(err, 0, "Failed to configure RTU client"); } -void test_client_rtu_setup_low_odd(void) +void test_client_setup_low_odd(void) { int err; @@ -216,7 +216,7 @@ void test_client_rtu_setup_low_odd(void) zassert_equal(err, 0, "Failed to configure RTU client"); } -void test_client_rtu_setup_high_even(void) +void test_client_setup_high_even(void) { int err; @@ -226,7 +226,7 @@ void test_client_rtu_setup_high_even(void) zassert_equal(err, 0, "Failed to configure RTU client"); } -void test_client_rtu_setup_ascii(void) +void test_client_setup_ascii(void) { int err; @@ -236,7 +236,7 @@ void test_client_rtu_setup_ascii(void) zassert_equal(err, 0, "Failed to configure RTU client"); } -void test_client_rtu_disable(void) +void test_client_disable(void) { int err; @@ -246,52 +246,52 @@ void test_client_rtu_disable(void) #else -void test_client_rtu_setup_low_none(void) +void test_client_setup_low_none(void) { ztest_test_skip(); } -void test_client_rtu_setup_low_odd(void) +void test_client_setup_low_odd(void) { ztest_test_skip(); } -void test_client_rtu_setup_high_even(void) +void test_client_setup_high_even(void) { ztest_test_skip(); } -void test_client_rtu_setup_ascii(void) +void test_client_setup_ascii(void) { ztest_test_skip(); } -void test_rtu_coil_wr_rd(void) +void test_coil_wr_rd(void) { ztest_test_skip(); } -void test_rtu_di_rd(void) +void test_di_rd(void) { ztest_test_skip(); } -void test_rtu_input_reg(void) +void test_input_reg(void) { ztest_test_skip(); } -void test_rtu_holding_reg(void) +void test_holding_reg(void) { ztest_test_skip(); } -void test_rtu_diagnostic(void) +void test_diagnostic(void) { ztest_test_skip(); } -void test_client_rtu_disable(void) +void test_client_disable(void) { ztest_test_skip(); } diff --git a/tests/subsys/modbus_rtu/src/test_modbus_server.c b/tests/subsys/modbus/src/test_modbus_server.c similarity index 77% rename from tests/subsys/modbus_rtu/src/test_modbus_server.c rename to tests/subsys/modbus/src/test_modbus_server.c index eb5455d9c10..85f9784fe40 100644 --- a/tests/subsys/modbus_rtu/src/test_modbus_server.c +++ b/tests/subsys/modbus/src/test_modbus_server.c @@ -10,17 +10,17 @@ LOG_MODULE_REGISTER(mbs_test, LOG_LEVEL_INF); const static uint16_t fp_offset = MB_TEST_FP_OFFSET; -static uint16_t test_coils; -static uint16_t test_holding_reg[8]; -static float test_holding_fp[4]; +static uint16_t coils; +static uint16_t holding_reg[8]; +static float holding_fp[4]; static int coil_rd(uint16_t addr, bool *state) { - if (addr >= (sizeof(test_coils) * 8)) { + if (addr >= (sizeof(coils) * 8)) { return -ENOTSUP; } - if (test_coils & BIT(addr)) { + if (coils & BIT(addr)) { *state = true; } else { *state = false; @@ -33,14 +33,14 @@ static int coil_rd(uint16_t addr, bool *state) static int coil_wr(uint16_t addr, bool state) { - if (addr >= (sizeof(test_coils) * 8)) { + if (addr >= (sizeof(coils) * 8)) { return -ENOTSUP; } if (state == true) { - test_coils |= BIT(addr); + coils |= BIT(addr); } else { - test_coils &= ~BIT(addr); + coils &= ~BIT(addr); } LOG_DBG("Coil write, addr %u, %d", addr, (int)state); @@ -50,11 +50,11 @@ static int coil_wr(uint16_t addr, bool state) static int discrete_input_rd(uint16_t addr, bool *state) { - if (addr >= (sizeof(test_coils) * 8)) { + if (addr >= (sizeof(coils) * 8)) { return -ENOTSUP; } - if (test_coils & BIT(addr)) { + if (coils & BIT(addr)) { *state = true; } else { *state = false; @@ -67,11 +67,11 @@ static int discrete_input_rd(uint16_t addr, bool *state) static int input_reg_rd(uint16_t addr, uint16_t *reg) { - if (addr >= ARRAY_SIZE(test_holding_reg)) { + if (addr >= ARRAY_SIZE(holding_reg)) { return -ENOTSUP; } - *reg = test_holding_reg[addr]; + *reg = holding_reg[addr]; LOG_DBG("Input register read, addr %u, 0x%04x", addr, *reg); @@ -81,11 +81,11 @@ static int input_reg_rd(uint16_t addr, uint16_t *reg) static int input_reg_rd_fp(uint16_t addr, float *reg) { if ((addr < fp_offset) || - (addr >= (ARRAY_SIZE(test_holding_fp) + fp_offset))) { + (addr >= (ARRAY_SIZE(holding_fp) + fp_offset))) { return -ENOTSUP; } - *reg = test_holding_fp[addr - fp_offset]; + *reg = holding_fp[addr - fp_offset]; LOG_DBG("FP input register read, addr %u", addr); @@ -94,11 +94,11 @@ static int input_reg_rd_fp(uint16_t addr, float *reg) static int holding_reg_rd(uint16_t addr, uint16_t *reg) { - if (addr >= ARRAY_SIZE(test_holding_reg)) { + if (addr >= ARRAY_SIZE(holding_reg)) { return -ENOTSUP; } - *reg = test_holding_reg[addr]; + *reg = holding_reg[addr]; LOG_DBG("Holding register read, addr %u", addr); @@ -107,11 +107,11 @@ static int holding_reg_rd(uint16_t addr, uint16_t *reg) static int holding_reg_wr(uint16_t addr, uint16_t reg) { - if (addr >= ARRAY_SIZE(test_holding_reg)) { + if (addr >= ARRAY_SIZE(holding_reg)) { return -ENOTSUP; } - test_holding_reg[addr] = reg; + holding_reg[addr] = reg; LOG_DBG("Holding register write, addr %u", addr); @@ -121,11 +121,11 @@ static int holding_reg_wr(uint16_t addr, uint16_t reg) static int holding_reg_rd_fp(uint16_t addr, float *reg) { if ((addr < fp_offset) || - (addr >= (ARRAY_SIZE(test_holding_fp) + fp_offset))) { + (addr >= (ARRAY_SIZE(holding_fp) + fp_offset))) { return -ENOTSUP; } - *reg = test_holding_fp[addr - fp_offset]; + *reg = holding_fp[addr - fp_offset]; LOG_DBG("FP holding register read, addr %u", addr); @@ -135,11 +135,11 @@ static int holding_reg_rd_fp(uint16_t addr, float *reg) static int holding_reg_wr_fp(uint16_t addr, float reg) { if ((addr < fp_offset) || - (addr >= (ARRAY_SIZE(test_holding_fp) + fp_offset))) { + (addr >= (ARRAY_SIZE(holding_fp) + fp_offset))) { return -ENOTSUP; } - test_holding_fp[addr - fp_offset] = reg; + holding_fp[addr - fp_offset] = reg; LOG_DBG("FP holding register write, addr %u", addr); @@ -164,7 +164,7 @@ static struct modbus_user_callbacks mbs_cbs = { .holding_reg_wr_fp = holding_reg_wr_fp, }; -void test_server_rtu_setup_low_odd(void) +void test_server_setup_low_odd(void) { int err; @@ -179,7 +179,7 @@ void test_server_rtu_setup_low_odd(void) } } -void test_server_rtu_setup_low_none(void) +void test_server_setup_low_none(void) { int err; @@ -194,7 +194,7 @@ void test_server_rtu_setup_low_none(void) } } -void test_server_rtu_setup_high_even(void) +void test_server_setup_high_even(void) { int err; @@ -209,7 +209,7 @@ void test_server_rtu_setup_high_even(void) } } -void test_server_rtu_setup_ascii(void) +void test_server_setup_ascii(void) { int err; @@ -224,7 +224,7 @@ void test_server_rtu_setup_ascii(void) } } -void test_server_rtu_disable(void) +void test_server_disable(void) { int err; diff --git a/tests/subsys/modbus_rtu/testcase.yaml b/tests/subsys/modbus/testcase.yaml similarity index 100% rename from tests/subsys/modbus_rtu/testcase.yaml rename to tests/subsys/modbus/testcase.yaml diff --git a/tests/subsys/modbus_rtu/src/main.c b/tests/subsys/modbus_rtu/src/main.c deleted file mode 100644 index 12109dc43b8..00000000000 --- a/tests/subsys/modbus_rtu/src/main.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2020 PHYTEC Messtechnik GmbH - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "test_modbus.h" - -void test_main(void) -{ - ztest_test_suite(modbus_client_test, - ztest_unit_test(test_server_rtu_setup_low_none), - ztest_unit_test(test_client_rtu_setup_low_none), - ztest_unit_test(test_rtu_coil_wr_rd), - ztest_unit_test(test_rtu_di_rd), - ztest_unit_test(test_rtu_input_reg), - ztest_unit_test(test_rtu_holding_reg), - ztest_unit_test(test_rtu_diagnostic), - ztest_unit_test(test_client_rtu_disable), - ztest_unit_test(test_server_rtu_disable), - ztest_unit_test(test_server_rtu_setup_low_odd), - ztest_unit_test(test_client_rtu_setup_low_odd), - ztest_unit_test(test_rtu_coil_wr_rd), - ztest_unit_test(test_rtu_di_rd), - ztest_unit_test(test_rtu_input_reg), - ztest_unit_test(test_rtu_holding_reg), - ztest_unit_test(test_rtu_diagnostic), - ztest_unit_test(test_client_rtu_disable), - ztest_unit_test(test_server_rtu_disable), - ztest_unit_test(test_server_rtu_setup_high_even), - ztest_unit_test(test_client_rtu_setup_high_even), - ztest_unit_test(test_rtu_coil_wr_rd), - ztest_unit_test(test_rtu_di_rd), - ztest_unit_test(test_rtu_input_reg), - ztest_unit_test(test_rtu_holding_reg), - ztest_unit_test(test_rtu_diagnostic), - ztest_unit_test(test_client_rtu_disable), - ztest_unit_test(test_server_rtu_disable), - ztest_unit_test(test_server_rtu_setup_ascii), - ztest_unit_test(test_client_rtu_setup_ascii), - ztest_unit_test(test_rtu_coil_wr_rd), - ztest_unit_test(test_rtu_di_rd), - ztest_unit_test(test_rtu_input_reg), - ztest_unit_test(test_rtu_holding_reg), - ztest_unit_test(test_rtu_diagnostic), - ztest_unit_test(test_client_rtu_disable), - ztest_unit_test(test_server_rtu_disable) - ); - ztest_run_test_suite(modbus_client_test); -}