Unit tests for GeneratedCommands pass

Author: andreilitvin

src/app/data-model-provider/MetadataTypes.h

@@ -218,11 +218,6 @@ class ProviderMetadataTree
     virtual CommandEntry NextAcceptedCommand(const ConcreteCommandPath & before)                = 0;
     virtual std::optional<CommandInfo> GetAcceptedCommandInfo(const ConcreteCommandPath & path) = 0;
 
-    // "generated" commands are purely for reporting what types of command ids can be
-    // returned as responses.
-    virtual ConcreteCommandPath FirstGeneratedCommand(const ConcreteClusterPath & cluster) = 0;
-    virtual ConcreteCommandPath NextGeneratedCommand(const ConcreteCommandPath & before)   = 0;
-
     /// List items. TODO: convert ALL items above to the new format
 
     /// List all the generated commands for the given path

src/app/tests/test-interaction-model-api.cpp

@@ -246,15 +246,5 @@ MetadataList<CommandId> TestImCustomDataModel::GeneratedCommands(const ConcreteC
     return CodegenDataModelProviderInstance(nullptr /* delegate */)->GeneratedCommands(path);
 }
 
-ConcreteCommandPath TestImCustomDataModel::FirstGeneratedCommand(const ConcreteClusterPath & cluster)
-{
-    return CodegenDataModelProviderInstance(nullptr /* delegate */)->FirstGeneratedCommand(cluster);
-}
-
-ConcreteCommandPath TestImCustomDataModel::NextGeneratedCommand(const ConcreteCommandPath & before)
-{
-    return CodegenDataModelProviderInstance(nullptr /* delegate */)->NextGeneratedCommand(before);
-}
-
 } // namespace app
 } // namespace chip

src/app/tests/test-interaction-model-api.h

@@ -131,8 +131,6 @@ class TestImCustomDataModel : public DataModel::Provider
     DataModel::CommandEntry FirstAcceptedCommand(const ConcreteClusterPath & cluster) override;
     DataModel::CommandEntry NextAcceptedCommand(const ConcreteCommandPath & before) override;
     std::optional<DataModel::CommandInfo> GetAcceptedCommandInfo(const ConcreteCommandPath & path) override;
-    ConcreteCommandPath FirstGeneratedCommand(const ConcreteClusterPath & cluster) override;
-    ConcreteCommandPath NextGeneratedCommand(const ConcreteCommandPath & before) override;
     void Temporary_ReportAttributeChanged(const AttributePathParams & path) override {}
 };
 

src/controller/tests/data_model/DataModelFixtures.cpp

@@ -574,16 +574,5 @@ MetadataList<CommandId> CustomDataModel::GeneratedCommands(const ConcreteCluster
     return CodegenDataModelProviderInstance(nullptr /* delegate */)->GeneratedCommands(path);
 }
 
-
-ConcreteCommandPath CustomDataModel::FirstGeneratedCommand(const ConcreteClusterPath & cluster)
-{
-    return CodegenDataModelProviderInstance(nullptr /* delegate */)->FirstGeneratedCommand(cluster);
-}
-
-ConcreteCommandPath CustomDataModel::NextGeneratedCommand(const ConcreteCommandPath & before)
-{
-    return CodegenDataModelProviderInstance(nullptr /* delegate */)->NextGeneratedCommand(before);
-}
-
 } // namespace app
 } // namespace chip

src/controller/tests/data_model/DataModelFixtures.h

@@ -143,8 +143,6 @@ class CustomDataModel : public DataModel::Provider
     DataModel::CommandEntry FirstAcceptedCommand(const ConcreteClusterPath & cluster) override;
     DataModel::CommandEntry NextAcceptedCommand(const ConcreteCommandPath & before) override;
     std::optional<DataModel::CommandInfo> GetAcceptedCommandInfo(const ConcreteCommandPath & path) override;
-    ConcreteCommandPath FirstGeneratedCommand(const ConcreteClusterPath & cluster) override;
-    ConcreteCommandPath NextGeneratedCommand(const ConcreteCommandPath & before) override;
     void Temporary_ReportAttributeChanged(const AttributePathParams & path) override {}
 };
 

src/data-model-providers/codegen/CodegenDataModelProvider.cpp

@@ -128,11 +128,6 @@ const CommandId * GetAcceptedCommands(const EmberAfCluster & cluster)
     return cluster.acceptedCommandList;
 }
 
-const CommandId * GetGeneratedCommands(const EmberAfCluster & cluster)
-{
-    return cluster.generatedCommandList;
-}
-
 /// Load the cluster information into the specified destination
 std::variant<CHIP_ERROR, DataModel::ClusterInfo> LoadClusterInfo(const ConcreteClusterPath & path, const EmberAfCluster & cluster)
 {
@@ -844,9 +839,6 @@ std::optional<DataModel::CommandInfo> CodegenDataModelProvider::GetAcceptedComma
 
 MetadataList<CommandId> CodegenDataModelProvider::GeneratedCommands(const ConcreteClusterPath & path)
 {
-    // For fixed:
-    //   ???? depends on how it looks like
-    //
     CommandHandlerInterface * interface =
         CommandHandlerInterfaceRegistry::Instance().GetCommandHandler(path.mEndpointId, path.mClusterId);
     if (interface != nullptr)
@@ -905,7 +897,7 @@ MetadataList<CommandId> CodegenDataModelProvider::GeneratedCommands(const Concre
     }
 
     const EmberAfCluster * cluster = FindServerCluster(path);
-    if (cluster == nullptr)
+    if ((cluster == nullptr) || (cluster->generatedCommandList == nullptr))
     {
         return {};
     }
@@ -918,28 +910,6 @@ MetadataList<CommandId> CodegenDataModelProvider::GeneratedCommands(const Concre
     return MetadataList<CommandId>::FromConstSpan({ cluster->generatedCommandList, commandCount });
 }
 
-ConcreteCommandPath CodegenDataModelProvider::FirstGeneratedCommand(const ConcreteClusterPath & path)
-{
-    EnumeratorCommandFinder handlerFinder(&CommandHandlerInterface::EnumerateGeneratedCommands);
-    CommandId commandId =
-        FindCommand(ConcreteCommandPath(path.mEndpointId, path.mClusterId, kInvalidCommandId), handlerFinder,
-                    detail::EnumeratorCommandFinder::Operation::kFindFirst, mGeneratedCommandsIterator, GetGeneratedCommands);
-
-    VerifyOrReturnValue(commandId != kInvalidCommandId, kInvalidCommandPath);
-    return ConcreteCommandPath(path.mEndpointId, path.mClusterId, commandId);
-}
-
-ConcreteCommandPath CodegenDataModelProvider::NextGeneratedCommand(const ConcreteCommandPath & before)
-{
-    EnumeratorCommandFinder handlerFinder(&CommandHandlerInterface::EnumerateGeneratedCommands);
-
-    CommandId commandId = FindCommand(before, handlerFinder, detail::EnumeratorCommandFinder::Operation::kFindNext,
-                                      mGeneratedCommandsIterator, GetGeneratedCommands);
-
-    VerifyOrReturnValue(commandId != kInvalidCommandId, kInvalidCommandPath);
-    return ConcreteCommandPath(before.mEndpointId, before.mClusterId, commandId);
-}
-
 void CodegenDataModelProvider::InitDataModelForTesting()
 {
     // Call the Ember-specific InitDataModelHandler

src/data-model-providers/codegen/CodegenDataModelProvider.h

@@ -184,9 +184,6 @@ class CodegenDataModelProvider : public DataModel::Provider
     DataModel::CommandEntry NextAcceptedCommand(const ConcreteCommandPath & before) override;
     std::optional<DataModel::CommandInfo> GetAcceptedCommandInfo(const ConcreteCommandPath & path) override;
 
-    ConcreteCommandPath FirstGeneratedCommand(const ConcreteClusterPath & cluster) override;
-    ConcreteCommandPath NextGeneratedCommand(const ConcreteCommandPath & before) override;
-
     void Temporary_ReportAttributeChanged(const AttributePathParams & path) override;
 
 protected: