diff --git a/services/distributedhardwarefwkservice/src/transport/dh_transport_obj.cpp b/services/distributedhardwarefwkservice/src/transport/dh_transport_obj.cpp index 91d9ad5bd55f5ce58d398a620cb8a6bf925cbaee..dc818d40ad2371684975362720151c3a19af2818 100644 --- a/services/distributedhardwarefwkservice/src/transport/dh_transport_obj.cpp +++ b/services/distributedhardwarefwkservice/src/transport/dh_transport_obj.cpp @@ -97,7 +97,7 @@ void FromJson(const cJSON *jsonObject, CommMsg &commMsg) } cJSON *commMsgTokenIdJson = cJSON_GetObjectItem(jsonObject, COMM_MSG_TOKENID_KEY); if (commMsgTokenIdJson != NULL && cJSON_IsNumber(commMsgTokenIdJson)) { - commMsg.tokenId = commMsgTokenIdJson->valueint; + commMsg.tokenId = static_cast(commMsgTokenIdJson->valueint); } cJSON *commMsgeJson = cJSON_GetObjectItem(jsonObject, COMM_MSG_MSG_KEY); if (commMsgeJson != NULL && cJSON_IsString(commMsgeJson)) { diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentdisable_fuzzer/componentdisable_fuzzer.h b/services/distributedhardwarefwkservice/test/fuzztest/componentdisable_fuzzer/componentdisable_fuzzer.h index 0f664e2bd0599d46078cbc72017be255b4cff106..9d225ccb3af12defd1e40ccb3ad12f43aa564ce2 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentdisable_fuzzer/componentdisable_fuzzer.h +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentdisable_fuzzer/componentdisable_fuzzer.h @@ -29,17 +29,17 @@ public: FuzzDistributedHardwareSource() = default; virtual ~FuzzDistributedHardwareSource() = default; - int32_t InitSource(const std::string&) override; + int32_t InitSource(const std::string& networkId) override; int32_t ReleaseSource() override; - int32_t RegisterDistributedHardware(const std::string&, const std::string&, - const EnableParam&, std::shared_ptr) override; - int32_t UnregisterDistributedHardware(const std::string&, const std::string&, + int32_t RegisterDistributedHardware(const std::string& networkId, const std::string& dhId, const EnableParam& param, + std::shared_ptr callback) override; + int32_t UnregisterDistributedHardware(const std::string& networkId, const std::string& dhId, std::shared_ptr callback) override; - int32_t ConfigDistributedHardware(const std::string&, const std::string&, const std::string&, - const std::string&) override; - void RegisterDistributedHardwareStateListener(std::shared_ptr) override; + int32_t ConfigDistributedHardware(const std::string& networkId, const std::string& dhId, const std::string& key, + const std::string& value) override; + void RegisterDistributedHardwareStateListener(std::shared_ptr listener) override; void UnregisterDistributedHardwareStateListener() override{} - void RegisterDataSyncTriggerListener(std::shared_ptr) override; + void RegisterDataSyncTriggerListener(std::shared_ptr listener) override; void UnregisterDataSyncTriggerListener() override{} }; } // namespace DistributedHardware diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp index 9d9d05b286b8ab32d9244eb8051c11f9e8363ed9..b5c11d470270fa48b1241c917fdac81e4ebad934 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp @@ -1211,6 +1211,7 @@ HWTEST_F(ComponentManagerTest, UninitCompSource_001, TestSize.Level1) HWTEST_F(ComponentManagerTest, UninitCompSink_001, TestSize.Level1) { + ComponentLoader::GetInstance().compHandlerMap_.clear(); SetUpComponentLoaderConfig(); auto ret = ComponentManager::GetInstance().UninitCompSink(DHType::AUDIO); SetDownComponentLoaderConfig();