Link all unit tests with string adapters for CHIP_ERROR

src/access/tests/BUILD.gn

@@ -25,6 +25,7 @@ chip_test_suite("tests") {
   cflags = [ "-Wconversion" ]
   public_deps = [
     "${chip_root}/src/access",
+    "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/lib/support:test_utils",
     "${dir_pw_unit_test}",
   ]

src/access/tests/TestAccessControl.cpp

@@ -19,9 +19,10 @@
 #include "access/AccessControl.h"
 #include "access/examples/ExampleAccessControlDelegate.h"
 
-#include <lib/core/CHIPCore.h>
+#include <pw_unit_test/framework.h>
 
-#include <gtest/gtest.h>
+#include <lib/core/CHIPCore.h>
+#include <lib/core/StringBuilderAdapters.h>
 
 namespace chip {
 namespace Access {

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

@@ -24,6 +24,7 @@ chip_test_suite("tests") {
     "${chip_root}/src/app/cluster-building-blocks",
     "${chip_root}/src/app/data-model:nullable",
     "${chip_root}/src/lib/core:error",
+    "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/lib/support/tests:pw-test-macros",
     "${chip_root}/src/system",
   ]

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

@@ -22,9 +22,10 @@
 
 #include <app/data-model/Nullable.h>
 #include <lib/core/CHIPError.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <system/SystemClock.h>
 
-#include <gtest/gtest.h>
+#include <pw_unit_test/framework.h>
 
 using namespace chip;
 using namespace chip::app;

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

@@ -14,6 +14,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
+#include <vector>
+
+#include <pw_unit_test/framework.h>
+
 #include "app/ConcreteCommandPath.h"
 #include <app/codegen-data-model/CodegenDataModel.h>
 
@@ -54,9 +59,6 @@
 #include <lib/core/TLVWriter.h>
 #include <lib/support/Span.h>
 
-#include <gtest/gtest.h>
-#include <vector>
-
 using namespace chip;
 using namespace chip::Test;
 using namespace chip::app;

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

@@ -21,5 +21,8 @@ chip_test_suite("tests") {
 
   cflags = [ "-Wconversion" ]
 
-  public_deps = [ "${chip_root}/src/app/data-model-interface" ]
+  public_deps = [
+    "${chip_root}/src/app/data-model-interface",
+    "${chip_root}/src/lib/core:string-builder-adapters",
+  ]
 }

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

@@ -19,9 +19,10 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/data-model-interface/EventsGenerator.h>
 #include <app/data-model/Decode.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/CodeUtils.h>
 
-#include <gtest/gtest.h>
+#include <pw_unit_test/framework.h>
 
 namespace {
 

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

@@ -31,6 +31,7 @@ chip_test_suite("tests") {
   public_deps = [
     "${chip_root}/src/app/icd/server:manager",
     "${chip_root}/src/app/icd/server:monitoring-table",
+    "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/lib/support:test_utils",
     "${chip_root}/src/lib/support:testing",
     "${chip_root}/src/messaging/tests:helpers",

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

@@ -15,6 +15,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
 #include <pw_unit_test/framework.h>
 
 #include <app/SubscriptionsInfoProvider.h>
@@ -29,6 +30,7 @@
 #include <lib/address_resolve/AddressResolve.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/core/NodeId.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/TestPersistentStorageDelegate.h>
 #include <lib/support/TimeUtils.h>
 #include <messaging/tests/MessagingContext.h>

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

@@ -15,12 +15,14 @@
  *    limitations under the License.
  */
 
+#include <pw_unit_test/framework.h>
+
 #include <app/icd/server/ICDMonitoringTable.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <crypto/DefaultSessionKeystore.h>
-#include <gtest/gtest.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/ClusterEnums.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/DefaultStorageKeyAllocator.h>
 #include <lib/support/TestPersistentStorageDelegate.h>
 

src/app/tests/TestAclEvent.cpp

@@ -18,7 +18,6 @@
 
 #include <type_traits>
 
-#include <app/tests/test-interaction-model-api.h>
 #include <pw_unit_test/framework.h>
 
 #include <access/AccessControl.h>
@@ -27,11 +26,13 @@
 #include <app/MessageDef/EventDataIB.h>
 #include <app/reporting/tests/MockReportScheduler.h>
 #include <app/tests/AppTestContext.h>
+#include <app/tests/test-interaction-model-api.h>
 #include <app/util/basic-types.h>
 #include <app/util/mock/Constants.h>
 #include <app/util/mock/Functions.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/ErrorStr.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/core/TLV.h>
 #include <lib/core/TLVDebug.h>
 #include <lib/core/TLVUtilities.h>

src/app/tests/TestFailSafeContext.cpp

@@ -31,6 +31,7 @@
 #include <pw_unit_test/framework.h>
 
 #include <app/FailSafeContext.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>

src/app/tests/TestReportingEngine.cpp

@@ -24,20 +24,22 @@
 
 #include <cinttypes>
 
+#include <pw_unit_test/framework.h>
+
 #include <app/ConcreteAttributePath.h>
 #include <app/InteractionModelEngine.h>
 #include <app/reporting/Engine.h>
 #include <app/reporting/tests/MockReportScheduler.h>
 #include <app/tests/AppTestContext.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/ErrorStr.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/core/TLV.h>
 #include <lib/core/TLVDebug.h>
 #include <lib/core/TLVUtilities.h>
 #include <lib/support/tests/ExtraPwTestMacros.h>
 #include <messaging/ExchangeContext.h>
 #include <messaging/Flags.h>
-#include <pw_unit_test/framework.h>
 
 namespace chip {
 

src/ble/tests/BUILD.gn

@@ -31,6 +31,7 @@ chip_test_suite("tests") {
 
   public_deps = [
     "${chip_root}/src/ble",
+    "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/platform",
   ]
 }

src/ble/tests/TestBleErrorStr.cpp

@@ -28,13 +28,13 @@
 #include <stdint.h>
 #include <string.h>
 
+#include <pw_unit_test/framework.h>
+
 #include <lib/core/ErrorStr.h>
 
 #define _CHIP_BLE_BLE_H
 #include <ble/BleError.h>
 
-#include <gtest/gtest.h>
-
 using namespace chip;
 
 // Test input data.

src/ble/tests/TestBleLayer.cpp

@@ -21,9 +21,10 @@
 #include <type_traits>
 #include <utility>
 
-#include <gtest/gtest.h>
+#include <pw_unit_test/framework.h>
 
 #include <lib/core/CHIPError.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/Span.h>
 #include <lib/support/TypeTraits.h>

src/ble/tests/TestBleUUID.cpp

@@ -27,7 +27,7 @@
 #define _CHIP_BLE_BLE_H
 #include <ble/BleUUID.h>
 
-#include <gtest/gtest.h>
+#include <pw_unit_test/framework.h>
 
 using namespace chip;
 using namespace chip::Ble;

src/ble/tests/TestBtpEngine.cpp

@@ -20,15 +20,16 @@
 #include <cstdint>
 #include <numeric>
 
+#include <pw_unit_test/framework.h>
+
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 #define _CHIP_BLE_BLE_H
 #include <ble/BleLayer.h>
 #include <ble/BtpEngine.h>
 
-#include <gtest/gtest.h>
-
 using namespace chip;
 using namespace chip::Ble;
 

src/controller/tests/BUILD.gn

@@ -39,6 +39,7 @@ chip_test_suite("tests") {
     "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/app/tests:helpers",
     "${chip_root}/src/controller",
+    "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/lib/support:test_utils",
     "${chip_root}/src/messaging/tests:helpers",
     "${chip_root}/src/transport/raw/tests:helpers",

src/controller/tests/TestCommissionableNodeController.cpp

@@ -16,9 +16,10 @@
  *    limitations under the License.
  */
 
-#include <gtest/gtest.h>
+#include <pw_unit_test/framework.h>
 
 #include <controller/CHIPCommissionableNodeController.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/CHIPMemString.h>
 
 using namespace chip;

src/controller/tests/TestEventCaching.cpp

@@ -16,6 +16,8 @@
  *    limitations under the License.
  */
 
+#include <pw_unit_test/framework.h>
+
 #include "app-common/zap-generated/ids/Attributes.h"
 #include "app-common/zap-generated/ids/Clusters.h"
 #include "app/ClusterStateCache.h"
@@ -32,6 +34,7 @@
 #include <app/util/attribute-storage.h>
 #include <controller/InvokeInteraction.h>
 #include <lib/core/ErrorStr.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/TimeUtils.h>
 #include <lib/support/UnitTestUtils.h>
 #include <lib/support/logging/CHIPLogging.h>

src/controller/tests/TestEventChunking.cpp

@@ -38,6 +38,7 @@
 #include <controller/InvokeInteraction.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/ErrorStr.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/CHIPCounter.h>
 #include <lib/support/TimeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>

src/controller/tests/TestEventNumberCaching.cpp

@@ -31,6 +31,7 @@
 #include <app/util/attribute-storage.h>
 #include <controller/InvokeInteraction.h>
 #include <lib/core/ErrorStr.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/TimeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 

src/controller/tests/TestReadChunking.cpp

@@ -41,6 +41,7 @@
 #include <app/util/endpoint-config-api.h>
 #include <controller/InvokeInteraction.h>
 #include <lib/core/ErrorStr.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/TimeUtils.h>
 #include <lib/support/UnitTestUtils.h>
 #include <lib/support/logging/CHIPLogging.h>

src/controller/tests/TestServerCommandDispatch.cpp

@@ -35,6 +35,7 @@
 #include <controller/InvokeInteraction.h>
 #include <controller/ReadInteraction.h>
 #include <lib/core/ErrorStr.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 using namespace chip;

src/controller/tests/TestWriteChunking.cpp

@@ -19,6 +19,8 @@
 #include <memory>
 #include <utility>
 
+#include <pw_unit_test/framework.h>
+
 #include "app-common/zap-generated/ids/Attributes.h"
 #include "app-common/zap-generated/ids/Clusters.h"
 #include "app/ConcreteAttributePath.h"
@@ -35,6 +37,7 @@
 #include <app/util/attribute-storage.h>
 #include <controller/InvokeInteraction.h>
 #include <lib/core/ErrorStr.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 using namespace chip;

src/credentials/tests/BUILD.gn

@@ -69,6 +69,7 @@ chip_test_suite("tests") {
     "${chip_root}/src/credentials",
     "${chip_root}/src/credentials:default_attestation_verifier",
     "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/lib/support:testing",
   ]
 }

src/credentials/tests/TestCertificationDeclaration.cpp

@@ -25,14 +25,15 @@
 #include <inttypes.h>
 #include <stddef.h>
 
+#include <pw_unit_test/framework.h>
+
 #include <credentials/CHIPCert.h>
 #include <credentials/CertificationDeclaration.h>
 #include <credentials/attestation_verifier/DefaultDeviceAttestationVerifier.h>
 #include <crypto/CHIPCryptoPAL.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/Span.h>
 
-#include <gtest/gtest.h>
-
 using namespace chip;
 using namespace chip::ASN1;
 using namespace chip::Crypto;

src/credentials/tests/TestChipCert.cpp

@@ -24,18 +24,19 @@
  *
  */
 
+#include <pw_unit_test/framework.h>
+
 #include <credentials/CHIPCert.h>
 #include <credentials/examples/LastKnownGoodTimeCertificateValidityPolicyExample.h>
 #include <credentials/examples/StrictCertificateValidityPolicyExample.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/ErrorStr.h>
 #include <lib/core/PeerId.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/core/TLV.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 
-#include <gtest/gtest.h>
-
 #include "CHIPCert_error_test_vectors.h"
 #include "CHIPCert_test_vectors.h"
 

src/credentials/tests/TestCommissionerDUTVectors.cpp

@@ -15,6 +15,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
+#include <pw_unit_test/framework.h>
+
 #include <crypto/CHIPCryptoPAL.h>
 
 #include <app/tests/suites/credentials/TestHarnessDACProvider.h>
@@ -27,11 +30,10 @@
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 
 #include <lib/core/CHIPError.h>
+#include <lib/core/StringBuilderAdapters.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/Span.h>
 
-#include <gtest/gtest.h>
-
 #include <dirent.h>
 #include <stdio.h>
 #include <string>