From b25a2a88dd7fde0e0824de75e56e21df5bd9591e Mon Sep 17 00:00:00 2001 From: xxxx Date: Fri, 10 Jun 2022 14:30:42 +0800 Subject: [PATCH] Description:fix reviewBot Match-id-a4b335a9097c3be750f174234819597a7d5b4b1d --- common/include/white_list_util.cpp | 2 +- .../unittest/distributed_input_inner_test.cpp | 6 ++++- .../distributed_input_sinkmanager_test.cpp | 6 ----- .../distributed_input_source_transport.cpp | 2 +- .../test/sourcetransunittest/BUILD.gn | 1 - .../distributed_input_client_fuzzer.cpp | 6 +++-- .../distributed_input_kit_fuzzer.cpp | 26 ++++++++++++++++--- 7 files changed, 33 insertions(+), 16 deletions(-) diff --git a/common/include/white_list_util.cpp b/common/include/white_list_util.cpp index 2ddaf0e..bea4279 100644 --- a/common/include/white_list_util.cpp +++ b/common/include/white_list_util.cpp @@ -178,7 +178,7 @@ int32_t WhiteListUtil::GetWhiteList(const std::string &deviceId, TYPE_WHITE_LIST DHLOGI("start, deviceId=%s", GetAnonyString(deviceId).c_str()); std::lock_guard lock(mutex_); - TYPE_DEVICE_WHITE_LIST_MAP::iterator iter = mapDeviceWhiteList_.find(deviceId); + TYPE_DEVICE_WHITE_LIST_MAP::const_iterator iter = mapDeviceWhiteList_.find(deviceId); if (iter != mapDeviceWhiteList_.end()) { vecWhiteList = iter->second; DHLOGI("GetWhiteList success, deviceId=%s", GetAnonyString(deviceId).c_str()); diff --git a/interfaces/inner_kits/test/unittest/distributed_input_inner_test.cpp b/interfaces/inner_kits/test/unittest/distributed_input_inner_test.cpp index 83c1244..52a8808 100644 --- a/interfaces/inner_kits/test/unittest/distributed_input_inner_test.cpp +++ b/interfaces/inner_kits/test/unittest/distributed_input_inner_test.cpp @@ -44,6 +44,8 @@ void DistributedInputInnerTest::TestPrepareDInputCallback::OnResult( const std::string& deviceId, const int32_t& status) { + (void)deviceId; + (void)status; return; } @@ -51,6 +53,8 @@ void DistributedInputInnerTest::TestUnprepareDInputCallback::OnResult( const std::string& deviceId, const int32_t& status) { + (void)deviceId; + (void)status; return; } @@ -301,4 +305,4 @@ HWTEST_F(DistributedInputInnerTest, IsStartDistributedInput2, testing::ext::Test } } } -} +} \ No newline at end of file diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/distributed_input_sinkmanager_test.cpp b/services/sink/sinkmanager/test/sinkmanagerunittest/distributed_input_sinkmanager_test.cpp index 455af3a..dd4715c 100644 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/distributed_input_sinkmanager_test.cpp +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/distributed_input_sinkmanager_test.cpp @@ -47,12 +47,6 @@ HWTEST_F(DistributedInputSinkManagerTest, Init01, testing::ext::TestSize.Level0) int32_t ret = sinkManager_->Init(); EXPECT_EQ(SUCCESS, ret); } - -HWTEST_F(DistributedInputSinkManagerTest, Release01, testing::ext::TestSize.Level0) -{ - int32_t ret = sinkManager_->Release(); - EXPECT_EQ(SUCCESS, ret); -} } } } diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index 1e26404..dc0d225 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -546,7 +546,7 @@ void DistributedInputSourceTransport::OnBytesReceived(int32_t sessionId, const v return; } - std::string message = (char *)buf; + std::string message(buf, buf + dataLen); DHLOGI("OnBytesReceived message:%s.", message.c_str()); HandleSessionData(sessionId, message); diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index a04b07c..8c2fb50 100644 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -38,7 +38,6 @@ ohos_unittest("distributed_input_sourcetrans_test") { "${service_common}/include", "//third_party/json/include", "${services_source_path}/inputinject/include", - "//foundation/distributedhardware/distributed_input/services/source/transport/test/sourcetransunittest/mock", "//foundation/communication/dsoftbus/interfaces/kits/transport", ] diff --git a/test/fuzztest/distributedinputclient_fuzzer/distributed_input_client_fuzzer.cpp b/test/fuzztest/distributedinputclient_fuzzer/distributed_input_client_fuzzer.cpp index f1873de..5b6fd00 100644 --- a/test/fuzztest/distributedinputclient_fuzzer/distributed_input_client_fuzzer.cpp +++ b/test/fuzztest/distributedinputclient_fuzzer/distributed_input_client_fuzzer.cpp @@ -38,7 +38,8 @@ class TestRegisterInputCallback : public OHOS::DistributedHardware::RegisterCall TestRegisterInputCallback() = default; virtual ~TestRegisterInputCallback() = default; virtual int32_t OnRegisterResult(const std::string &devId, const std::string &dhId, int32_t status, - const std::string &data) override { + const std::string &data) override + { return 0; } }; @@ -48,7 +49,8 @@ public: TestUnregisterInputCallback() = default; virtual ~TestUnregisterInputCallback() = default; virtual int32_t OnUnregisterResult(const std::string &devId, const std::string &dhId, int32_t status, - const std::string &data) override { + const std::string &data) override + { return 0; } }; diff --git a/test/fuzztest/distributedinputkit_fuzzer/distributed_input_kit_fuzzer.cpp b/test/fuzztest/distributedinputkit_fuzzer/distributed_input_kit_fuzzer.cpp index d7b7d00..88791ce 100644 --- a/test/fuzztest/distributedinputkit_fuzzer/distributed_input_kit_fuzzer.cpp +++ b/test/fuzztest/distributedinputkit_fuzzer/distributed_input_kit_fuzzer.cpp @@ -42,7 +42,11 @@ public OHOS::DistributedHardware::DistributedInput::PrepareDInputCallbackStub { public: TestPrepareDInputCallback() = default; virtual ~TestPrepareDInputCallback() = default; - void OnResult(const std::string& deviceId, const int32_t& status) {}; + void OnResult(const std::string& deviceId, const int32_t& status) const + { + (void)deviceId; + (void)status; + }; }; class TestUnprepareDInputCallback : @@ -50,13 +54,22 @@ public OHOS::DistributedHardware::DistributedInput::UnprepareDInputCallbackStub public: TestUnprepareDInputCallback() = default; virtual ~TestUnprepareDInputCallback() = default; - void OnResult(const std::string& deviceId, const int32_t& status) {}; + void OnResult(const std::string& deviceId, const int32_t& status) const + { + (void)deviceId; + (void)status; + }; }; class TestStartDInputCallback : public OHOS::DistributedHardware::DistributedInput::StartDInputCallbackStub { public: - void OnResult(const std::string& devId, const uint32_t& inputTypes, const int32_t& status) {}; + void OnResult(const std::string& devId, const uint32_t& inputTypes, const int32_t& status) const + { + (void)devId; + (void)inputTypes; + (void)status; + }; }; class TestStopDInputCallback : @@ -64,7 +77,12 @@ public OHOS::DistributedHardware::DistributedInput::StopDInputCallbackStub { public: TestStopDInputCallback() = default; virtual ~TestStopDInputCallback() = default; - void OnResult(const std::string& devId, const uint32_t& inputTypes, const int32_t& status) {}; + void OnResult(const std::string& devId, const uint32_t& inputTypes, const int32_t& status) const + { + (void)devId; + (void)inputTypes; + (void)status; + }; }; void PrepareInputFuzzTest(const uint8_t* data, size_t size)