From 0426552ad61d39e539f783a0cb2e6202ccaa742d Mon Sep 17 00:00:00 2001 From: ismail Date: Mon, 14 Jul 2025 12:11:51 +0300 Subject: [PATCH] Fix invalid ID test loops. --- test_apps/main/test_relay_chn.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/test_apps/main/test_relay_chn.c b/test_apps/main/test_relay_chn.c index 5360cc8..aad6822 100644 --- a/test_apps/main/test_relay_chn.c +++ b/test_apps/main/test_relay_chn.c @@ -62,8 +62,9 @@ TEST_CASE("Relay channels run forward and update state", "[relay_chn]") { // TEST_CASE 3: Test that relays do nothing when an invlid channel id given TEST_CASE("Run reverse does nothing if channel id is invalid", "[relay_chn]") { - for (uint8_t i = relay_chn_count*2; i < relay_chn_count; i++) { - relay_chn_run_reverse(i); // relay_chn_run_forward returns void + for (uint8_t i = 0; i < relay_chn_count; i++) { + int invalid_id = relay_chn_count * 2 + i; + relay_chn_run_reverse(invalid_id); // relay_chn_run_forward returns void // Short delay for state to update vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms)); TEST_ASSERT_EQUAL(RELAY_CHN_STATE_FREE, relay_chn_get_state(i)); @@ -102,27 +103,31 @@ TEST_CASE("Relay channels stop and update to FREE state", "[relay_chn]") { // TEST_CASE 6: Get state should return UNDEFINED when id is not valid TEST_CASE("Get state returns UNDEFINED when id is invalid", "[relay_chn]") { - for (uint8_t i = relay_chn_count*2; i < relay_chn_count; i++) { - TEST_ASSERT_EQUAL(RELAY_CHN_STATE_UNDEFINED, relay_chn_get_state(i)); + for (uint8_t i = 0; i < relay_chn_count; i++) { + int invalid_id = relay_chn_count * 2 + i; + TEST_ASSERT_EQUAL(RELAY_CHN_STATE_UNDEFINED, relay_chn_get_state(invalid_id)); } // Test for running states also relay_chn_run_forward(RELAY_CHN_ID_ALL); vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms)); - for (uint8_t i = relay_chn_count*2; i < relay_chn_count; i++) { - TEST_ASSERT_EQUAL(RELAY_CHN_STATE_UNDEFINED, relay_chn_get_state(i)); + for (uint8_t i = 0; i < relay_chn_count; i++) { + int invalid_id = relay_chn_count * 2 + i; + TEST_ASSERT_EQUAL(RELAY_CHN_STATE_UNDEFINED, relay_chn_get_state(invalid_id)); } } // TEST_CASE 7: Get state string should return "UNKNOWN" when id is not valid TEST_CASE("Get state string returns UNKNOWN when id is invalid", "[relay_chn]") { - for (uint8_t i = relay_chn_count*2; i < relay_chn_count; i++) { - TEST_ASSERT_EQUAL_STRING("UNKNOWN", relay_chn_get_state_str(i)); + for (uint8_t i = 0; i < relay_chn_count; i++) { + int invalid_id = relay_chn_count * 2 + i; + TEST_ASSERT_EQUAL_STRING("UNKNOWN", relay_chn_get_state_str(invalid_id)); } // Test for running states also relay_chn_run_forward(RELAY_CHN_ID_ALL); vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms)); - for (uint8_t i = relay_chn_count*2; i < relay_chn_count; i++) { - TEST_ASSERT_EQUAL_STRING("UNKNOWN", relay_chn_get_state_str(i)); + for (uint8_t i = 0; i < relay_chn_count; i++) { + int invalid_id = relay_chn_count * 2 + i; + TEST_ASSERT_EQUAL_STRING("UNKNOWN", relay_chn_get_state_str(invalid_id)); } }