adding more tests

Author: Alami-Amine

src/app/tests/BUILD.gn

@@ -139,12 +139,24 @@ chip_test_suite("tests") {
   output_name = "libAppTests"
 
   test_sources = [
+    "TestAttributeAccessInterfaceCache.cpp",
+    "TestAttributePathExpandIterator.cpp",
+    "TestAttributePersistenceProvider.cpp",
+    "TestAttributeValueDecoder.cpp",
+    "TestAttributeValueEncoder.cpp",
     "TestBindingTable.cpp",
     "TestBuilderParser.cpp",
     "TestMessageDef.cpp",
     "TestNullable.cpp",
+    "TestNumericAttributeTraits.cpp",
+    "TestOperationalStateClusterObjects.cpp",
+    "TestPendingNotificationMap.cpp",
+    "TestPendingResponseTrackerImpl.cpp",
+    "TestPowerSourceCluster.cpp",
     "TestStatusIB.cpp",
     "TestStatusResponseMessage.cpp",
+    "TestTestEventTriggerDelegate.cpp",
+    "TestTimeSyncDataProvider.cpp",
   ]
 
   if (!chip_fake_platform) {
@@ -158,16 +170,23 @@ chip_test_suite("tests") {
     ":ember-apptest-compatibility",
     ":operational-state-test-srcs",
     ":ota-requestor-test-srcs",
+    ":power-cluster-test-srcs",
     ":time-sync-data-provider-test-srcs",
     "${chip_root}/src/app",
     "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/app/icd/client:manager",
     "${chip_root}/src/app/tests:helpers",
     "${chip_root}/src/app/util/mock:mock_ember",
     "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/lib/support:test_utils",
     "${chip_root}/src/lib/support:testing",
   ]
+
+  # DefaultICDClientStorage assumes that raw AES key is used by the application
+  if (chip_crypto != "psa") {
+    test_sources += [ "TestDefaultICDClientStorage.cpp" ]
+  }
 }
 
 chip_test_suite_using_nltest("tests_nltest") {
@@ -176,11 +195,6 @@ chip_test_suite_using_nltest("tests_nltest") {
   test_sources = [
     "TestAclAttribute.cpp",
     "TestAclEvent.cpp",
-    "TestAttributeAccessInterfaceCache.cpp",
-    "TestAttributePathExpandIterator.cpp",
-    "TestAttributePersistenceProvider.cpp",
-    "TestAttributeValueDecoder.cpp",
-    "TestAttributeValueEncoder.cpp",
     "TestBasicCommandPathRegistry.cpp",
     "TestClusterInfo.cpp",
     "TestCommandInteraction.cpp",
@@ -193,24 +207,12 @@ chip_test_suite_using_nltest("tests_nltest") {
     "TestEventPathParams.cpp",
     "TestFabricScopedEventLogging.cpp",
     "TestInteractionModelEngine.cpp",
-    "TestNumericAttributeTraits.cpp",
-    "TestOperationalStateClusterObjects.cpp",
-    "TestPendingNotificationMap.cpp",
-    "TestPendingResponseTrackerImpl.cpp",
-    "TestPowerSourceCluster.cpp",
     "TestReadInteraction.cpp",
     "TestReportingEngine.cpp",
-    "TestTestEventTriggerDelegate.cpp",
-    "TestTimeSyncDataProvider.cpp",
     "TestTimedHandler.cpp",
     "TestWriteInteraction.cpp",
   ]
 
-  # DefaultICDClientStorage assumes that raw AES key is used by the application
-  if (chip_crypto != "psa") {
-    test_sources += [ "TestDefaultICDClientStorage.cpp" ]
-  }
-
   #
   # On NRF platforms, the allocation of a large number of pbufs in this test
   # to exercise chunking causes it to run out of memory. For now, disable it there.

src/app/tests/TestAttributeAccessInterfaceCache.cpp

@@ -18,15 +18,15 @@
 
 #include <app/AttributeAccessInterface.h>
 #include <app/AttributeAccessInterfaceCache.h>
-#include <lib/support/UnitTestRegistration.h>
-#include <nlunit-test.h>
+#include <lib/core/StringBuilderAdapters.h>
+#include <pw_unit_test/framework.h>
 
 using namespace chip;
 using namespace chip::app;
 
 namespace {
 
-void TestBasicLifecycle(nlTestSuite * inSuite, void * inContext)
+TEST(TestAttributeAccessInterfaceCache, TestBasicLifecycle)
 {
     using CacheResult = AttributeAccessInterfaceCache::CacheResult;
 
@@ -44,86 +44,58 @@ void TestBasicLifecycle(nlTestSuite * inSuite, void * inContext)
     // Cache can keep track of at least 1 entry,
     AttributeAccessInterface * entry = nullptr;
 
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 1, &entry) == CacheResult::kCacheMiss);
-    NL_TEST_ASSERT(inSuite, entry == nullptr);
+    EXPECT_EQ(cache.Get(1, 1, &entry), CacheResult::kCacheMiss);
+    EXPECT_EQ(entry, nullptr);
     cache.MarkUsed(1, 1, accessor1);
 
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 1, &entry) == CacheResult::kDefinitelyUsed);
-    NL_TEST_ASSERT(inSuite, entry == accessor1);
+    EXPECT_EQ(cache.Get(1, 1, &entry), CacheResult::kDefinitelyUsed);
+    EXPECT_EQ(entry, accessor1);
 
     entry = nullptr;
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 2, &entry) == CacheResult::kCacheMiss);
-    NL_TEST_ASSERT(inSuite, entry == nullptr);
-    NL_TEST_ASSERT(inSuite, cache.Get(2, 1, &entry) == CacheResult::kCacheMiss);
-    NL_TEST_ASSERT(inSuite, entry == nullptr);
+    EXPECT_EQ(cache.Get(1, 2, &entry), CacheResult::kCacheMiss);
+    EXPECT_EQ(entry, nullptr);
+    EXPECT_EQ(cache.Get(2, 1, &entry), CacheResult::kCacheMiss);
+    EXPECT_EQ(entry, nullptr);
 
     cache.MarkUsed(1, 2, accessor1);
 
     entry = nullptr;
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 2, &entry) == CacheResult::kDefinitelyUsed);
-    NL_TEST_ASSERT(inSuite, entry == accessor1);
-    NL_TEST_ASSERT(inSuite, cache.Get(2, 1, &entry) == CacheResult::kCacheMiss);
+    EXPECT_EQ(cache.Get(1, 2, &entry), CacheResult::kDefinitelyUsed);
+    EXPECT_EQ(entry, accessor1);
+    EXPECT_EQ(cache.Get(2, 1, &entry), CacheResult::kCacheMiss);
 
     cache.MarkUsed(1, 2, accessor2);
 
     entry = nullptr;
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 2, &entry) == CacheResult::kDefinitelyUsed);
-    NL_TEST_ASSERT(inSuite, entry == accessor2);
+    EXPECT_EQ(cache.Get(1, 2, &entry), CacheResult::kDefinitelyUsed);
+    EXPECT_EQ(entry, accessor2);
     // The following should not crash (e.g. output not used if nullptr).
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 2, nullptr) == CacheResult::kDefinitelyUsed);
+    EXPECT_EQ(cache.Get(1, 2, nullptr), CacheResult::kDefinitelyUsed);
 
     // Setting used to nullptr == does not mark used.
     cache.MarkUsed(1, 2, nullptr);
     entry = nullptr;
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 2, &entry) == CacheResult::kCacheMiss);
-    NL_TEST_ASSERT(inSuite, entry == nullptr);
+    EXPECT_EQ(cache.Get(1, 2, &entry), CacheResult::kCacheMiss);
+    EXPECT_EQ(entry, nullptr);
 
     cache.Invalidate();
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 1, &entry) == CacheResult::kCacheMiss);
-    NL_TEST_ASSERT(inSuite, entry == nullptr);
-    NL_TEST_ASSERT(inSuite, cache.Get(1, 2, &entry) == CacheResult::kCacheMiss);
-    NL_TEST_ASSERT(inSuite, cache.Get(2, 1, &entry) == CacheResult::kCacheMiss);
+    EXPECT_EQ(cache.Get(1, 1, &entry), CacheResult::kCacheMiss);
+    EXPECT_EQ(entry, nullptr);
+    EXPECT_EQ(cache.Get(1, 2, &entry), CacheResult::kCacheMiss);
+    EXPECT_EQ(cache.Get(2, 1, &entry), CacheResult::kCacheMiss);
 
     // Marking unused works, keeps single entry, and is invalidated when invalidated fully.
-    NL_TEST_ASSERT(inSuite, cache.Get(2, 2, nullptr) != CacheResult::kDefinitelyUnused);
-    NL_TEST_ASSERT(inSuite, cache.Get(3, 3, nullptr) != CacheResult::kDefinitelyUnused);
+    EXPECT_NE(cache.Get(2, 2, nullptr), CacheResult::kDefinitelyUnused);
+    EXPECT_NE(cache.Get(3, 3, nullptr), CacheResult::kDefinitelyUnused);
     cache.MarkUnused(2, 2);
-    NL_TEST_ASSERT(inSuite, cache.Get(2, 2, nullptr) == CacheResult::kDefinitelyUnused);
-    NL_TEST_ASSERT(inSuite, cache.Get(3, 3, nullptr) != CacheResult::kDefinitelyUnused);
+    EXPECT_EQ(cache.Get(2, 2, nullptr), CacheResult::kDefinitelyUnused);
+    EXPECT_NE(cache.Get(3, 3, nullptr), CacheResult::kDefinitelyUnused);
 
     cache.MarkUnused(3, 3);
-    NL_TEST_ASSERT(inSuite, cache.Get(2, 2, nullptr) != CacheResult::kDefinitelyUnused);
-    NL_TEST_ASSERT(inSuite, cache.Get(3, 3, nullptr) == CacheResult::kDefinitelyUnused);
+    EXPECT_NE(cache.Get(2, 2, nullptr), CacheResult::kDefinitelyUnused);
+    EXPECT_EQ(cache.Get(3, 3, nullptr), CacheResult::kDefinitelyUnused);
 
     cache.Invalidate();
-    NL_TEST_ASSERT(inSuite, cache.Get(3, 3, nullptr) != CacheResult::kDefinitelyUnused);
+    EXPECT_NE(cache.Get(3, 3, nullptr), CacheResult::kDefinitelyUnused);
 }
-
-// clang-format off
-const nlTest sTests[] =
-{
-    NL_TEST_DEF("Basic AttributeAccessInterfaceCache lifecycle works", TestBasicLifecycle),
-    NL_TEST_SENTINEL()
-};
-// clang-format on
-
 } // namespace
-
-int TestAttributeAccessInterfaceCache()
-{
-    // clang-format off
-    nlTestSuite theSuite =
-    {
-        "Test for AttributeAccessInterface cache utility",
-        &sTests[0],
-        nullptr,
-        nullptr
-    };
-    // clang-format on
-
-    nlTestRunner(&theSuite, nullptr);
-
-    return (nlTestRunnerStats(&theSuite));
-}
-
-CHIP_REGISTER_TEST_SUITE(TestAttributeAccessInterfaceCache)