From 7a925482744e43d8e5e956492ec47c2c132f4125 Mon Sep 17 00:00:00 2001
From: li-tiangang4 <litiangang4@huawei-partners.com>
Date: Fri, 8 Aug 2025 14:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81=E5=B7=AE?=
 =?UTF-8?q?=E5=BC=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: li-tiangang4 <litiangang4@huawei-partners.com>
---
 .../src/distributed_hardware_proxy_test.cpp   |  1 +
 .../include/distributed_hardware_stub_test.h  | 32 +++++++++----------
 .../common/transport/mock_other_method.cpp    |  3 +-
 .../common/transport/mock_other_method.h      |  5 +--
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/interfaces/inner_kits/test/unittest/common/ipc/distributed_hardware_proxy/src/distributed_hardware_proxy_test.cpp b/interfaces/inner_kits/test/unittest/common/ipc/distributed_hardware_proxy/src/distributed_hardware_proxy_test.cpp
index fbf09771..94e9c789 100644
--- a/interfaces/inner_kits/test/unittest/common/ipc/distributed_hardware_proxy/src/distributed_hardware_proxy_test.cpp
+++ b/interfaces/inner_kits/test/unittest/common/ipc/distributed_hardware_proxy/src/distributed_hardware_proxy_test.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "distributed_hardware_proxy_test.h"
+
 #include "dhardware_ipc_interface_code.h"
 #include "av_trans_errno.h"
 
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwarestub/include/distributed_hardware_stub_test.h b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwarestub/include/distributed_hardware_stub_test.h
index c5004a1b..b5aeba8b 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwarestub/include/distributed_hardware_stub_test.h
+++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwarestub/include/distributed_hardware_stub_test.h
@@ -199,6 +199,22 @@ int32_t UnLoadDistributedHDF(const DHType dhType)
 }
 };
 
+class MockGetDhDescriptorsCallbackStub : public IRemoteStub<IGetDhDescriptorsCallback> {
+public:
+    void OnSuccess(const std::string &networkId, const std::vector<DHDescriptor> &descriptors,
+        EnableStep enableStep) override
+    {
+        (void)networkId;
+        (void)descriptors;
+        (void)enableStep;
+    }
+    void OnError(const std::string &networkId, int32_t error) override
+    {
+        (void)networkId;
+        (void)error;
+    }
+};
+
 class MockIPublisherListener : public IRemoteStub<IPublisherListener> {
 public:
     void OnMessage(const DHTopic topic, const std::string& message)
@@ -235,22 +251,6 @@ public:
         (void)dhDescriptor;
     }
 };
-
-class MockGetDhDescriptorsCallbackStub : public IRemoteStub<IGetDhDescriptorsCallback> {
-public:
-    void OnSuccess(const std::string &networkId, const std::vector<DHDescriptor> &descriptors,
-        EnableStep enableStep) override
-    {
-        (void)networkId;
-        (void)descriptors;
-        (void)enableStep;
-    }
-    void OnError(const std::string &networkId, int32_t error) override
-    {
-        (void)networkId;
-        (void)error;
-    }
-};
 } // namespace DistributedHardware
 } // namespace OHOS
 #endif
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/transport/mock_other_method.cpp b/services/distributedhardwarefwkservice/test/unittest/common/transport/mock_other_method.cpp
index 4549dd9f..792f670e 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/transport/mock_other_method.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/transport/mock_other_method.cpp
@@ -12,10 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "os_account_manager.h"
 
 #include "mock_other_method.h"
 
+#include "os_account_manager.h"
+
 namespace OHOS {
 namespace AccountSA {
 /**
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/transport/mock_other_method.h b/services/distributedhardwarefwkservice/test/unittest/common/transport/mock_other_method.h
index b7628f90..90155c60 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/transport/mock_other_method.h
+++ b/services/distributedhardwarefwkservice/test/unittest/common/transport/mock_other_method.h
@@ -12,8 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef DISRIBUTED_HARDWARE_MOCK_OTHER_METHOD_H
-#define DISRIBUTED_HARDWARE_MOCK_OTHER_METHOD_H
+
+#ifndef DISTRIBUTED_HARDWARE_MOCK_OTHER_METHOD_H
+#define DISTRIBUTED_HARDWARE_MOCK_OTHER_METHOD_H
 
 #include <gmock/gmock.h>
 
-- 
Gitee