Fixed SystemTimer.h

project-chip · Sep 21, 2023 · 120cfb1 · 120cfb1
1 parent 5a9b657
commit 120cfb1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 27 deletions.
diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h
@@ -29,7 +29,6 @@
 #include <app/AppBuildConfig.h>
 #include <app/MessageDef/AttributeReportIBs.h>
 #include <app/MessageDef/ReportDataMessage.h>
-#include <gtest/gtest.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/DLLUtil.h>
@@ -378,9 +377,6 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
     friend class reporting::Engine;
     friend class TestCommandInteraction;
     friend class TestInteractionModelEngine;
-    FRIEND_TEST(TestInteractionModelEngine, TestAttributePathParamsPushRelease);
-    FRIEND_TEST(TestInteractionModelEngine, TestRemoveDuplicateConcreteAttribute);
-    FRIEND_TEST(TestInteractionModelEngine, TestSubscriptionResumptionTimer);
     using Status = Protocols::InteractionModel::Status;
 
     void OnDone(CommandHandler & apCommandObj) override;

diff --git a/src/app/tests/TestInteractionModelEngine.cpp b/src/app/tests/TestInteractionModelEngine.cpp
@@ -47,10 +47,15 @@ namespace app {
 class TestInteractionModelEngine : public ::testing::Test
 {
 public:
-    static int GetAttributePathListLength(ObjectList<AttributePathParams> * apattributePathParamsList);
     static void SetUpTestSuite() { TestContext::Initialize(&ctx); }
     static void TearDownTestSuite() { TestContext::Finalize(&ctx); }
     static TestContext ctx;
+
+    static void TestAttributePathParamsPushRelease();
+    static void TestRemoveDuplicateConcreteAttribute();
+    static void TestSubscriptionResumptionTimer();
+
+    static int GetAttributePathListLength(ObjectList<AttributePathParams> * apattributePathParamsList);
 };
 
 TestContext TestInteractionModelEngine::ctx;
@@ -67,7 +72,11 @@ int TestInteractionModelEngine::GetAttributePathListLength(ObjectList<AttributeP
     return length;
 }
 
-TEST_F(TestInteractionModelEngine, TestAttributePathParamsPushRelease)
+#define STATIC_TEST(test_fixture, test_name)                                                                                       \
+    TEST_F(test_fixture, test_name) { test_fixture::test_name(); }                                                                 \
+    void test_fixture::test_name()
+
+STATIC_TEST(TestInteractionModelEngine, TestAttributePathParamsPushRelease)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     err            = InteractionModelEngine::GetInstance()->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(),
@@ -101,7 +110,7 @@ TEST_F(TestInteractionModelEngine, TestAttributePathParamsPushRelease)
     EXPECT_TRUE(GetAttributePathListLength(attributePathParamsList) == 0);
 }
 
-TEST_F(TestInteractionModelEngine, TestRemoveDuplicateConcreteAttribute)
+STATIC_TEST(TestInteractionModelEngine, TestRemoveDuplicateConcreteAttribute)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     err            = InteractionModelEngine::GetInstance()->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(),
@@ -225,7 +234,7 @@ TEST_F(TestInteractionModelEngine, TestRemoveDuplicateConcreteAttribute)
 }
 
 #if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS && CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
-TEST_F(TestInteractionModelEngine, TestSubscriptionResumptionTimer)
+STATIC_TEST(TestInteractionModelEngine, TestSubscriptionResumptionTimer)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     err            = InteractionModelEngine::GetInstance()->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable(),

diff --git a/src/system/SystemTimer.h b/src/system/SystemTimer.h
@@ -36,8 +36,6 @@
 #include <system/SystemLayer.h>
 #include <system/SystemStats.h>
 
-#include <gtest/gtest.h>
-
 #if CHIP_SYSTEM_CONFIG_USE_DISPATCH
 #include <dispatch/dispatch.h>
 #endif
@@ -46,7 +44,7 @@ namespace chip {
 namespace System {
 
 class Layer;
-class TestTimer;
+class TestSystemTimer;
 
 /**
  * Basic Timer information: time and callback.
@@ -239,9 +237,8 @@ class TimerPool
         callback.Invoke();
     }
 
-    FRIEND_TEST(TestSystemTimer, CheckTimerPool);
-
 private:
+    friend class TestSystemTimer;
     ObjectPool<Timer, CHIP_SYSTEM_CONFIG_NUM_TIMERS> mTimerPool;
 };
 

diff --git a/src/system/tests/TestSystemTimer.cpp b/src/system/tests/TestSystemTimer.cpp
@@ -50,6 +50,9 @@
 using chip::ErrorStr;
 using namespace chip::System;
 
+namespace chip {
+namespace System {
+
 template <class LayerImpl, typename Enable = void>
 class LayerEvents
 {
@@ -136,10 +139,16 @@ class TestSystemTimer : public ::testing::Test
     static void SetUpTestSuite() { TestSetup(&ctx); }
     static void TearDownTestSuite() { TestTeardown(&ctx); }
     static TestContext ctx;
+
+    static void CheckTimerPool();
 };
 
 TestContext TestSystemTimer::ctx;
 
+#define STATIC_TEST(test_fixture, test_name)                                                                                       \
+    TEST_F(test_fixture, test_name) { test_fixture::test_name(); }                                                                 \
+    void test_fixture::test_name()
+
 class ScopedGlobalTestContext
 {
 public:
@@ -335,10 +344,6 @@ TEST_F(TestSystemTimer, CheckCancellation)
     Clock::Internal::SetSystemClockForTesting(savedClock);
 }
 
-namespace {
-
-namespace CancelTimerTest {
-
 // A bit lower than maximum system timers just in case, for systems that
 // have some form of limit
 constexpr unsigned kCancelTimerCount = CHIP_SYSTEM_CONFIG_NUM_TIMERS - 4;
@@ -433,14 +438,8 @@ TEST_F(TestSystemTimer, Test)
     Clock::Internal::SetSystemClockForTesting(savedClock);
 }
 
-} // namespace CancelTimerTest
-} // namespace
-
 // Test the implementation helper classes TimerPool, TimerList, and TimerData.
-namespace chip {
-namespace System {
-
-TEST_F(TestSystemTimer, CheckTimerPool)
+STATIC_TEST(TestSystemTimer, CheckTimerPool)
 {
     TestContext & testContext = TestSystemTimer::ctx;
     Layer & systemLayer       = *testContext.mLayer;
@@ -576,9 +575,6 @@ TEST_F(TestSystemTimer, CheckTimerPool)
     EXPECT_TRUE(SYSTEM_STATS_TEST_HIGH_WATER_MARK(Stats::kSystemLayer_NumTimers, 4));
 }
 
-} // namespace System
-} // namespace chip
-
 TEST_F(TestSystemTimer, ExtendTimerToTest)
 {
     if (!LayerEvents<LayerImpl>::HasServiceEvents())
@@ -754,3 +750,6 @@ static int TestTeardown(void * aContext)
     ::chip::Platform::MemoryShutdown();
     return (SUCCESS);
 }
+
+} // namespace System
+} // namespace chip