Try to fix CI tests

Author: wqx6

src/app/clusters/thread-border-router-management-server/thread-br-mgmt-server-utils.cpp

@@ -0,0 +1,41 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    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/server/Server.h"
+#include "lib/core/DataModelTypes.h"
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ThreadBorderRouterManagement {
+
+bool IsFailSafeArmed(FabricIndex accessingFabricIndex)
+{
+    auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
+    return failSafeContext.IsFailSafeArmed(accessingFabricIndex);
+}
+
+void DisarmFailSafeTimer()
+{
+    auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
+    failSafeContext.DisarmFailSafe();
+}
+
+} // namespace ThreadBorderRouterManagement
+} // namespace Clusters
+} // namespace app
+} // namespace chip

src/app/clusters/thread-border-router-management-server/thread-br-mgmt-server.cpp

@@ -29,7 +29,6 @@
 #include "app/MessageDef/StatusIB.h"
 #include "app/clusters/general-commissioning-server/general-commissioning-server.h"
 #include "app/data-model/Nullable.h"
-#include "app/server/Server.h"
 #include "crypto/RandUtils.h"
 #include "lib/core/CHIPError.h"
 #include "lib/support/CodeUtils.h"
@@ -53,12 +52,6 @@ static bool IsOverCASESession(CommandHandlerInterface::HandlerContext & ctx)
         exchangeCtx->GetSessionHandle()->AsSecureSession()->GetSecureSessionType() == Transport::SecureSession::Type::kCASE;
 }
 
-static bool IsFailSafeArmed(CommandHandlerInterface::HandlerContext & ctx)
-{
-    auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
-    return failSafeContext.IsFailSafeArmed(ctx.mCommandHandler.GetAccessingFabricIndex());
-}
-
 Status ServerInstance::HandleGetDatasetRequest(bool isOverCASESession, Delegate::DatasetType type,
                                                Thread::OperationalDataset & dataset)
 {
@@ -165,7 +158,7 @@ void ServerInstance::InvokeCommand(HandlerContext & ctxt)
                 mPath               = ctx.mRequestPath;
                 mAsyncCommandHandle = CommandHandler::Handle(&ctx.mCommandHandler);
                 ctx.mCommandHandler.FlushAcksRightAwayOnSlowCommand();
-                Status status = HandleSetActiveDatasetRequest(IsFailSafeArmed(ctx), req);
+                Status status = HandleSetActiveDatasetRequest(IsFailSafeArmed(ctx.mCommandHandler.GetAccessingFabricIndex()), req);
                 if (status != Status::Success)
                 {
                     OnActivateDatasetComplete(mRandomNumber, ChipError(ChipError::SdkPart::kIMGlobalStatus, to_underlying(status)));
@@ -341,8 +334,7 @@ void ServerInstance::OnActivateDatasetComplete(uint32_t randomNumber, CHIP_ERROR
     if (error == CHIP_NO_ERROR)
     {
         // The successful completion of the activation process SHALL disarm the fail-safe timer.
-        auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
-        failSafeContext.DisarmFailSafe();
+        DisarmFailSafeTimer();
         CommitSavedBreadcrumb();
     }
     else

src/app/clusters/thread-border-router-management-server/thread-br-mgmt-server.h

@@ -89,6 +89,10 @@ class ServerInstance : public CommandHandlerInterface, public AttributeAccessInt
     uint32_t mRandomNumber;
 };
 
+bool IsFailSafeArmed(FabricIndex accessingFabricIndex);
+
+void DisarmFailSafeTimer();
+
 } // namespace ThreadBorderRouterManagement
 } // namespace Clusters
 } // namespace app

src/app/tests/BUILD.gn

@@ -126,7 +126,6 @@ source_set("thread-border-router-management-test-srcs") {
   public_deps = [
     "${chip_root}/src/app",
     "${chip_root}/src/app/common:cluster-objects",
-    "${chip_root}/src/app/server",
     "${chip_root}/src/app/util/mock:mock_ember",
     "${chip_root}/src/lib/core",
   ]

src/app/tests/TestThreadBorderRouterManagementCluster.cpp

@@ -38,6 +38,13 @@ void SetBreadcrumb(Attributes::Breadcrumb::TypeInfo::Type breadcrumb) {}
 } // namespace GeneralCommissioning
 
 namespace ThreadBorderRouterManagement {
+// Mock functions
+bool IsFailSafeArmed(FabricIndex accessingFabricIndex)
+{
+    return true;
+}
+
+void DisarmFailSafeTimer() {}
 
 class TestDelegate : public Delegate
 {