Skip to content

Commit 052aa8d

Browse files
mkardous-silabsmkardous-silabs
committed
Clean up unit tests
1 parent 8e2664c commit 052aa8d

File tree

12 files changed

+164
-513
lines changed

12 files changed

+164
-513
lines changed

‎examples/platform/silabs/SiWx917/BUILD.gn

+1-28
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ declare_args() {
2727

2828
# OTA timeout in seconds
2929
ota_periodic_query_timeout_sec = 86400
30-
31-
# The EnableKey in hex string format used by TestEventTrigger command in
32-
# GeneralDiagnostics cluster. The length of the string should be 16 bytes.
33-
sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"
3430
}
3531

3632
# Sanity check
@@ -53,29 +49,6 @@ config("chip_examples_project_config") {
5349
]
5450
}
5551

56-
config("test-event-trigger-config") {
57-
defines = [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED" ]
58-
59-
if (is_debug) {
60-
defines += [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"" ]
61-
}
62-
}
63-
64-
source_set("test-event-trigger") {
65-
sources = [
66-
"${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.cpp",
67-
"${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
68-
]
69-
70-
deps = [ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
71-
public_configs = [ ":test-event-trigger-config" ]
72-
public_deps = [
73-
"${chip_root}/src/app:test-event-trigger",
74-
"${chip_root}/src/lib/core",
75-
"${chip_root}/src/lib/support",
76-
]
77-
}
78-
7952
source_set("matter-shell") {
8053
defines = [ "ENABLE_CHIP_SHELL" ]
8154

@@ -195,7 +168,7 @@ source_set("siwx917-common") {
195168
]
196169

197170
if (sl_enable_test_event_trigger) {
198-
public_deps += [ ":test-event-trigger" ]
171+
public_deps += [ "${silabs_common_plat_dir}/test-event-trigger:sources" ]
199172
}
200173

201174
if (sl_enable_si70xx_sensor) {

‎examples/platform/silabs/efr32/BUILD.gn

+1-28
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ declare_args() {
2626

2727
# OTA timeout in seconds
2828
ota_periodic_query_timeout_sec = 86400
29-
30-
# The EnableKey in hex string format used by TestEventTrigger command in
31-
# GeneralDiagnostics cluster. The length of the string should be 16 bytes.
32-
sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"
3329
}
3430

3531
import("${silabs_common_plat_dir}/args.gni")
@@ -57,29 +53,6 @@ config("chip_examples_project_config") {
5753
]
5854
}
5955

60-
config("test-event-trigger-config") {
61-
defines = [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED" ]
62-
63-
if (is_debug) {
64-
defines += [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"" ]
65-
}
66-
}
67-
68-
source_set("test-event-trigger") {
69-
sources = [
70-
"${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.cpp",
71-
"${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
72-
]
73-
74-
deps = [ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
75-
public_configs = [ ":test-event-trigger-config" ]
76-
public_deps = [
77-
"${chip_root}/src/app:test-event-trigger",
78-
"${chip_root}/src/lib/core",
79-
"${chip_root}/src/lib/support",
80-
]
81-
}
82-
8356
source_set("openthread_core_config_efr32_chip_examples") {
8457
if (chip_enable_openthread) {
8558
sources = [ "project_include/OpenThreadConfig.h" ]
@@ -222,7 +195,7 @@ source_set("efr32-common") {
222195
]
223196

224197
if (sl_enable_test_event_trigger) {
225-
public_deps += [ ":test-event-trigger" ]
198+
public_deps += [ "${silabs_common_plat_dir}/test-event-trigger:sources" ]
226199
}
227200

228201
if (sl_enable_si70xx_sensor) {

‎examples/platform/silabs/test-event-trigger/BUILD.gn

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Copyright (c) 2025 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import("//build_overrides/chip.gni")
16+
17+
declare_args() {
18+
# The EnableKey in hex string format used by TestEventTrigger command in
19+
# GeneralDiagnostics cluster. The length of the string should be 16 bytes.
20+
sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"
21+
}
22+
23+
config("test-event-trigger-config") {
24+
defines = [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED" ]
25+
26+
if (is_debug) {
27+
defines += [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"" ]
28+
}
29+
30+
include_dirs = [ "." ]
31+
}
32+
33+
source_set("sources") {
34+
sources = [
35+
"SilabsTestEventTriggerDelegate.cpp",
36+
"SilabsTestEventTriggerDelegate.h",
37+
]
38+
39+
public_configs = [ ":test-event-trigger-config" ]
40+
41+
public_deps = [
42+
"${chip_root}/src/app:test-event-trigger",
43+
"${chip_root}/src/lib/core",
44+
"${chip_root}/src/lib/support",
45+
"${chip_root}/src/platform/silabs/provision:provision-headers",
46+
]
47+
}

‎examples/platform/silabs/SilabsTestEventTriggerDelegate.cpp ‎examples/platform/silabs/test-event-trigger/SilabsTestEventTriggerDelegate.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ using namespace ::chip::DeviceLayer;
2323

2424
namespace chip {
2525

26-
CHIP_ERROR SilabsTestEventTriggerDelegate::Init(DeviceLayer::Silabs::Provision::Storage * storage)
26+
CHIP_ERROR SilabsTestEventTriggerDelegate::Init(DeviceLayer::Silabs::Provision::ProvisionedDataProvider * provider)
2727
{
28-
VerifyOrReturnError(storage != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
29-
mStorage = storage;
28+
VerifyOrReturnError(provider != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
29+
mProvider = provider;
3030

3131
return CHIP_NO_ERROR;
3232
}
@@ -38,11 +38,11 @@ bool SilabsTestEventTriggerDelegate::DoesEnableKeyMatch(const ByteSpan & enableK
3838
uint8_t storedEnableKey[TestEventTriggerDelegate::kEnableKeyLength] = { 0 };
3939
MutableByteSpan storedEnableKeySpan(storedEnableKey);
4040

41-
// If the mStorage is equal to nullptr, we still continue in the function to check if the requested enableKey matches the zero
41+
// If mProvider is equal to nullptr, we still continue in the function to check if the requested enableKey matches the zero
4242
// key.
43-
if (mStorage != nullptr)
43+
if (mProvider != nullptr)
4444
{
45-
error = mStorage->GetTestEventTriggerKey(storedEnableKeySpan);
45+
error = mProvider->GetTestEventTriggerKey(storedEnableKeySpan);
4646
}
4747

4848
if (error != CHIP_NO_ERROR)

‎examples/platform/silabs/SilabsTestEventTriggerDelegate.h ‎examples/platform/silabs/test-event-trigger/SilabsTestEventTriggerDelegate.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ class SilabsTestEventTriggerDelegate : public TestEventTriggerDelegate
3535
/**
3636
* @brief Configures the Silabs Test Event trigger
3737
*
38-
* @param storage pointer to the global provisioning storage
38+
* @param provider pointer to the silabs provisionned data provider
3939
*
4040
* @return CHIP_ERROR CHIP_NO_ERROR, if the init was succesful
4141
* CHIP_ERROR_INVALID_ARGUMENT, if the manager input is equal to nullptr
4242
*/
43-
CHIP_ERROR Init(DeviceLayer::Silabs::Provision::Storage * storage);
43+
CHIP_ERROR Init(DeviceLayer::Silabs::Provision::ProvisionedDataProvider * provider);
4444

4545
/**
4646
* @brief Checks to see if `enableKey` provided matches value chosen by the manufacturer.
@@ -50,7 +50,7 @@ class SilabsTestEventTriggerDelegate : public TestEventTriggerDelegate
5050
bool DoesEnableKeyMatch(const ByteSpan & enableKey) const override;
5151

5252
private:
53-
DeviceLayer::Silabs::Provision::Storage * mStorage = nullptr;
53+
DeviceLayer::Silabs::Provision::ProvisionedDataProvider * mProvider = nullptr;
5454
};
5555

5656
} // namespace chip

‎examples/platform/silabs/tests/BUILD.gn

+4-34
Original file line numberDiff line numberDiff line change
@@ -16,54 +16,24 @@ import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
1717
import("//build_overrides/pigweed.gni")
1818
import("${chip_root}/build/chip/chip_test_suite.gni")
19-
2019
config("unit-test-config") {
21-
defines = [ "OTA_ENCRYPTION_ENABLE=0" ]
22-
}
23-
24-
config("test-event-trigger-tests-config") {
25-
include_dirs = [
26-
"${chip_root}/examples/platform/silabs",
27-
"${chip_root}/src/platform/silabs/provision",
28-
]
29-
30-
defines = [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED=1" ]
31-
}
32-
33-
source_set("test-event-trigger-tests") {
34-
sources = [
35-
"${chip_root}/examples/platform/silabs/SilabsTestEventTriggerDelegate.cpp",
36-
"${chip_root}/examples/platform/silabs/SilabsTestEventTriggerDelegate.h",
37-
"${chip_root}/examples/platform/silabs/provision/ProvisionStorageCustom.cpp",
38-
"${chip_root}/examples/platform/silabs/tests/stubs/StorageStub.cpp",
39-
]
40-
41-
public_configs = [
42-
":test-event-trigger-tests-config",
43-
":unit-test-config",
44-
]
45-
46-
public_deps = [
47-
"${chip_root}/src/app:test-event-trigger",
48-
"${chip_root}/src/lib/core",
49-
"${chip_root}/src/lib/support",
50-
]
20+
defines = [ "OTA_ENCRYPTION_ENABLE=1" ]
5121
}
5222

5323
chip_test_suite("tests") {
5424
output_name = "libSilabsExamplesPlatformTests"
5525

5626
test_sources = [ "TestSilabsTestEventTrigger.cpp" ]
5727

28+
public_configs = [ ":unit-test-config" ]
29+
5830
public_deps = [
59-
":test-event-trigger-tests",
31+
"${chip_root}/examples/platform/silabs/test-event-trigger:sources",
6032
"${chip_root}/src/lib/core",
6133
"${chip_root}/src/lib/core:string-builder-adapters",
6234
"${chip_root}/src/lib/support",
6335
"${chip_root}/src/lib/support:testing",
6436
]
6537

66-
public_configs = [ ":unit-test-config" ]
67-
6838
cflags = [ "-Wconversion" ]
6939
}

0 commit comments

Comments
 (0)