Added SceneMockNodeConfig to define test Noce in TestSceneTable

lpbeliveau-silabs · lpbeliveau-silabs · commit d0f13b4d1a42 · 2024-04-11T11:46:46.000-04:00
diff --git a/src/app/tests/TestSceneTable.cpp b/src/app/tests/TestSceneTable.cpp
@@ -18,6 +18,7 @@
 
 #include <app/clusters/scenes-server/SceneTableImpl.h>
 #include <app/util/mock/Constants.h>
+#include <app/util/mock/MockNodeConfigImpl.h>
 #include <crypto/DefaultSessionKeystore.h>
 #include <lib/core/TLV.h>
 #include <lib/support/Span.h>
@@ -26,6 +27,8 @@
 #include <nlunit-test.h>
 
 using namespace chip;
+using namespace chip::Test;
+using namespace chip::app::Clusters::Globals::Attributes;
 
 using SceneTable        = scenes::SceneTable<scenes::ExtensionFieldSetsImpl>;
 using SceneTableEntry   = scenes::DefaultSceneTableImpl::SceneTableEntry;
@@ -45,6 +48,7 @@ constexpr uint8_t defaultTestFabricCapacity = (defaultTestTableSize - 1) / 2;
 constexpr chip::ClusterId kOnOffClusterId        = 0x0006;
 constexpr chip::ClusterId kLevelControlClusterId = 0x0008;
 constexpr chip::ClusterId kColorControlClusterId = 0x0300;
+constexpr chip::ClusterId kScenesClusterId       = 0x0062;
 
 // Test Endpoint ID
 constexpr chip::EndpointId kTestEndpoint1 = chip::Test::kMockEndpoint1;
@@ -152,6 +156,43 @@ static uint32_t OO_buffer_serialized_length = 0;
 static uint32_t LC_buffer_serialized_length = 0;
 static uint32_t CC_buffer_serialized_length = 0;
 
+// clang-format off
+static const MockNodeConfig SceneMockNodeConfig({
+    MockEndpointConfig(kTestEndpoint1, {
+        MockClusterConfig(kScenesClusterId, {}),
+        MockClusterConfig(kOnOffClusterId, {
+            kOnOffAttId
+        }),
+        MockClusterConfig(kLevelControlClusterId, {
+            kCurrentLevelId, kCurrentFrequencyId
+        }),
+    }),
+    MockEndpointConfig(kTestEndpoint2, {
+        MockClusterConfig(kScenesClusterId, {}),
+        MockClusterConfig(kOnOffClusterId, {
+            kOnOffAttId
+        }),
+        MockClusterConfig(kColorControlClusterId, {
+            kCurrentSaturationId, kCurrentXId,kCurrentYId, kColorTemperatureMiredsId,
+            kEnhancedCurrentHueId,kColorLoopActiveId, kColorLoopDirectionId, kColorLoopTimeId
+        }),
+    }),
+    MockEndpointConfig(kTestEndpoint3, {
+        MockClusterConfig(kScenesClusterId, {}),
+        MockClusterConfig(kOnOffClusterId, {
+            kOnOffAttId
+        }),
+        MockClusterConfig(kLevelControlClusterId, {
+            kCurrentLevelId, kCurrentFrequencyId
+        }),
+        MockClusterConfig(kColorControlClusterId, {
+            kCurrentSaturationId, kCurrentXId,kCurrentYId, kColorTemperatureMiredsId,
+            kEnhancedCurrentHueId,kColorLoopActiveId, kColorLoopDirectionId, kColorLoopTimeId
+        }),
+    }),
+});
+// clang-format on
+
 /// @brief Simulates a Handler where Endpoint 1 supports onoff and level control and Endpoint 2 supports onoff and color control
 class TestSceneHandler : public scenes::DefaultSceneHandlerImpl
 {
@@ -208,15 +249,15 @@ class TestSceneHandler : public scenes::DefaultSceneHandlerImpl
             }
         }
 
-        if (endpoint == kTestEndpoint1)
+        if (endpoint == kTestEndpoint2)
         {
             if (cluster == kOnOffClusterId || cluster == kColorControlClusterId)
             {
                 return true;
             }
         }
 
-        if (endpoint == kTestEndpoint1)
+        if (endpoint == kTestEndpoint3)
         {
             if (cluster == kOnOffClusterId || cluster == kLevelControlClusterId || cluster == kColorControlClusterId)
             {
@@ -258,7 +299,7 @@ class TestSceneHandler : public scenes::DefaultSceneHandlerImpl
                 break;
             }
         }
-        if (endpoint == kTestEndpoint1)
+        if (endpoint == kTestEndpoint2)
         {
             switch (cluster)
             {
@@ -280,7 +321,7 @@ class TestSceneHandler : public scenes::DefaultSceneHandlerImpl
                 break;
             }
         }
-        if (endpoint == kTestEndpoint1)
+        if (endpoint == kTestEndpoint3)
         {
             switch (cluster)
             {
@@ -347,7 +388,7 @@ class TestSceneHandler : public scenes::DefaultSceneHandlerImpl
         }
 
         // Takes values from cluster in Endpoint 2
-        if (endpoint == kTestEndpoint1)
+        if (endpoint == kTestEndpoint2)
         {
             switch (cluster)
             {
@@ -369,7 +410,7 @@ class TestSceneHandler : public scenes::DefaultSceneHandlerImpl
         }
 
         // Takes values from cluster in Endpoint 3
-        if (endpoint == kTestEndpoint1)
+        if (endpoint == kTestEndpoint3)
         {
             switch (cluster)
             {
@@ -600,8 +641,8 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == reader.Next());
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == extensionFieldSetIn.attributeValueList.Decode(reader));
 
-    NL_TEST_ASSERT(aSuite, sHandler.SupportsCluster(kTestEndpoint1, extensionFieldSetIn.clusterID));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sHandler.SerializeAdd(kTestEndpoint1, extensionFieldSetIn, buff_span));
+    NL_TEST_ASSERT(aSuite, sHandler.SupportsCluster(kTestEndpoint2, extensionFieldSetIn.clusterID));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sHandler.SerializeAdd(kTestEndpoint2, extensionFieldSetIn, buff_span));
 
     // Verify the handler extracted buffer matches the initial field sets
     NL_TEST_ASSERT(aSuite, 0 == memcmp(CC_list.data(), buff_span.data(), buff_span.size()));
@@ -632,9 +673,9 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
     memset(buffer, 0, buff_span.size());
 
     // Verify Deserializing is properly filling out output extension field set for color control
-    NL_TEST_ASSERT(aSuite, sHandler.SupportsCluster(kTestEndpoint1, kColorControlClusterId));
+    NL_TEST_ASSERT(aSuite, sHandler.SupportsCluster(kTestEndpoint2, kColorControlClusterId));
     NL_TEST_ASSERT(aSuite,
-                   CHIP_NO_ERROR == sHandler.Deserialize(kTestEndpoint1, kColorControlClusterId, CC_list, extensionFieldSetOut));
+                   CHIP_NO_ERROR == sHandler.Deserialize(kTestEndpoint2, kColorControlClusterId, CC_list, extensionFieldSetOut));
 
     // Verify Encoding the Extension field set returns the same data as the one serialized for color control previously
     writer.Init(buff_span);
@@ -1818,6 +1859,8 @@ int TestSetup(void * inContext)
 {
     VerifyOrReturnError(CHIP_NO_ERROR == chip::Platform::MemoryInit(), FAILURE);
 
+    SetMockNodeConfig(&TestScenes::SceneMockNodeConfig);
+
     // Initialize Scene Table
     SceneTable * sceneTable = scenes::GetSceneTableImpl();
     VerifyOrReturnError(nullptr != sceneTable, FAILURE);
diff --git a/src/app/util/mock/BUILD.gn b/src/app/util/mock/BUILD.gn
@@ -24,6 +24,8 @@ source_set("mock_ember") {
     "Functions.h",
     "MockNodeConfig.cpp",
     "MockNodeConfig.h",
+    "MockNodeConfigImpl.cpp",
+    "MockNodeConfigImpl.h",
     "attribute-storage.cpp",
   ]
 
diff --git a/src/app/util/mock/MockNodeConfigImpl.cpp b/src/app/util/mock/MockNodeConfigImpl.cpp
@@ -0,0 +1,79 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <app/util/mock/Constants.h>
+#include <app/util/mock/MockNodeConfigImpl.h>
+
+using namespace chip::Test;
+using namespace chip::app::Clusters::Globals::Attributes;
+
+static const MockNodeConfig * mockConfig = nullptr;
+
+const MockNodeConfig & DefaultMockNodeConfig()
+{
+    // clang-format off
+    static const MockNodeConfig config({
+        MockEndpointConfig(kMockEndpoint1, {
+            MockClusterConfig(MockClusterId(1), {
+                ClusterRevision::Id, FeatureMap::Id,
+            }, {
+                MockEventId(1), MockEventId(2),
+            }),
+            MockClusterConfig(MockClusterId(2), {
+                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1),
+            }),
+        }),
+        MockEndpointConfig(kMockEndpoint2, {
+            MockClusterConfig(MockClusterId(1), {
+                ClusterRevision::Id, FeatureMap::Id,
+            }),
+            MockClusterConfig(MockClusterId(2), {
+                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1), MockAttributeId(2),
+            }),
+            MockClusterConfig(MockClusterId(3), {
+                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1), MockAttributeId(2), MockAttributeId(3),
+            }),
+        }),
+        MockEndpointConfig(kMockEndpoint3, {
+            MockClusterConfig(MockClusterId(1), {
+                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1),
+            }),
+            MockClusterConfig(MockClusterId(2), {
+                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1), MockAttributeId(2), MockAttributeId(3), MockAttributeId(4),
+            }),
+            MockClusterConfig(MockClusterId(3), {
+                ClusterRevision::Id, FeatureMap::Id,
+            }),
+            MockClusterConfig(MockClusterId(4), {
+                ClusterRevision::Id, FeatureMap::Id,
+            }),
+        }),
+    });
+    // clang-format on
+    return config;
+}
+
+const MockNodeConfig & GetMockNodeConfig()
+{
+    return (mockConfig != nullptr) ? *mockConfig : DefaultMockNodeConfig();
+}
+
+void SetMockNodeConfig(const MockNodeConfig * config)
+{
+    mockConfig = config;
+}
diff --git a/src/app/util/mock/MockNodeConfigImpl.h b/src/app/util/mock/MockNodeConfigImpl.h
@@ -0,0 +1,25 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app/util/mock/MockNodeConfig.h>
+
+const chip::Test::MockNodeConfig & GetMockNodeConfig();
+
+void SetMockNodeConfig(const chip::Test::MockNodeConfig * config);
diff --git a/src/app/util/mock/attribute-storage.cpp b/src/app/util/mock/attribute-storage.cpp
@@ -37,7 +37,7 @@
 #include <app/util/attribute-storage.h>
 #include <app/util/endpoint-config-api.h>
 #include <app/util/mock/Constants.h>
-#include <app/util/mock/MockNodeConfig.h>
+#include <app/util/mock/MockNodeConfigImpl.h>
 
 #include <app/AttributeAccessInterface.h>
 #include <app/ConcreteAttributePath.h>
@@ -62,58 +62,7 @@ using namespace Clusters::Globals::Attributes;
 
 namespace {
 
-DataVersion dataVersion           = 0;
-const MockNodeConfig * mockConfig = nullptr;
-
-const MockNodeConfig & DefaultMockNodeConfig()
-{
-    // clang-format off
-    static const MockNodeConfig config({
-        MockEndpointConfig(kMockEndpoint1, {
-            MockClusterConfig(MockClusterId(1), {
-                ClusterRevision::Id, FeatureMap::Id,
-            }, {
-                MockEventId(1), MockEventId(2),
-            }),
-            MockClusterConfig(MockClusterId(2), {
-                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1),
-            }),
-        }),
-        MockEndpointConfig(kMockEndpoint2, {
-            MockClusterConfig(MockClusterId(1), {
-                ClusterRevision::Id, FeatureMap::Id,
-            }),
-            MockClusterConfig(MockClusterId(2), {
-                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1), MockAttributeId(2),
-            }),
-            MockClusterConfig(MockClusterId(3), {
-                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1), MockAttributeId(2), MockAttributeId(3),
-            }),
-        }),
-        MockEndpointConfig(kMockEndpoint3, {
-            MockClusterConfig(MockClusterId(1), {
-                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1),
-            }),
-            MockClusterConfig(MockClusterId(2), {
-                ClusterRevision::Id, FeatureMap::Id, MockAttributeId(1), MockAttributeId(2), MockAttributeId(3), MockAttributeId(4),
-            }),
-            MockClusterConfig(MockClusterId(3), {
-                ClusterRevision::Id, FeatureMap::Id,
-            }),
-            MockClusterConfig(MockClusterId(4), {
-                ClusterRevision::Id, FeatureMap::Id,
-            }),
-        }),
-    });
-    // clang-format on
-    return config;
-}
-
-const MockNodeConfig & GetMockNodeConfig()
-{
-    return (mockConfig != nullptr) ? *mockConfig : DefaultMockNodeConfig();
-}
-
+DataVersion dataVersion      = 0;
 uint16_t mockClusterRevision = 1;
 uint32_t mockFeatureMap      = 0x1234;
 bool mockAttribute1          = true;
@@ -240,8 +189,7 @@ bool emberAfContainsServerFromIndex(uint16_t index, ClusterId clusterId)
 {
     auto config = GetMockNodeConfig();
     VerifyOrReturnValue(index < config.endpoints.size(), false);
-    return true; // TODO: TestSceneTable relies on returning true here: https://github.com/project-chip/connectedhomeip/issues/30696
-    // return config.endpoints[index].clusterById(clusterId) != nullptr;
+    return config.endpoints[index].clusterById(clusterId) != nullptr;
 }
 
 const EmberAfEndpointType * emberAfFindEndpointType(EndpointId endpointId)

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ source_set("mock_ember") {`
`24`	`24`	`"Functions.h",`
`25`	`25`	`"MockNodeConfig.cpp",`
`26`	`26`	`"MockNodeConfig.h",`
	`27`	`+ "MockNodeConfigImpl.cpp",`
	`28`	`+ "MockNodeConfigImpl.h",`
`27`	`29`	`"attribute-storage.cpp",`
`28`	`30`	`]`
`29`	`31`