From e6d7ee68181db70ca7afe1adf5abecc351e27ba6 Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Tue, 26 Dec 2023 17:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?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: pwx1285814 Change-Id: I989a3d0202a968b8f696c1d9ccb29352cd6fcdde --- .../dscreenmgr/2.0/src/dscreen_manager_test.cpp | 6 +++++- .../sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp | 6 +++++- .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp index 280a634d..efb17055 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp @@ -17,6 +17,7 @@ #include "2.0/include/dscreen_manager_test.h" #include "common/include/screen_manager_adapter.h" #undef private +#include "xcollie/watchdog.h" using namespace testing; using namespace testing::ext; @@ -30,7 +31,10 @@ void DScreenManagerTestV2::TearDownTestCase(void) {} void DScreenManagerTestV2::SetUp() {} -void DScreenManagerTestV2::TearDown() {} +void DScreenManagerTestV2::TearDown() +{ + OHOS::HiviewDFX::Watchdog::GetInstance().StopWatchdog(); +} /** * @tc.name: Initialize_001 diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp index a9562dfe..5534a2cd 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp @@ -14,6 +14,7 @@ */ #include "2.0/include/dscreen_test.h" +#include "xcollie/watchdog.h" #define private public #include "dscreen_constants.h" @@ -53,7 +54,10 @@ void DScreenTestV2::SetUp(void) dScreen_->devId_ = "peerDevId"; } -void DScreenTestV2::TearDown(void) {} +void DScreenTestV2::TearDown(void) +{ + OHOS::HiviewDFX::Watchdog::GetInstance().StopWatchdog(); +} /** * @tc.name: AddTask_001 diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 4f081c28..cebed84f 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -92,6 +92,7 @@ ohos_unittest("DscreenMgrTest") { "graphic_2d:surface", "graphic_2d:sync_fence", "hdf_core:libhdi", + "hicollie:libhicollie", "player_framework:media_client", "window_manager:libdm", ] -- Gitee