Skip to content

GH-14: zpc: Enable testing by default #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 23, 2024
Merged

GH-14: zpc: Enable testing by default #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
779fc6f
GH-24: zpc: Code refactoring of switch color
silabs-borisl Jan 23, 2024
5dd5084
GH-24: zpc: Update test for switch color
rzr Jan 22, 2024
3bcf29f
GH-14: zpc: Enable testing by default
rzr Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 6 additions & 28 deletions applications/zpc/components/zwave_command_classes/src/zwave_command_class_switch_color.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,17 @@

#define LOG_TAG "zwave_command_class_switch_color"

[[maybe_unused]]
static void set_desired_duration(attribute_store_node_t state_node,
uint32_t duration)
static void set_duration(attribute_store_node_t state_node,
attribute_store_node_value_state_t state,
uint32_t duration)
{
attribute_store_node_t duration_node
= attribute_store_get_first_child_by_type(
state_node,
ATTRIBUTE_COMMAND_CLASS_SWITCH_COLOR_DURATION);

attribute_store_set_node_attribute_value(duration_node,
DESIRED_ATTRIBUTE,
(uint8_t *)&duration,
sizeof(duration));
}

static void set_reported_duration(attribute_store_node_t state_node,
uint32_t duration)
{
attribute_store_node_t duration_node
= attribute_store_get_first_child_by_type(
state_node,
ATTRIBUTE_COMMAND_CLASS_SWITCH_COLOR_DURATION);

attribute_store_set_node_attribute_value(duration_node,
REPORTED_ATTRIBUTE,
state,
(uint8_t *)&duration,
sizeof(duration));
}
Expand All @@ -80,15 +66,7 @@ static void
while (component_node != ATTRIBUTE_STORE_INVALID_NODE) {
index += 1;

attribute_store_node_t duration_node
= attribute_store_get_first_child_by_type(
component_node,
ATTRIBUTE_COMMAND_CLASS_SWITCH_COLOR_DURATION);

attribute_store_set_node_attribute_value(duration_node,
value_state,
(uint8_t *)&duration,
sizeof(duration));
set_duration(component_node, value_state, duration);

component_node = attribute_store_get_node_child_by_type(
state_node,
Expand Down Expand Up @@ -166,7 +144,7 @@ static void
state_node,
ATTRIBUTE_COMMAND_CLASS_SWITCH_COLOR_VALUE,
&attribute_store_undefine_desired);
set_reported_duration(state_node, 0);
set_duration(state_node, REPORTED_ATTRIBUTE, 0);
attribute_store_undefine_desired(duration_node);
break;

Expand Down
98 changes: 98 additions & 0 deletions ...cations/zpc/components/zwave_command_classes/test/zwave_command_class_switch_color_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "ZW_classcmd.h"
#include "zwave_utils.h"
#include "zwave_controller_types.h"
#include "zwave_command_class_color_switch_types.h"

// Test helpers
#include "zpc_attribute_store_test_helper.h"
Expand All @@ -47,6 +48,7 @@

// Static variables
static zpc_resolver_event_notification_function_t on_send_complete = NULL;
static attribute_timeout_callback_t switch_color_undefine_reported = NULL;

// Stub functions
static sl_status_t register_send_event_handler_stub(
Expand All @@ -62,10 +64,23 @@ static sl_status_t register_send_event_handler_stub(
return SL_STATUS_OK;
}

static sl_status_t attribute_timeout_set_callback_stub(
attribute_store_node_t node,
clock_time_t duration,
attribute_timeout_callback_t callback_function,
int cmock_num_calls)
{
TEST_ASSERT_EQUAL(ATTRIBUTE_COMMAND_CLASS_SWITCH_COLOR_STATE, attribute_store_get_node_type(node));
switch_color_undefine_reported = callback_function;
return SL_STATUS_OK;
}


/// Setup the test suite (called once before all test_xxx functions are called)
void suiteSetUp()
{
on_send_complete = NULL;
switch_color_undefine_reported = NULL;

datastore_init(":memory:");
attribute_store_init();
Expand Down Expand Up @@ -155,10 +170,93 @@ void test_zwave_command_class_on_send_complete()
TEST_ASSERT_TRUE(
attribute_store_is_value_defined(value_1_node, REPORTED_ATTRIBUTE));

// Test without duration
on_send_complete(state_node,
RESOLVER_SET_RULE,
FRAME_SENT_EVENT_OK_NO_SUPERVISION);

TEST_ASSERT_FALSE(
attribute_store_is_value_defined(value_2_node, REPORTED_ATTRIBUTE));
TEST_ASSERT_FALSE(
attribute_store_is_value_defined(value_2_node, DESIRED_ATTRIBUTE));
TEST_ASSERT_FALSE(
attribute_store_is_value_defined(value_1_node, REPORTED_ATTRIBUTE));
TEST_ASSERT_FALSE(
attribute_store_is_value_defined(value_1_node, DESIRED_ATTRIBUTE));

// Test with duration
value = 0;
attribute_store_set_reported(value_1_node, &value, sizeof(value));
value = 1;
attribute_store_set_desired(value_1_node, &value, sizeof(value));
value = 2;
attribute_store_set_reported(value_2_node, &value, sizeof(value));
value = 3;
attribute_store_set_desired(value_2_node, &value, sizeof(value));

color_component_id_duration_t duration_value = 20;
attribute_store_node_t duration_node
= attribute_store_add_node(ATTRIBUTE_COMMAND_CLASS_SWITCH_COLOR_DURATION,
state_node);
attribute_store_set_desired(duration_node, &duration_value, sizeof(duration_value));

attribute_timeout_set_callback_ExpectAndReturn(
state_node,
zwave_duration_to_time(duration_value) + PROBE_BACK_OFF,
NULL,
SL_STATUS_OK);
attribute_timeout_set_callback_IgnoreArg_callback_function();
attribute_timeout_set_callback_Stub(&attribute_timeout_set_callback_stub);

on_send_complete(state_node,
RESOLVER_SET_RULE,
FRAME_SENT_EVENT_OK_NO_SUPERVISION);
TEST_ASSERT_FALSE(
attribute_store_is_value_defined(value_2_node, DESIRED_ATTRIBUTE));
TEST_ASSERT_FALSE(
attribute_store_is_value_defined(value_1_node, DESIRED_ATTRIBUTE));
TEST_ASSERT_FALSE(
attribute_store_is_value_defined(duration_node, DESIRED_ATTRIBUTE));
TEST_ASSERT_TRUE(
attribute_store_is_value_defined(duration_node, REPORTED_ATTRIBUTE));
TEST_ASSERT_TRUE(
attribute_store_is_value_defined(value_1_node, REPORTED_ATTRIBUTE));
TEST_ASSERT_TRUE(
attribute_store_is_value_defined(value_2_node, REPORTED_ATTRIBUTE));

on_send_complete(state_node,
RESOLVER_SET_RULE,
FRAME_SENT_EVENT_OK_SUPERVISION_NO_SUPPORT);

TEST_ASSERT_FALSE(
attribute_store_is_value_defined(value_1_node, REPORTED_ATTRIBUTE));
}

void test_switch_color_undefine_reported_happy_case()
{
//
TEST_ASSERT_NOT_NULL(switch_color_undefine_reported);

const int COLOR_VALUE_COUNT = 3;

for (int i = 0; i < COLOR_VALUE_COUNT; i++) {
attribute_store_node_t color_value_node
= attribute_store_add_node(ATTRIBUTE_COMMAND_CLASS_SWITCH_COLOR_VALUE,
endpoint_id_node);

attribute_store_set_reported(color_value_node, &i, sizeof(i));
}

switch_color_undefine_reported(endpoint_id_node);

for (int i = 0; i < COLOR_VALUE_COUNT; i++) {
int j;
attribute_store_node_t color_value_node
= attribute_store_add_node(ATTRIBUTE_COMMAND_CLASS_SWITCH_COLOR_VALUE,
endpoint_id_node);

TEST_ASSERT_EQUAL(
SL_STATUS_FAIL,
attribute_store_get_reported(color_value_node, &j, sizeof(j)));
}
}
2 changes: 1 addition & 1 deletion helper.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ zpc/build: zpc/configure build
zpc/test: ${build_dir}/applications/zpc/components/zwave_command_classes/test/
ctest --test-dir ${<}

zpc/default: zpc/configure zpc/build
zpc/default: zpc/configure zpc/build zpc/test
@date -u

### @rootfs is faster than docker for env check
Expand Down