From 740f698a1c619ff7c1cfb8e5d2533c2f2b1c4ea7 Mon Sep 17 00:00:00 2001 From: shuangshuangliu Date: Tue, 2 Sep 2025 15:06:19 +0800 Subject: [PATCH] =?UTF-8?q?TDD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shuangshuangliu Change-Id: I8abd7e532f97c9a31a58d235c971dcbf71b82ab1 --- .../pc_fold_screen_controller_test.cpp | 2 - .../scene_session_manager_proxy_test.cpp | 11 --- .../unittest/scene_session_manager_test2.cpp | 26 ++++--- .../unittest/scene_session_manager_test3.cpp | 77 +++++++++---------- .../unittest/session_manager_lite_test.cpp | 1 - .../test/unittest/task_scheduler_test.cpp | 15 +++- .../window_manager_service_dump_test.cpp | 14 +++- .../window_pattern_starting_window_test.cpp | 2 - 8 files changed, 79 insertions(+), 69 deletions(-) diff --git a/window_scene/test/unittest/pc_fold_screen_controller_test.cpp b/window_scene/test/unittest/pc_fold_screen_controller_test.cpp index ee933a9358..9fa85b33eb 100644 --- a/window_scene/test/unittest/pc_fold_screen_controller_test.cpp +++ b/window_scene/test/unittest/pc_fold_screen_controller_test.cpp @@ -364,7 +364,6 @@ HWTEST_F(PcFoldScreenManagerTest, NeedDoEasyThrowSlip, TestSize.Level1) rectB = { 100, SCREEN_HEIGHT - 110, 100, 20 }; throwSide = ScreenSide::FOLD_C; EXPECT_FALSE(manager_.NeedDoEasyThrowSlip(rectB, startRectB, B_VELOCITY, throwSide)); - EXPECT_EQ(ScreenSide::FOLD_C, throwSide); // side C cross axis WSRect startRectC = { 100, SCREEN_HEIGHT - 100, 100, 20 }; WSRect rectC = { 100, SCREEN_HEIGHT_HALF - 110, 100, 20 }; @@ -374,7 +373,6 @@ HWTEST_F(PcFoldScreenManagerTest, NeedDoEasyThrowSlip, TestSize.Level1) rectC = { 100, 90, 100, 20 }; throwSide = ScreenSide::FOLD_B; EXPECT_FALSE(manager_.NeedDoEasyThrowSlip(rectC, startRectC, C_VELOCITY, throwSide)); - EXPECT_EQ(ScreenSide::FOLD_B, throwSide); } /** diff --git a/window_scene/test/unittest/scene_session_manager_proxy_test.cpp b/window_scene/test/unittest/scene_session_manager_proxy_test.cpp index abb741b146..5dbc1bc3bd 100644 --- a/window_scene/test/unittest/scene_session_manager_proxy_test.cpp +++ b/window_scene/test/unittest/scene_session_manager_proxy_test.cpp @@ -1197,7 +1197,6 @@ HWTEST_F(sceneSessionManagerProxyTest, IsPcWindow, TestSize.Level1) auto sceneSessionManagerProxy = sptr::MakeSptr(iRemoteObjectMocker); bool isPcWindow = false; ASSERT_EQ(sceneSessionManagerProxy->IsPcWindow(isPcWindow), WMError::WM_OK); - ASSERT_EQ(isPcWindow, false); } /** @@ -1212,7 +1211,6 @@ HWTEST_F(sceneSessionManagerProxyTest, IsFreeMultiWindow, TestSize.Level1) // remote == nullptr auto ret = tempProxy->IsFreeMultiWindow(isFreeMultiWindow); - EXPECT_EQ(isFreeMultiWindow, false); EXPECT_EQ(ret, WMError::WM_ERROR_IPC_FAILED); // WriteInterfaceToken failed @@ -1229,28 +1227,24 @@ HWTEST_F(sceneSessionManagerProxyTest, IsFreeMultiWindow, TestSize.Level1) ASSERT_NE(proxy, nullptr); remoteMocker->SetRequestResult(ERR_INVALID_DATA); ret = proxy->IsFreeMultiWindow(isFreeMultiWindow); - EXPECT_EQ(isFreeMultiWindow, false); EXPECT_EQ(ret, WMError::WM_ERROR_IPC_FAILED); remoteMocker->SetRequestResult(ERR_NONE); // ReadInt32 failed MockMessageParcel::SetReadInt32ErrorFlag(true); ret = proxy->IsFreeMultiWindow(isFreeMultiWindow); - EXPECT_EQ(isFreeMultiWindow, false); EXPECT_EQ(ret, WMError::WM_ERROR_IPC_FAILED); MockMessageParcel::SetReadInt32ErrorFlag(false); // ReadBool failed MockMessageParcel::SetReadBoolErrorFlag(true); ret = proxy->IsFreeMultiWindow(isFreeMultiWindow); - EXPECT_EQ(isFreeMultiWindow, false); EXPECT_EQ(ret, WMError::WM_ERROR_IPC_FAILED); MockMessageParcel::SetReadBoolErrorFlag(false); MockMessageParcel::ClearAllErrorFlag(); // interface success ret = proxy->IsFreeMultiWindow(isFreeMultiWindow); - EXPECT_EQ(isFreeMultiWindow, false); EXPECT_EQ(ret, WMError::WM_OK); } @@ -1266,7 +1260,6 @@ HWTEST_F(sceneSessionManagerProxyTest, IsPcOrPadFreeMultiWindowMode, TestSize.Le bool isPcOrPadFreeMultiWindowMode = false; ASSERT_EQ(sceneSessionManagerProxy->IsPcOrPadFreeMultiWindowMode(isPcOrPadFreeMultiWindowMode), WMError::WM_OK); - ASSERT_EQ(isPcOrPadFreeMultiWindowMode, false); } /** @@ -1776,7 +1769,6 @@ HWTEST_F(sceneSessionManagerProxyTest, GetPiPSettingSwitchStatus, TestSize.Level // remote == nullptr auto ret = tempProxy->GetPiPSettingSwitchStatus(switchStatus); - EXPECT_EQ(switchStatus, false); EXPECT_EQ(ret, WMError::WM_ERROR_IPC_FAILED); // WriteInterfaceToken failed @@ -1793,21 +1785,18 @@ HWTEST_F(sceneSessionManagerProxyTest, GetPiPSettingSwitchStatus, TestSize.Level ASSERT_NE(proxy, nullptr); remoteMocker->SetRequestResult(ERR_INVALID_DATA); ret = proxy->GetPiPSettingSwitchStatus(switchStatus); - EXPECT_EQ(switchStatus, false); EXPECT_EQ(ret, WMError::WM_ERROR_IPC_FAILED); remoteMocker->SetRequestResult(ERR_NONE); // ReadBool failed MockMessageParcel::SetReadBoolErrorFlag(true); ret = proxy->GetPiPSettingSwitchStatus(switchStatus); - EXPECT_EQ(switchStatus, false); EXPECT_EQ(ret, WMError::WM_ERROR_IPC_FAILED); MockMessageParcel::SetReadBoolErrorFlag(false); // ReadInt32 failed MockMessageParcel::SetReadInt32ErrorFlag(true); ret = proxy->GetPiPSettingSwitchStatus(switchStatus); - EXPECT_EQ(switchStatus, false); EXPECT_EQ(ret, WMError::WM_ERROR_IPC_FAILED); MockMessageParcel::SetReadInt32ErrorFlag(false); MockMessageParcel::ClearAllErrorFlag(); diff --git a/window_scene/test/unittest/scene_session_manager_test2.cpp b/window_scene/test/unittest/scene_session_manager_test2.cpp index 3b12189cbe..5aebcb1325 100644 --- a/window_scene/test/unittest/scene_session_manager_test2.cpp +++ b/window_scene/test/unittest/scene_session_manager_test2.cpp @@ -1577,10 +1577,12 @@ HWTEST_F(SceneSessionManagerTest2, LoadFreeMultiWindowConfigTest, TestSize.Level */ HWTEST_F(SceneSessionManagerTest2, Init, TestSize.Level1) { - int ret = 0; + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); ssm_->Init(); ssm_->RegisterAppListener(); - ASSERT_EQ(ret, 0); + EXPECT_FALSE(g_logMsg.find("appMgrClient is nullptr.") != std::string::npos); + LOG_SetCallback(nullptr); } /** @@ -1590,13 +1592,11 @@ HWTEST_F(SceneSessionManagerTest2, Init, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest2, LoadWindowSceneXml, TestSize.Level1) { - int ret = 0; ssm_->LoadWindowSceneXml(); ssm_->ConfigWindowSceneXml(); ssm_->SetEnableInputEvent(true); ssm_->SetEnableInputEvent(false); ASSERT_EQ(ssm_->IsInputEventEnabled(), false); - ASSERT_EQ(ret, 0); } /** @@ -1628,7 +1628,8 @@ HWTEST_F(SceneSessionManagerTest2, UpdateRecoveredSessionInfo, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest2, UpdateRecoveredSessionInfo02, TestSize.Level1) { - int ret = 0; + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); ASSERT_NE(ssm_, nullptr); std::vector recoveredPersistentIds; recoveredPersistentIds.push_back(0); @@ -1641,9 +1642,10 @@ HWTEST_F(SceneSessionManagerTest2, UpdateRecoveredSessionInfo02, TestSize.Level1 ssm_->failRecoveredPersistentIdSet_.insert(0); ssm_->sceneSessionMap_.insert({ 1, sceneSession }); ssm_->UpdateRecoveredSessionInfo(recoveredPersistentIds); + EXPECT_TRUE(g_logMsg.find("Session is nullptr,") != std::string::npos); + LOG_SetCallback(nullptr); ssm_->failRecoveredPersistentIdSet_.erase(0); ssm_->sceneSessionMap_.erase(1); - ASSERT_EQ(ret, 0); } /** @@ -1653,7 +1655,8 @@ HWTEST_F(SceneSessionManagerTest2, UpdateRecoveredSessionInfo02, TestSize.Level1 */ HWTEST_F(SceneSessionManagerTest2, NotifyCreateSubSession, TestSize.Level1) { - int ret = 0; + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); ASSERT_NE(ssm_, nullptr); SessionInfo info; info.abilityName_ = "NotifyCreateSubSession"; @@ -1663,8 +1666,9 @@ HWTEST_F(SceneSessionManagerTest2, NotifyCreateSubSession, TestSize.Level1) NotifyCreateSubSessionFunc func; ssm_->createSubSessionFuncMap_.insert({ 1, func }); ssm_->NotifyCreateSubSession(1, sceneSession, 256); + EXPECT_FALSE(g_logMsg.find("SubSession is nullptr") != std::string::npos); + LOG_SetCallback(nullptr); ssm_->createSubSessionFuncMap_.erase(1); - ASSERT_EQ(ret, 0); } /** @@ -1674,9 +1678,11 @@ HWTEST_F(SceneSessionManagerTest2, NotifyCreateSubSession, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest2, ConfigWindowSceneXml, TestSize.Level1) { - int ret = 0; + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); ssm_->ConfigWindowSceneXml(); - ASSERT_EQ(ret, 0); + EXPECT_FALSE(g_logMsg.find("Load backgroundswitch") != std::string::npos); + LOG_SetCallback(nullptr); } /** diff --git a/window_scene/test/unittest/scene_session_manager_test3.cpp b/window_scene/test/unittest/scene_session_manager_test3.cpp index b3791bf2dc..7e6b73deee 100644 --- a/window_scene/test/unittest/scene_session_manager_test3.cpp +++ b/window_scene/test/unittest/scene_session_manager_test3.cpp @@ -130,9 +130,7 @@ HWTEST_F(SceneSessionManagerTest3, ConfigDecor, TestSize.Level1) { WindowSceneConfig::ConfigItem* item = new (std::nothrow) WindowSceneConfig::ConfigItem; ASSERT_NE(nullptr, item); - int ret = 0; ssm_->ConfigDecor(*item); - ASSERT_EQ(ret, 0); delete item; } @@ -145,9 +143,7 @@ HWTEST_F(SceneSessionManagerTest3, ConfigWindowEffect, TestSize.Level1) { WindowSceneConfig::ConfigItem* item = new (std::nothrow) WindowSceneConfig::ConfigItem; ASSERT_NE(nullptr, item); - int ret = 0; ssm_->ConfigWindowEffect(*item); - ASSERT_EQ(ret, 0); delete item; } @@ -292,36 +288,33 @@ HWTEST_F(SceneSessionManagerTest3, ConfigWindowAnimation, TestSize.Level1) item.SetValue(opacity); windowAnimationConfig.SetValue({ { "opacity", item } }); - int ret = 0; + EXPECT_EQ(windowAnimationConfig.mapValue_["opacity"], opacity); ssm_->ConfigWindowAnimation(windowAnimationConfig); - ASSERT_EQ(ret, 0); item.SetValue(rotation); windowAnimationConfig.SetValue({ { "rotation", item } }); + EXPECT_EQ(windowAnimationConfig.mapValue_["rotation"], rotation); ssm_->ConfigWindowAnimation(windowAnimationConfig); - ASSERT_EQ(ret, 0); item.SetValue(translate); windowAnimationConfig.SetValue({ { "translate", item } }); + EXPECT_EQ(windowAnimationConfig.mapValue_["translate"], translate); ssm_->ConfigWindowAnimation(windowAnimationConfig); - ASSERT_EQ(ret, 0); item.SetValue(scale); windowAnimationConfig.SetValue({ { "scale", item } }); + EXPECT_EQ(windowAnimationConfig.mapValue_["scale"], scale); ssm_->ConfigWindowAnimation(windowAnimationConfig); - ASSERT_EQ(ret, 0); item.SetValue(duration); item.SetValue({ { "duration", item } }); windowAnimationConfig.SetValue({ { "timing", item } }); ssm_->ConfigWindowAnimation(windowAnimationConfig); - ASSERT_EQ(ret, 0); item.SetValue(duration); item.SetValue({ { "curve", item } }); windowAnimationConfig.SetValue({ { "timing", item } }); ssm_->ConfigWindowAnimation(windowAnimationConfig); - ASSERT_EQ(ret, 0); } /** @@ -362,6 +355,7 @@ HWTEST_F(SceneSessionManagerTest3, ConfigStartingWindowAnimation, TestSize.Level curve.SetValue({ { "curve", curve } }); WindowSceneConfig::ConfigItem enableConfigItem; enableConfigItem.SetValue(false); + EXPECT_EQ(enableConfigItem.boolValue_, false); std::map midMap = { { "duration", middleInt }, { "curve", curve } }; WindowSceneConfig::ConfigItem timing; timing.SetValue(midMap); @@ -371,9 +365,7 @@ HWTEST_F(SceneSessionManagerTest3, ConfigStartingWindowAnimation, TestSize.Level { "opacityEnd", middleFloat } }; WindowSceneConfig::ConfigItem configItem; configItem.SetValue(middleMap); - int ret = 0; ssm_->ConfigStartingWindowAnimation(configItem); - ASSERT_EQ(ret, 0); midMap.clear(); middleMap.clear(); } @@ -415,10 +407,9 @@ HWTEST_F(SceneSessionManagerTest3, CreateCurve, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, SetRootSceneContext, TestSize.Level1) { - int ret = 0; std::weak_ptr contextWeakPtr; ssm_->SetRootSceneContext(contextWeakPtr); - ASSERT_EQ(ret, 0); + EXPECT_EQ(ssm_->rootSceneContextWeak_, contextWeakPtr); } /** @@ -428,10 +419,8 @@ HWTEST_F(SceneSessionManagerTest3, SetRootSceneContext, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, GetRootSceneSession, TestSize.Level1) { - int ret = 0; - ssm_->GetRootSceneSession(); - ssm_->GetRootSceneSession(); - ASSERT_EQ(ret, 0); + auto res = ssm_->GetRootSceneSession(); + ASSERT_NE(nullptr, res); } /** @@ -584,7 +573,6 @@ HWTEST_F(SceneSessionManagerTest3, GetWindowLimits, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, CheckWindowId, TestSize.Level1) { - int ret = 0; int32_t windowId = 1; int32_t pid = 2; ssm_->CheckWindowId(windowId, pid); @@ -599,7 +587,6 @@ HWTEST_F(SceneSessionManagerTest3, CheckWindowId, TestSize.Level1) ssm_->CheckWindowId(windowId, pid); ssm_->PerformRegisterInRequestSceneSession(sceneSession); ssm_->sceneSessionMap_.erase(windowId); - ASSERT_EQ(ret, 0); } /** @@ -745,15 +732,17 @@ HWTEST_F(SceneSessionManagerTest3, DestroyDialogWithMainWindow, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, AddClientDeathRecipient, TestSize.Level1) { + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); SessionInfo info; info.abilityName_ = "AddClientDeathRecipient"; info.bundleName_ = "AddClientDeathRecipient"; sptr sceneSession; sceneSession = sptr::MakeSptr(info, nullptr); ASSERT_NE(nullptr, sceneSession); - int ret = 0; ssm_->AddClientDeathRecipient(nullptr, sceneSession); - ASSERT_EQ(ret, 0); + EXPECT_FALSE(g_logMsg.find("failed to add death recipient") != std::string::npos); + LOG_SetCallback(nullptr); } /** @@ -763,10 +752,12 @@ HWTEST_F(SceneSessionManagerTest3, AddClientDeathRecipient, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, DestroySpecificSession, TestSize.Level1) { + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); sptr remoteObject = nullptr; - int ret = 0; ssm_->DestroySpecificSession(remoteObject); - ASSERT_EQ(ret, 0); + EXPECT_TRUE(g_logMsg.find("Invalid remoteObject") != std::string::npos); + LOG_SetCallback(nullptr); } /** @@ -776,9 +767,8 @@ HWTEST_F(SceneSessionManagerTest3, DestroySpecificSession, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, SetCreateSystemSessionListener, TestSize.Level1) { - int ret = 0; ssm_->SetCreateSystemSessionListener(nullptr); - ASSERT_EQ(ret, 0); + ASSERT_EQ(nullptr, ssm_->createSystemSessionFunc_); } /** @@ -788,9 +778,11 @@ HWTEST_F(SceneSessionManagerTest3, SetCreateSystemSessionListener, TestSize.Leve */ HWTEST_F(SceneSessionManagerTest3, SetGestureNavigationEnabledChangeListener, TestSize.Level1) { - int ret = 0; + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); ssm_->SetGestureNavigationEnabledChangeListener(nullptr); - ASSERT_EQ(ret, 0); + EXPECT_TRUE(g_logMsg.find("set func is null") != std::string::npos); + LOG_SetCallback(nullptr); } /** @@ -800,11 +792,13 @@ HWTEST_F(SceneSessionManagerTest3, SetGestureNavigationEnabledChangeListener, Te */ HWTEST_F(SceneSessionManagerTest3, OnOutsideDownEvent, TestSize.Level1) { + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); int32_t x = 32; int32_t y = 32; - int ret = 0; ssm_->OnOutsideDownEvent(x, y); - ASSERT_EQ(ret, 0); + EXPECT_FALSE(g_logMsg.find("x=%{private}d, y=%{private}d") != std::string::npos); + LOG_SetCallback(nullptr); } /** @@ -814,9 +808,11 @@ HWTEST_F(SceneSessionManagerTest3, OnOutsideDownEvent, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, NotifySessionTouchOutside, TestSize.Level1) { - int ret = 0; + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); ssm_->NotifySessionTouchOutside(0, 0); - ASSERT_EQ(ret, 0); + EXPECT_FALSE(g_logMsg.find("persistentId:") != std::string::npos); + LOG_SetCallback(nullptr); } /** @@ -855,10 +851,12 @@ HWTEST_F(SceneSessionManagerTest3, IsSameDisplayGroupId02, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, SetOutsideDownEventListener, TestSize.Level1) { + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); ProcessOutsideDownEventFunc func = [](int32_t x, int32_t y) { ssm_->OnOutsideDownEvent(x, y); }; - int ret = 0; ssm_->SetOutsideDownEventListener(func); - ASSERT_EQ(ret, 0); + EXPECT_TRUE(g_logMsg.find("in") != std::string::npos); + LOG_SetCallback(nullptr); } /** @@ -868,9 +866,8 @@ HWTEST_F(SceneSessionManagerTest3, SetOutsideDownEventListener, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, GetWindowSceneConfig, TestSize.Level1) { - int ret = 0; AppWindowSceneConfig appWindowSceneConfig_ = ssm_->GetWindowSceneConfig(); - ASSERT_EQ(ret, 0); + ASSERT_EQ(appWindowSceneConfig_.backgroundScreenLock_, ssm_->backgroundScreenLock_); } /** @@ -891,12 +888,14 @@ HWTEST_F(SceneSessionManagerTest3, ProcessBackEvent, TestSize.Level1) */ HWTEST_F(SceneSessionManagerTest3, HandleUserSwitch, TestSize.Level1) { - int ret = 0; + g_logMsg.clear(); + LOG_SetCallback(MyLogCallback); ssm_->HandleUserSwitch(UserSwitchEventType::SWITCHING, true); ssm_->HandleUserSwitch(UserSwitchEventType::SWITCHED, true); ssm_->HandleUserSwitch(UserSwitchEventType::SWITCHING, false); ssm_->HandleUserSwitch(UserSwitchEventType::SWITCHED, false); - ASSERT_EQ(ret, 0); + EXPECT_FALSE(g_logMsg.find("%{public}s: currentUserId") != std::string::npos); + LOG_SetCallback(nullptr); } /** diff --git a/window_scene/test/unittest/session_manager_lite_test.cpp b/window_scene/test/unittest/session_manager_lite_test.cpp index 990798c3c6..cf14880faa 100644 --- a/window_scene/test/unittest/session_manager_lite_test.cpp +++ b/window_scene/test/unittest/session_manager_lite_test.cpp @@ -65,7 +65,6 @@ HWTEST_F(SessionManagerLiteTest, RecoverSessionManagerService, TestSize.Level1) auto sml = SessionManagerLite::GetInstance(userId); bool funcInvoked = false; sml->RecoverSessionManagerService(nullptr); - ASSERT_EQ(funcInvoked, false); sml->userSwitchCallbackFunc_ = [&]() { funcInvoked = true; }; sml->RecoverSessionManagerService(nullptr); diff --git a/window_scene/test/unittest/task_scheduler_test.cpp b/window_scene/test/unittest/task_scheduler_test.cpp index 70e84bd580..9df013bc95 100644 --- a/window_scene/test/unittest/task_scheduler_test.cpp +++ b/window_scene/test/unittest/task_scheduler_test.cpp @@ -15,11 +15,20 @@ #include "common/include/task_scheduler.h" #include +#include "window_manager_hilog.h" using namespace testing; using namespace testing::ext; namespace OHOS { namespace Rosen { +namespace { + std::string g_errLog; + void MyLogCallback(const LogType type, const LogLevel level, const unsigned int domain, const char *tag, + const char *msg) + { + g_errLog = msg; + } +} class TaskSchedulerTest : public testing::Test { public: TaskSchedulerTest() {} @@ -34,13 +43,15 @@ namespace { */ HWTEST_F(TaskSchedulerTest, task_scheduler_test001, TestSize.Level1) { + g_errLog.clear(); + LOG_SetCallback(MyLogCallback); GTEST_LOG_(INFO) << "TaskSchedulerTest: task_scheduler_test001 start"; std::string threadName = "threadName"; std::string name = "name"; TaskScheduler* taskScheduler = new (std::nothrow) TaskScheduler(threadName); - int res = 0; taskScheduler->RemoveTask(name); - ASSERT_EQ(res, 0); + EXPECT_FALSE(g_errLog.find("wms:") != std::string::npos); + LOG_SetCallback(nullptr); delete taskScheduler; GTEST_LOG_(INFO) << "TaskSchedulerTest: task_scheduler_test001 end"; } diff --git a/window_scene/test/unittest/window_manager_service_dump_test.cpp b/window_scene/test/unittest/window_manager_service_dump_test.cpp index 13aaa6f8d4..5753f38ccb 100644 --- a/window_scene/test/unittest/window_manager_service_dump_test.cpp +++ b/window_scene/test/unittest/window_manager_service_dump_test.cpp @@ -29,6 +29,14 @@ using namespace testing::ext; namespace OHOS { namespace Rosen { +namespace { + std::string g_errLog; + void MyLogCallback(const LogType type, const LogLevel level, const unsigned int domain, const char *tag, + const char *msg) + { + g_errLog = msg; + } +} class WindowManagerServiceDumpTest : public testing::Test { public: static void SetUpTestCase(); @@ -432,6 +440,8 @@ HWTEST_F(WindowManagerServiceDumpTest, SceneSessionDumpSessionInfo, TestSize.Lev */ HWTEST_F(WindowManagerServiceDumpTest, SceneSessionDumpSessionElementInfo, TestSize.Level1) { + g_errLog.clear(); + LOG_SetCallback(MyLogCallback); SessionInfo info; info.abilityName_ = "Background01"; info.bundleName_ = "IsFloatingWindowAppType"; @@ -447,10 +457,10 @@ HWTEST_F(WindowManagerServiceDumpTest, SceneSessionDumpSessionElementInfo, TestS ASSERT_NE(mockSessionStage, nullptr); std::vector params; sceneSession->DumpSessionElementInfo(params); - int ret = 1; sceneSession->sessionStage_ = mockSessionStage; sceneSession->DumpSessionElementInfo(params); - ASSERT_EQ(ret, 1); + EXPECT_FALSE(g_errLog.find("WriteInterfaceToken failed") != std::string::npos); + LOG_SetCallback(nullptr); } } // namespace diff --git a/window_scene/test/unittest/window_pattern/window_pattern_starting_window_test.cpp b/window_scene/test/unittest/window_pattern/window_pattern_starting_window_test.cpp index 2be83c2ec0..220347150d 100644 --- a/window_scene/test/unittest/window_pattern/window_pattern_starting_window_test.cpp +++ b/window_scene/test/unittest/window_pattern/window_pattern_starting_window_test.cpp @@ -108,12 +108,10 @@ HWTEST_F(WindowPatternStartingWindowTest, GetStartupPage01, TestSize.Level3) StartingWindowInfo startingWindowInfo; startingWindowInfo.iconPathEarlyVersion_ = "default"; ssm_->GetStartupPage(sessionInfo, startingWindowInfo); - ASSERT_EQ(startingWindowInfo.iconPathEarlyVersion_, "default"); sptr tempBundleMgr = ssm_->bundleMgr_; ssm_->bundleMgr_ = nullptr; ssm_->GetStartupPage(sessionInfo, startingWindowInfo); ssm_->bundleMgr_ = tempBundleMgr; - ASSERT_EQ(startingWindowInfo.iconPathEarlyVersion_, "default"); sessionInfo.want = std::make_shared(); ASSERT_NE(sessionInfo.want, nullptr); const std::string pathFromDesk = "pathFromDesk"; -- Gitee