From 2b168b8db4074b3c29356fbf38a2573dd8801585 Mon Sep 17 00:00:00 2001 From: liuxiang Date: Fri, 29 Aug 2025 20:55:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuxiang --- .../screen_capture_impl_unittest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/screen_capture_impl_unittest/screen_capture_impl_unittest.cpp b/test/unittest/screen_capture_impl_unittest/screen_capture_impl_unittest.cpp index a77306a13..cfba6f5a6 100644 --- a/test/unittest/screen_capture_impl_unittest/screen_capture_impl_unittest.cpp +++ b/test/unittest/screen_capture_impl_unittest/screen_capture_impl_unittest.cpp @@ -30,6 +30,7 @@ void ScreenCaptureImplUnitTest::TearDownTestCase(void) {} void ScreenCaptureImplUnitTest::SetUp(void) { + // test screenCaptureImpl_ = std::make_shared(); } -- Gitee From a7d8c491c9fe78a71e6bfd7fc134f434fdc4bd22 Mon Sep 17 00:00:00 2001 From: liuxiang Date: Sat, 30 Aug 2025 09:46:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=95=E5=88=B6?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuxiang --- .../recorder_test/capi/src/recorder_unit_test.cpp | 14 ++++++++++++++ .../src/recorder_server_mock.cpp | 2 +- .../src/recorder_server_unit_test.cpp | 2 +- .../screen_capture_impl_unittest.cpp | 3 +-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/test/unittest/recorder_test/capi/src/recorder_unit_test.cpp b/test/unittest/recorder_test/capi/src/recorder_unit_test.cpp index f42ebf0fe..54b742c31 100644 --- a/test/unittest/recorder_test/capi/src/recorder_unit_test.cpp +++ b/test/unittest/recorder_test/capi/src/recorder_unit_test.cpp @@ -99,6 +99,20 @@ static HapPolicyParams hapPolicy = { .resDeviceID = { "local" }, .grantStatus = { PermissionState::PERMISSION_GRANTED }, .grantFlags = { 1 } + }, + { + .permissionName = "ohos.permission.GET_BUNDLE_INFO", + .isGeneral = true, + .resDeviceID = { "local" }, + .grantStatus = { PermissionState::PERMISSION_GRANTED }, + .grantFlags = { 1 } + }, + { + .permissionName = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + .isGeneral = true, + .resDeviceID = { "local" }, + .grantStatus = { PermissionState::PERMISSION_GRANTED }, + .grantFlags = { 1 } } } }; diff --git a/test/unittest/recorder_test/recorder_server_unittest/src/recorder_server_mock.cpp b/test/unittest/recorder_test/recorder_server_unittest/src/recorder_server_mock.cpp index 0ae31399b..44ce52971 100644 --- a/test/unittest/recorder_test/recorder_server_unittest/src/recorder_server_mock.cpp +++ b/test/unittest/recorder_test/recorder_server_unittest/src/recorder_server_mock.cpp @@ -351,7 +351,7 @@ int32_t RecorderServerMock::RequesetBuffer(const std::string &recorderType, Vide void RecorderServerMock::StopBuffer(const std::string &recorderType) { - if (recorderType != PURE_AUDIO && camereHDIThread_ != nullptr) { + if (camereHDIThread_ != nullptr && camereHDIThread_->joinable()) { camereHDIThread_->join(); } } diff --git a/test/unittest/recorder_test/recorder_server_unittest/src/recorder_server_unit_test.cpp b/test/unittest/recorder_test/recorder_server_unittest/src/recorder_server_unit_test.cpp index 36313e1de..8f7f834b6 100644 --- a/test/unittest/recorder_test/recorder_server_unittest/src/recorder_server_unit_test.cpp +++ b/test/unittest/recorder_test/recorder_server_unittest/src/recorder_server_unit_test.cpp @@ -186,8 +186,8 @@ HWTEST_F(RecorderServerUnitTest, recorder_Repeat_001, TestSize.Level2) EXPECT_EQ(MSERR_INVALID_OPERATION, recorderServer_->Pause()); EXPECT_EQ(MSERR_OK, recorderServer_->Resume()); EXPECT_EQ(MSERR_INVALID_OPERATION, recorderServer_->Resume()); - EXPECT_EQ(MSERR_OK, recorderServer_->Stop(false)); recorderServer_->StopBuffer(PURE_VIDEO); + EXPECT_EQ(MSERR_OK, recorderServer_->Stop(false)); EXPECT_EQ(MSERR_OK, recorderServer_->Reset()); EXPECT_EQ(MSERR_OK, recorderServer_->Release()); close(g_videoRecorderConfig.outputFd); diff --git a/test/unittest/screen_capture_impl_unittest/screen_capture_impl_unittest.cpp b/test/unittest/screen_capture_impl_unittest/screen_capture_impl_unittest.cpp index cfba6f5a6..0ddc2d81f 100644 --- a/test/unittest/screen_capture_impl_unittest/screen_capture_impl_unittest.cpp +++ b/test/unittest/screen_capture_impl_unittest/screen_capture_impl_unittest.cpp @@ -28,9 +28,8 @@ void ScreenCaptureImplUnitTest::SetUpTestCase(void) {} void ScreenCaptureImplUnitTest::TearDownTestCase(void) {} -void ScreenCaptureImplUnitTest::SetUp(void) +void ScreenCaptureImplUnitTest::SetUp(void) override { - // test screenCaptureImpl_ = std::make_shared(); } -- Gitee