From 6ce731b28233d5b1fdd597f3c3370f2b388bfc9c Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Thu, 18 Jan 2024 15:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B917=E4=B8=AA=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../distributed_input_sourcemanager_test.cpp | 12 ++++----- .../distributed_input_sourcetrans_test.cpp | 27 +++++++++---------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/distributed_input_sourcemanager_test.cpp b/services/source/sourcemanager/test/sourcemanagerunittest/distributed_input_sourcemanager_test.cpp index a3628a1..b6d6911 100644 --- a/services/source/sourcemanager/test/sourcemanagerunittest/distributed_input_sourcemanager_test.cpp +++ b/services/source/sourcemanager/test/sourcemanagerunittest/distributed_input_sourcemanager_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 @@ -551,9 +551,6 @@ HWTEST_F(DistributedInputSourceManagerTest, StartRemoteInput_04, testing::ext::T sptr callback(new TestStartDInputCallback()); int32_t ret = sourceManager_->StartRemoteInput(srcId, sinkId, INPUTTYPE, callback); EXPECT_EQ(DH_SUCCESS, ret); - - ret = sourceManager_->StartRemoteInput(srcId, sinkId, INPUTTYPE_MOUSE, callback); - EXPECT_EQ(DH_SUCCESS, ret); } HWTEST_F(DistributedInputSourceManagerTest, StartRemoteInput_05, testing::ext::TestSize.Level1) @@ -572,6 +569,7 @@ HWTEST_F(DistributedInputSourceManagerTest, StartRemoteInput_05, testing::ext::T srcId = "networkidc08647073e02e7a78f09473aa122ff57fc81c00"; DistributedInputSourceManager::DInputClientStartInfo startInfo {sinkId, INPUTTYPE, callback}; sourceManager_->staCallbacks_.push_back(startInfo); + DistributedInputTransportBase::GetInstance().remoteDevSessionMap_.clear(); ret = sourceManager_->StartRemoteInput(srcId, sinkId, INPUTTYPE, callback); EXPECT_EQ(ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL, ret); } @@ -595,12 +593,11 @@ HWTEST_F(DistributedInputSourceManagerTest, StopRemoteInput_04, testing::ext::Te { std::string srcId = "networkidc08647073e02e7a78f09473aa122ff57fc81c00"; std::string sinkId = "umkyu1b165e1be98151891erbe8r91ev"; + int32_t sessionId = 1; sptr callback(new TestStopDInputCallback()); + DistributedInputTransportBase::GetInstance().remoteDevSessionMap_[sinkId] = sessionId; int32_t ret = sourceManager_->StopRemoteInput(srcId, sinkId, INPUTTYPE, callback); EXPECT_EQ(DH_SUCCESS, ret); - - ret = sourceManager_->StopRemoteInput(srcId, sinkId, INPUTTYPE_MOUSE, callback); - EXPECT_EQ(DH_SUCCESS, ret); } HWTEST_F(DistributedInputSourceManagerTest, StopRemoteInput_05, testing::ext::TestSize.Level1) @@ -620,6 +617,7 @@ HWTEST_F(DistributedInputSourceManagerTest, StopRemoteInput_05, testing::ext::Te srcId = "networkidc08647073e02e7a78f09473aa122ff57fc81c00"; DistributedInputSourceManager::DInputClientStopInfo stopInfo {sinkId, INPUTTYPE, callback}; sourceManager_->stpCallbacks_.push_back(stopInfo); + DistributedInputTransportBase::GetInstance().remoteDevSessionMap_.clear(); ret = sourceManager_->StopRemoteInput(srcId, sinkId, INPUTTYPE, callback); EXPECT_EQ(ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL, ret); } diff --git a/services/source/transport/test/sourcetransunittest/distributed_input_sourcetrans_test.cpp b/services/source/transport/test/sourcetransunittest/distributed_input_sourcetrans_test.cpp index 25c8d5f..dd7b41d 100644 --- a/services/source/transport/test/sourcetransunittest/distributed_input_sourcetrans_test.cpp +++ b/services/source/transport/test/sourcetransunittest/distributed_input_sourcetrans_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 @@ -52,26 +52,25 @@ HWTEST_F(DistributedInputSourceTransTest, Init01, testing::ext::TestSize.Level0) HWTEST_F(DistributedInputSourceTransTest, OpenInputSoftbus01, testing::ext::TestSize.Level0) { - std::string remoteDevId = ""; + std::string remoteDevId = "f6d4c08647073e02e7a78f09473aa122ff57fc81c00981fcf5be989e7d112591"; int32_t ret = DistributedInputSourceTransport::GetInstance().OpenInputSoftbus(remoteDevId, false); - EXPECT_EQ(ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_OPEN_SESSION_FAIL, ret); + EXPECT_EQ(DH_SUCCESS, ret); + DistributedInputSourceTransport::GetInstance().Release(); } HWTEST_F(DistributedInputSourceTransTest, OpenInputSoftbus02, testing::ext::TestSize.Level0) { - std::string srcId = "f6d4c08647073e02e7a78f09473aa122ff57fc81c00981fcf5be989e7d112591"; - int32_t sessionId = 2; - DistributedInputTransportBase::GetInstance().remoteDevSessionMap_[srcId] = sessionId; - int32_t ret = DistributedInputSourceTransport::GetInstance().OpenInputSoftbus(srcId, true); - EXPECT_EQ(DH_SUCCESS, ret); - ret = DistributedInputSourceTransport::GetInstance().OpenInputSoftbus(srcId, false); - EXPECT_EQ(DH_SUCCESS, ret); - ret = DistributedInputSourceTransport::GetInstance().OpenInputSoftbus(srcId, false); + std::string remoteDevId = "f6d4c08647073e02e7a78f09473aa122ff57fc81c00981fcf5be989e7d112591"; + int32_t ret = DistributedInputSourceTransport::GetInstance().OpenInputSoftbus(remoteDevId, true); EXPECT_EQ(DH_SUCCESS, ret); +} - DistributedInputSourceTransport::GetInstance().CloseInputSoftbus(srcId, false); - DistributedInputSourceTransport::GetInstance().CloseInputSoftbus(srcId, false); - DistributedInputSourceTransport::GetInstance().CloseInputSoftbus(srcId, true); +HWTEST_F(DistributedInputSourceTransTest, OpenInputSoftbus03, testing::ext::TestSize.Level0) +{ + std::string remoteDevId = "f6d4c08647073e02e7a78f09473aa122ff57fc81c00981fcf5be989e7d112591"; + DistributedInputSourceTransport::GetInstance().latencyThreadNum = 1; + DistributedInputSourceTransport::GetInstance().injectThreadNum = 1; + int32_t ret = DistributedInputSourceTransport::GetInstance().OpenInputSoftbus(remoteDevId, false); EXPECT_EQ(DH_SUCCESS, ret); } -- Gitee