Skip to content

Commit 111f62f

Browse files
arkqarkq
authored
Link all unit tests with string adapters for CHIP_ERROR (project-chip#34332)
1 parent 522668f commit 111f62f

File tree

192 files changed

+497
-250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+497
-250
lines changed

‎src/access/tests/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ chip_test_suite("tests") {
2525
cflags = [ "-Wconversion" ]
2626
public_deps = [
2727
"${chip_root}/src/access",
28+
"${chip_root}/src/lib/core:string-builder-adapters",
2829
"${chip_root}/src/lib/support:test_utils",
2930
"${dir_pw_unit_test}",
3031
]

‎src/access/tests/TestAccessControl.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
#include "access/AccessControl.h"
2020
#include "access/examples/ExampleAccessControlDelegate.h"
2121

22-
#include <lib/core/CHIPCore.h>
22+
#include <pw_unit_test/framework.h>
2323

24-
#include <gtest/gtest.h>
24+
#include <lib/core/CHIPCore.h>
25+
#include <lib/core/StringBuilderAdapters.h>
2526

2627
namespace chip {
2728
namespace Access {

‎src/app/cluster-building-blocks/tests/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ chip_test_suite("tests") {
2424
"${chip_root}/src/app/cluster-building-blocks",
2525
"${chip_root}/src/app/data-model:nullable",
2626
"${chip_root}/src/lib/core:error",
27+
"${chip_root}/src/lib/core:string-builder-adapters",
2728
"${chip_root}/src/lib/support/tests:pw-test-macros",
2829
"${chip_root}/src/system",
2930
]

‎src/app/cluster-building-blocks/tests/TestQuieterReporting.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222

2323
#include <app/data-model/Nullable.h>
2424
#include <lib/core/CHIPError.h>
25+
#include <lib/core/StringBuilderAdapters.h>
2526
#include <system/SystemClock.h>
2627

27-
#include <gtest/gtest.h>
28+
#include <pw_unit_test/framework.h>
2829

2930
using namespace chip;
3031
using namespace chip::app;

‎src/app/codegen-data-model/tests/TestCodegenModelViaMocks.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17+
18+
#include <vector>
19+
20+
#include <pw_unit_test/framework.h>
21+
1722
#include "app/ConcreteCommandPath.h"
1823
#include <app/codegen-data-model/CodegenDataModel.h>
1924

@@ -54,9 +59,6 @@
5459
#include <lib/core/TLVWriter.h>
5560
#include <lib/support/Span.h>
5661

57-
#include <gtest/gtest.h>
58-
#include <vector>
59-
6062
using namespace chip;
6163
using namespace chip::Test;
6264
using namespace chip::app;

‎src/app/data-model-interface/tests/BUILD.gn

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ chip_test_suite("tests") {
2121

2222
cflags = [ "-Wconversion" ]
2323

24-
public_deps = [ "${chip_root}/src/app/data-model-interface" ]
24+
public_deps = [
25+
"${chip_root}/src/app/data-model-interface",
26+
"${chip_root}/src/lib/core:string-builder-adapters",
27+
]
2528
}

‎src/app/data-model-interface/tests/TestEventEmitting.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
#include <app-common/zap-generated/cluster-objects.h>
2020
#include <app/data-model-interface/EventsGenerator.h>
2121
#include <app/data-model/Decode.h>
22+
#include <lib/core/StringBuilderAdapters.h>
2223
#include <lib/support/CodeUtils.h>
2324

24-
#include <gtest/gtest.h>
25+
#include <pw_unit_test/framework.h>
2526

2627
namespace {
2728

‎src/app/icd/server/tests/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ chip_test_suite("tests") {
3131
public_deps = [
3232
"${chip_root}/src/app/icd/server:manager",
3333
"${chip_root}/src/app/icd/server:monitoring-table",
34+
"${chip_root}/src/lib/core:string-builder-adapters",
3435
"${chip_root}/src/lib/support:test_utils",
3536
"${chip_root}/src/lib/support:testing",
3637
"${chip_root}/src/messaging/tests:helpers",

‎src/app/icd/server/tests/TestICDManager.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18+
1819
#include <pw_unit_test/framework.h>
1920

2021
#include <app/SubscriptionsInfoProvider.h>
@@ -29,6 +30,7 @@
2930
#include <lib/address_resolve/AddressResolve.h>
3031
#include <lib/core/DataModelTypes.h>
3132
#include <lib/core/NodeId.h>
33+
#include <lib/core/StringBuilderAdapters.h>
3234
#include <lib/support/TestPersistentStorageDelegate.h>
3335
#include <lib/support/TimeUtils.h>
3436
#include <messaging/tests/MessagingContext.h>

‎src/app/icd/server/tests/TestICDMonitoringTable.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515
* limitations under the License.
1616
*/
1717

18+
#include <pw_unit_test/framework.h>
19+
1820
#include <app/icd/server/ICDMonitoringTable.h>
1921
#include <crypto/CHIPCryptoPAL.h>
2022
#include <crypto/DefaultSessionKeystore.h>
21-
#include <gtest/gtest.h>
2223
#include <lib/core/CHIPError.h>
2324
#include <lib/core/ClusterEnums.h>
25+
#include <lib/core/StringBuilderAdapters.h>
2426
#include <lib/support/DefaultStorageKeyAllocator.h>
2527
#include <lib/support/TestPersistentStorageDelegate.h>
2628

‎src/app/tests/TestAclEvent.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include <type_traits>
2020

21-
#include <app/tests/test-interaction-model-api.h>
2221
#include <pw_unit_test/framework.h>
2322

2423
#include <access/AccessControl.h>
@@ -27,11 +26,13 @@
2726
#include <app/MessageDef/EventDataIB.h>
2827
#include <app/reporting/tests/MockReportScheduler.h>
2928
#include <app/tests/AppTestContext.h>
29+
#include <app/tests/test-interaction-model-api.h>
3030
#include <app/util/basic-types.h>
3131
#include <app/util/mock/Constants.h>
3232
#include <app/util/mock/Functions.h>
3333
#include <lib/core/CHIPCore.h>
3434
#include <lib/core/ErrorStr.h>
35+
#include <lib/core/StringBuilderAdapters.h>
3536
#include <lib/core/TLV.h>
3637
#include <lib/core/TLVDebug.h>
3738
#include <lib/core/TLVUtilities.h>

‎src/app/tests/TestFailSafeContext.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <pw_unit_test/framework.h>
3232

3333
#include <app/FailSafeContext.h>
34+
#include <lib/core/StringBuilderAdapters.h>
3435
#include <lib/support/CHIPMem.h>
3536
#include <lib/support/CodeUtils.h>
3637
#include <platform/CHIPDeviceLayer.h>

‎src/app/tests/TestReportingEngine.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,22 @@
2424

2525
#include <cinttypes>
2626

27+
#include <pw_unit_test/framework.h>
28+
2729
#include <app/ConcreteAttributePath.h>
2830
#include <app/InteractionModelEngine.h>
2931
#include <app/reporting/Engine.h>
3032
#include <app/reporting/tests/MockReportScheduler.h>
3133
#include <app/tests/AppTestContext.h>
3234
#include <lib/core/CHIPCore.h>
3335
#include <lib/core/ErrorStr.h>
36+
#include <lib/core/StringBuilderAdapters.h>
3437
#include <lib/core/TLV.h>
3538
#include <lib/core/TLVDebug.h>
3639
#include <lib/core/TLVUtilities.h>
3740
#include <lib/support/tests/ExtraPwTestMacros.h>
3841
#include <messaging/ExchangeContext.h>
3942
#include <messaging/Flags.h>
40-
#include <pw_unit_test/framework.h>
4143

4244
namespace chip {
4345

‎src/ble/tests/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ chip_test_suite("tests") {
3131

3232
public_deps = [
3333
"${chip_root}/src/ble",
34+
"${chip_root}/src/lib/core:string-builder-adapters",
3435
"${chip_root}/src/platform",
3536
]
3637
}

‎src/ble/tests/TestBleErrorStr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
#include <stdint.h>
2929
#include <string.h>
3030

31+
#include <pw_unit_test/framework.h>
32+
3133
#include <lib/core/ErrorStr.h>
3234

3335
#define _CHIP_BLE_BLE_H
3436
#include <ble/BleError.h>
3537

36-
#include <gtest/gtest.h>
37-
3838
using namespace chip;
3939

4040
// Test input data.

‎src/ble/tests/TestBleLayer.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
#include <type_traits>
2222
#include <utility>
2323

24-
#include <gtest/gtest.h>
24+
#include <pw_unit_test/framework.h>
2525

2626
#include <lib/core/CHIPError.h>
27+
#include <lib/core/StringBuilderAdapters.h>
2728
#include <lib/support/CHIPMem.h>
2829
#include <lib/support/Span.h>
2930
#include <lib/support/TypeTraits.h>

‎src/ble/tests/TestBleUUID.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define _CHIP_BLE_BLE_H
2828
#include <ble/BleUUID.h>
2929

30-
#include <gtest/gtest.h>
30+
#include <pw_unit_test/framework.h>
3131

3232
using namespace chip;
3333
using namespace chip::Ble;

‎src/ble/tests/TestBtpEngine.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@
2020
#include <cstdint>
2121
#include <numeric>
2222

23+
#include <pw_unit_test/framework.h>
24+
25+
#include <lib/core/StringBuilderAdapters.h>
2326
#include <lib/support/CHIPMem.h>
2427
#include <lib/support/logging/CHIPLogging.h>
2528

2629
#define _CHIP_BLE_BLE_H
2730
#include <ble/BleLayer.h>
2831
#include <ble/BtpEngine.h>
2932

30-
#include <gtest/gtest.h>
31-
3233
using namespace chip;
3334
using namespace chip::Ble;
3435

‎src/controller/tests/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ chip_test_suite("tests") {
3939
"${chip_root}/src/app/common:cluster-objects",
4040
"${chip_root}/src/app/tests:helpers",
4141
"${chip_root}/src/controller",
42+
"${chip_root}/src/lib/core:string-builder-adapters",
4243
"${chip_root}/src/lib/support:test_utils",
4344
"${chip_root}/src/messaging/tests:helpers",
4445
"${chip_root}/src/transport/raw/tests:helpers",

‎src/controller/tests/TestCommissionableNodeController.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include <gtest/gtest.h>
19+
#include <pw_unit_test/framework.h>
2020

2121
#include <controller/CHIPCommissionableNodeController.h>
22+
#include <lib/core/StringBuilderAdapters.h>
2223
#include <lib/support/CHIPMemString.h>
2324

2425
using namespace chip;

‎src/controller/tests/TestEventCaching.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* limitations under the License.
1717
*/
1818

19+
#include <pw_unit_test/framework.h>
20+
1921
#include "app-common/zap-generated/ids/Attributes.h"
2022
#include "app-common/zap-generated/ids/Clusters.h"
2123
#include "app/ClusterStateCache.h"
@@ -32,6 +34,7 @@
3234
#include <app/util/attribute-storage.h>
3335
#include <controller/InvokeInteraction.h>
3436
#include <lib/core/ErrorStr.h>
37+
#include <lib/core/StringBuilderAdapters.h>
3538
#include <lib/support/TimeUtils.h>
3639
#include <lib/support/UnitTestUtils.h>
3740
#include <lib/support/logging/CHIPLogging.h>

‎src/controller/tests/TestEventChunking.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <controller/InvokeInteraction.h>
3939
#include <lib/core/CHIPCore.h>
4040
#include <lib/core/ErrorStr.h>
41+
#include <lib/core/StringBuilderAdapters.h>
4142
#include <lib/support/CHIPCounter.h>
4243
#include <lib/support/TimeUtils.h>
4344
#include <lib/support/logging/CHIPLogging.h>

‎src/controller/tests/TestEventNumberCaching.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <app/util/attribute-storage.h>
3232
#include <controller/InvokeInteraction.h>
3333
#include <lib/core/ErrorStr.h>
34+
#include <lib/core/StringBuilderAdapters.h>
3435
#include <lib/support/TimeUtils.h>
3536
#include <lib/support/logging/CHIPLogging.h>
3637

‎src/controller/tests/TestReadChunking.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include <app/util/endpoint-config-api.h>
4242
#include <controller/InvokeInteraction.h>
4343
#include <lib/core/ErrorStr.h>
44+
#include <lib/core/StringBuilderAdapters.h>
4445
#include <lib/support/TimeUtils.h>
4546
#include <lib/support/UnitTestUtils.h>
4647
#include <lib/support/logging/CHIPLogging.h>

‎src/controller/tests/TestServerCommandDispatch.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <controller/InvokeInteraction.h>
3636
#include <controller/ReadInteraction.h>
3737
#include <lib/core/ErrorStr.h>
38+
#include <lib/core/StringBuilderAdapters.h>
3839
#include <lib/support/logging/CHIPLogging.h>
3940

4041
using namespace chip;

‎src/controller/tests/TestWriteChunking.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include <memory>
2020
#include <utility>
2121

22+
#include <pw_unit_test/framework.h>
23+
2224
#include "app-common/zap-generated/ids/Attributes.h"
2325
#include "app-common/zap-generated/ids/Clusters.h"
2426
#include "app/ConcreteAttributePath.h"
@@ -35,6 +37,7 @@
3537
#include <app/util/attribute-storage.h>
3638
#include <controller/InvokeInteraction.h>
3739
#include <lib/core/ErrorStr.h>
40+
#include <lib/core/StringBuilderAdapters.h>
3841
#include <lib/support/logging/CHIPLogging.h>
3942

4043
using namespace chip;

‎src/credentials/tests/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ chip_test_suite("tests") {
6969
"${chip_root}/src/credentials",
7070
"${chip_root}/src/credentials:default_attestation_verifier",
7171
"${chip_root}/src/lib/core",
72+
"${chip_root}/src/lib/core:string-builder-adapters",
7273
"${chip_root}/src/lib/support:testing",
7374
]
7475
}

‎src/credentials/tests/TestCertificationDeclaration.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@
2525
#include <inttypes.h>
2626
#include <stddef.h>
2727

28+
#include <pw_unit_test/framework.h>
29+
2830
#include <credentials/CHIPCert.h>
2931
#include <credentials/CertificationDeclaration.h>
3032
#include <credentials/attestation_verifier/DefaultDeviceAttestationVerifier.h>
3133
#include <crypto/CHIPCryptoPAL.h>
34+
#include <lib/core/StringBuilderAdapters.h>
3235
#include <lib/support/Span.h>
3336

34-
#include <gtest/gtest.h>
35-
3637
using namespace chip;
3738
using namespace chip::ASN1;
3839
using namespace chip::Crypto;

‎src/credentials/tests/TestChipCert.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,19 @@
2424
*
2525
*/
2626

27+
#include <pw_unit_test/framework.h>
28+
2729
#include <credentials/CHIPCert.h>
2830
#include <credentials/examples/LastKnownGoodTimeCertificateValidityPolicyExample.h>
2931
#include <credentials/examples/StrictCertificateValidityPolicyExample.h>
3032
#include <crypto/CHIPCryptoPAL.h>
3133
#include <lib/core/ErrorStr.h>
3234
#include <lib/core/PeerId.h>
35+
#include <lib/core/StringBuilderAdapters.h>
3336
#include <lib/core/TLV.h>
3437
#include <lib/support/CHIPMem.h>
3538
#include <lib/support/CodeUtils.h>
3639

37-
#include <gtest/gtest.h>
38-
3940
#include "CHIPCert_error_test_vectors.h"
4041
#include "CHIPCert_test_vectors.h"
4142

‎src/credentials/tests/TestCommissionerDUTVectors.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18+
19+
#include <pw_unit_test/framework.h>
20+
1821
#include <crypto/CHIPCryptoPAL.h>
1922

2023
#include <app/tests/suites/credentials/TestHarnessDACProvider.h>
@@ -27,11 +30,10 @@
2730
#include <credentials/examples/DeviceAttestationCredsExample.h>
2831

2932
#include <lib/core/CHIPError.h>
33+
#include <lib/core/StringBuilderAdapters.h>
3034
#include <lib/support/CHIPMem.h>
3135
#include <lib/support/Span.h>
3236

33-
#include <gtest/gtest.h>
34-
3537
#include <dirent.h>
3638
#include <stdio.h>
3739
#include <string>

0 commit comments

Comments
 (0)