From 146bdcb3667e8beee386b4915abd402bccf2ee77 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Mon, 11 Dec 2023 21:52:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9UT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../common/camera_sink/dcamera_sink_handler_test.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp index 2cbc9cdb..33fe6cfe 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp @@ -75,10 +75,11 @@ void DCameraSinkHandlerTest::TearDown(void) void DCameraSinkHandlerTest::SetTokenID() { uint64_t tokenId; - int32_t numberOfPermissions = 2; + int32_t numberOfPermissions = 3; const char *perms[numberOfPermissions]; - perms[0] = "ohos.permission.DISTRIBUTED_DATASYNC"; - perms[1] = "ohos.permission.CAMERA"; + perms[0] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; + perms[1] = "ohos.permission.DISTRIBUTED_DATASYNC"; + perms[2] = "ohos.permission.CAMERA"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = numberOfPermissions, -- Gitee From 53d76a3b058dda49a9c4925a11a7e844ba3db74a Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Wed, 13 Dec 2023 21:11:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9UT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../client/test/unittest/common/cameraoperator/BUILD.gn | 5 +++++ .../distributed_camera_sink_stub_test.cpp | 7 ++++--- .../test/unittest/common/distributedcameramgr/BUILD.gn | 5 +++++ .../distributedcameramgr/dcamera_sink_controller_test.cpp | 8 ++++---- .../test/unittest/common/distributedcamera/BUILD.gn | 5 +++++ .../test/unittest/common/distributedcameramgr/BUILD.gn | 5 +++++ 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn index 69e52120..c5f6df6a 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -50,6 +50,11 @@ config("module_private_config") { } ohos_unittest("DCameraClientTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "dcamera_client_test.cpp" ] diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp index 4bd68300..52747594 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp @@ -61,10 +61,11 @@ void DcameraSinkStubTest::TearDown(void) void DcameraSinkStubTest::SetTokenID() { uint64_t tokenId; - int32_t numberOfPermissions = 2; + int32_t numberOfPermissions = 3; const char *perms[numberOfPermissions]; - perms[0] = "ohos.permission.DISTRIBUTED_DATASYNC"; - perms[1] = "ohos.permission.CAMERA"; + perms[0] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; + perms[1] = "ohos.permission.DISTRIBUTED_DATASYNC"; + perms[2] = "ohos.permission.CAMERA"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = numberOfPermissions, diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 6164edae..377a395b 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -56,6 +56,11 @@ config("module_private_config") { } ohos_unittest("DCameraSinkMgrTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp index 20b26fee..672d6484 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp @@ -245,7 +245,7 @@ HWTEST_F(DCameraSinkControllerTest, dcamera_sink_controller_test_005, TestSize.L cmdMetadata.Unmarshal(TEST_METADATA_SETTING_CMD_JSON); ret = controller_->UpdateSettings(cmdMetadata.value_); controller_->OnMetadataResult(cmdMetadata.value_); - EXPECT_EQ(DCAMERA_OK, ret); + EXPECT_EQ(DCAMERA_WRONG_STATE, ret); } /** @@ -359,7 +359,7 @@ HWTEST_F(DCameraSinkControllerTest, dcamera_sink_controller_test_012, TestSize.L DCameraOpenInfoCmd cmd; cmd.Unmarshal(TEST_OPEN_INFO_CMD_JSON); int32_t ret = controller_->OpenChannel(cmd.value_); - EXPECT_EQ(DCAMERA_OK, ret); + EXPECT_EQ(DCAMERA_WRONG_STATE, ret); } /** @@ -414,7 +414,7 @@ HWTEST_F(DCameraSinkControllerTest, dcamera_sink_controller_test_015, TestSize.L cmdMetadata.Unmarshal(TEST_METADATA_SETTING_CMD_JSON); g_operatorStr = "test015"; ret = controller_->UpdateSettings(cmdMetadata.value_); - EXPECT_EQ(DCAMERA_BAD_VALUE, ret); + EXPECT_EQ(DCAMERA_WRONG_STATE, ret); } /** @@ -430,7 +430,7 @@ HWTEST_F(DCameraSinkControllerTest, dcamera_sink_controller_test_016, TestSize.L cmd.Unmarshal(TEST_OPEN_INFO_CMD_JSON); g_channelStr = "test016"; int32_t ret = controller_->OpenChannel(cmd.value_); - EXPECT_EQ(DCAMERA_BAD_VALUE, ret); + EXPECT_EQ(DCAMERA_WRONG_STATE, ret); } /** diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn index a274a906..59bb54d5 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn @@ -52,6 +52,11 @@ config("module_private_config") { } ohos_unittest("DCameraSourceTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index 458650c2..d9943f27 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -57,6 +57,11 @@ config("module_private_config") { } ohos_unittest("DCameraSourceMgrTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ -- Gitee