From 8fa0850581c6312068c97c7b0f3f8fb33e6f2efe Mon Sep 17 00:00:00 2001 From: hanlin15 Date: Tue, 9 Sep 2025 18:03:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5=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: hanlin15 --- .../ipc_binder_databus_invoker_unittest.cpp | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/ipc/native/test/unittest/common/ipc_binder_databus_invoker_unittest.cpp b/ipc/native/test/unittest/common/ipc_binder_databus_invoker_unittest.cpp index fcdd44f9..39a0fa2e 100644 --- a/ipc/native/test/unittest/common/ipc_binder_databus_invoker_unittest.cpp +++ b/ipc/native/test/unittest/common/ipc_binder_databus_invoker_unittest.cpp @@ -649,14 +649,19 @@ HWTEST_F(IPCDbinderDataBusInvokerTest, MakeDefaultServerSessionObjectTest001, Te DBinderDatabusInvoker testInvoker; std::string serviceName = "testserviceName"; std::string serverDeviceId = "testserverDeviceId"; - auto object = std::make_shared(serviceName, serverDeviceId, 1, nullptr, 1); + IPCProcessSkeleton *current = IPCProcessSkeleton::GetCurrent(); + current->instance_ = nullptr; + current->exitFlag_ = true; + std::shared_ptr object = + std::make_shared(serviceName, serverDeviceId, 1, nullptr, 1); std::shared_ptr ret = testInvoker.MakeDefaultServerSessionObject(1, object); EXPECT_EQ(ret, nullptr); - IPCProcessSkeleton *current = IPCProcessSkeleton::GetCurrent(); current->sessionName_ = SERVICE_NAME_TEST; ret = testInvoker.MakeDefaultServerSessionObject(1, object); EXPECT_EQ(ret, nullptr); + current->instance_ = nullptr; + current->exitFlag_ = false; } /** @@ -738,10 +743,15 @@ HWTEST_F(IPCDbinderDataBusInvokerTest, OnReceiveNewConnectionTest002, TestSize.L HWTEST_F(IPCDbinderDataBusInvokerTest, ResetCallingIdentityTest001, TestSize.Level1) { DBinderDatabusInvoker testInvoker; + IPCProcessSkeleton *current = IPCProcessSkeleton::GetCurrent(); + current->instance_ = nullptr; + current->exitFlag_ = true; std::string token = testInvoker.ResetCallingIdentity(); EXPECT_FALSE(token.empty()); bool ret = testInvoker.SetCallingIdentity(token, false); EXPECT_FALSE(ret); + current->instance_ = nullptr; + current->exitFlag_ = false; } /** @@ -1596,11 +1606,14 @@ HWTEST_F(IPCDbinderDataBusInvokerTest, JoinProcessThread001, TestSize.Level1) std::thread::id threadId = std::this_thread::get_id(); std::thread([&testInvoker, threadId]() { - std::this_thread::sleep_for(std::chrono::seconds(2)); - testInvoker.StopWorkThread(); - IPCProcessSkeleton *current = IPCProcessSkeleton::GetCurrent(); - current->WakeUpDataThread(threadId); - current->dataInfoQueue_.clear(); + IPCProcessSkeleton *current = IPCProcessSkeleton::GetCurrent(); + if (current == nullptr) { + return; + } + current->SetMaxWorkThread(3); + testInvoker.StopWorkThread(); + current->WakeUpDataThread(threadId); + current->dataInfoQueue_.clear(); }).detach(); testInvoker.JoinProcessThread(true); -- Gitee