From ca55b8a5ff387ad2a5a74be88aeb6976562bbc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 23 Sep 2024 10:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UT=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- test/softbusunittest/UTTest_softbus_listener.cpp | 12 +++++------- test/unittest/UTTest_ipc_server_stub.cpp | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index f9892bc37..9758b4f4d 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -491,11 +491,9 @@ HWTEST_F(SoftbusListenerTest, GetDeviceSecurityLevel_001, testing::ext::TestSize HWTEST_F(SoftbusListenerTest, GetDmRadarHelperObj_001, testing::ext::TestSize.Level0) { - if (softbusListener == nullptr) { - softbusListener = std::make_shared(); - } + std::shared_ptr softbusListener = std::make_shared(); auto ret = softbusListener->GetDmRadarHelperObj(); - EXPECT_NE(ret, nullptr); + EXPECT_EQ(ret, nullptr); } HWTEST_F(SoftbusListenerTest, SetHostPkgName_001, testing::ext::TestSize.Level0) @@ -525,7 +523,7 @@ HWTEST_F(SoftbusListenerTest, CacheDeviceInfo_001, testing::ext::TestSize.Level0 softbusListener = std::make_shared(); } softbusListener->CacheDeviceInfo(deviceId, infoPtr); - EXPECT_EQ(softbusListener->isRadarSoLoad_, true); + EXPECT_EQ(softbusListener->isRadarSoLoad_, false); } HWTEST_F(SoftbusListenerTest, CacheDeviceInfo_002, testing::ext::TestSize.Level0) @@ -537,7 +535,7 @@ HWTEST_F(SoftbusListenerTest, CacheDeviceInfo_002, testing::ext::TestSize.Level0 softbusListener = std::make_shared(); } softbusListener->CacheDeviceInfo(deviceId, infoPtr); - EXPECT_EQ(softbusListener->isRadarSoLoad_, true); + EXPECT_EQ(softbusListener->isRadarSoLoad_, false); } HWTEST_F(SoftbusListenerTest, CacheDeviceInfo_003, testing::ext::TestSize.Level0) @@ -549,7 +547,7 @@ HWTEST_F(SoftbusListenerTest, CacheDeviceInfo_003, testing::ext::TestSize.Level0 softbusListener = std::make_shared(); } softbusListener->CacheDeviceInfo(deviceId, infoPtr); - EXPECT_EQ(softbusListener->isRadarSoLoad_, true); + EXPECT_EQ(softbusListener->isRadarSoLoad_, false); } HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_001, testing::ext::TestSize.Level0) diff --git a/test/unittest/UTTest_ipc_server_stub.cpp b/test/unittest/UTTest_ipc_server_stub.cpp index 587d3dc85..4ee214072 100644 --- a/test/unittest/UTTest_ipc_server_stub.cpp +++ b/test/unittest/UTTest_ipc_server_stub.cpp @@ -570,6 +570,7 @@ HWTEST_F(IpcServerStubTest, OnAddSystemAbility_001, testing::ext::TestSize.Level std::string deviceId; IpcServerStub::GetInstance().OnAddSystemAbility(systemAbilityId, deviceId); ASSERT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); + IpcServerStub::GetInstance().OnRemoveSystemAbility(systemAbilityId, deviceId); } /** -- Gitee