From 966cacb300d9c7d171b0fb2b2ee3edcf4e670274 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Fri, 12 Apr 2024 10:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8UT=E7=94=A8?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../src/distributed_input_sink_manager.cpp | 4 ++-- .../distributed_input_sinkmanager_test.cpp | 18 +++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp index 136acea..8df9119 100644 --- a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp +++ b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp @@ -619,9 +619,9 @@ int32_t DistributedInputSinkManager::Init() DHLOGE("dhFwkKit obtain fail!"); return ERR_DH_INPUT_SERVER_SINK_MANAGER_INIT_FAIL; } - projectWindowListener_ = new ProjectWindowListener(this); + projectWindowListener_ = sptr(new ProjectWindowListener(this)); dhFwkKit->RegisterPublisherListener(DHTopic::TOPIC_SINK_PROJECT_WINDOW_INFO, projectWindowListener_); - pluginStartListener_ = new PluginStartListener(); + pluginStartListener_ = sptr(new PluginStartListener()); dhFwkKit->RegisterPublisherListener(DHTopic::TOPIC_PHY_DEV_PLUGIN, pluginStartListener_); DistributedInputCollector::GetInstance().PreInit(); 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 4e1ef2b..2a8cef2 100644 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/distributed_input_sinkmanager_test.cpp +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/distributed_input_sinkmanager_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * 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 @@ -37,7 +37,7 @@ namespace DistributedInput { void DistributedInputSinkManagerTest::SetUp() { sinkManager_ = new DistributedInputSinkManager(DISTRIBUTED_HARDWARE_INPUT_SINK_SA_ID, true); - sinkManager_->projectWindowListener_ = new DistributedInputSinkManager::ProjectWindowListener(sinkManager_); + sinkManager_->Init(); uint64_t tokenId; const char *perms[2]; perms[0] = OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER; @@ -59,10 +59,6 @@ void DistributedInputSinkManagerTest::SetUp() void DistributedInputSinkManagerTest::TearDown() { - if (sinkManager_ != nullptr) { - delete sinkManager_; - sinkManager_ = nullptr; - } } void DistributedInputSinkManagerTest::SetUpTestCase() @@ -162,13 +158,15 @@ HWTEST_F(DistributedInputSinkManagerTest, RegisterGetSinkScreenInfosCallback_02, HWTEST_F(DistributedInputSinkManagerTest, OnMessage_01, testing::ext::TestSize.Level1) { - int32_t ret = sinkManager_->Init(); + int32_t fd = 1; + std::vector args; + int32_t ret = sinkManager_->Dump(fd, args); sinkManager_->OnStart(); sinkManager_->OnStop(); std::string message = ""; sinkManager_->projectWindowListener_->OnMessage(DHTopic::TOPIC_START_DSCREEN, message); sinkManager_->projectWindowListener_->OnMessage(DHTopic::TOPIC_SINK_PROJECT_WINDOW_INFO, message); - EXPECT_EQ(DH_SUCCESS, ret); + EXPECT_EQ(ERR_DH_INPUT_HIDUMP_DUMP_PROCESS_FAIL, ret); } HWTEST_F(DistributedInputSinkManagerTest, ParseMessage_01, testing::ext::TestSize.Level1) @@ -258,12 +256,10 @@ HWTEST_F(DistributedInputSinkManagerTest, ParseMessage_04, testing::ext::TestSiz HWTEST_F(DistributedInputSinkManagerTest, UpdateSinkScreenInfoCache_01, testing::ext::TestSize.Level1) { - int32_t ret = sinkManager_->Init(); - EXPECT_EQ(DH_SUCCESS, ret); std::string srcDevId = "umkyu1b165e1be98151891erbe8r91ev"; uint64_t srcWinId = 1; SinkScreenInfo sinkScreenInfoTmp {2, 1860, 980, 200, 200}; - ret = sinkManager_->projectWindowListener_->UpdateSinkScreenInfoCache(srcDevId, srcWinId, sinkScreenInfoTmp); + auto ret = sinkManager_->projectWindowListener_->UpdateSinkScreenInfoCache(srcDevId, srcWinId, sinkScreenInfoTmp); EXPECT_EQ(DH_SUCCESS, ret); } -- Gitee