From 4bac53da24ffcaa5ff87fae88cc8ce8ba06216bc Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Tue, 19 Dec 2023 21:26:35 +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 --- .../camera_sink/dcamera_sink_handler_test.cpp | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 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 33fe6cfe..cc2aaa39 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 @@ -46,7 +46,6 @@ public: static void TearDownTestCase(void); void SetUp(); void TearDown(); - void SetTokenID(); }; namespace { @@ -65,21 +64,12 @@ void DCameraSinkHandlerTest::TearDownTestCase(void) void DCameraSinkHandlerTest::SetUp(void) { DHLOGI("enter"); -} - -void DCameraSinkHandlerTest::TearDown(void) -{ - DHLOGI("enter"); -} - -void DCameraSinkHandlerTest::SetTokenID() -{ uint64_t tokenId; int32_t numberOfPermissions = 3; const char *perms[numberOfPermissions]; perms[0] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; - perms[1] = "ohos.permission.DISTRIBUTED_DATASYNC"; - perms[2] = "ohos.permission.CAMERA"; + perms[1] = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; + perms[2] = "ohos.permission.ACCESS_DISTRIBUTED_HARDWARE"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = numberOfPermissions, @@ -87,7 +77,7 @@ void DCameraSinkHandlerTest::SetTokenID() .dcaps = NULL, .perms = perms, .acls = NULL, - .processName = "dcamera_client_demo", + .processName = "dcamera_sink_handler", .aplStr = "system_basic", }; tokenId = GetAccessTokenId(&infoInstance); @@ -95,6 +85,12 @@ void DCameraSinkHandlerTest::SetTokenID() OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); } +void DCameraSinkHandlerTest::TearDown(void) +{ + DHLOGI("enter"); +} + + /** * @tc.name: dcamera_sink_handler_test_001 * @tc.desc: Verify the InitSource function. @@ -117,7 +113,6 @@ HWTEST_F(DCameraSinkHandlerTest, dcamera_sink_handler_test_001, TestSize.Level1) HWTEST_F(DCameraSinkHandlerTest, dcamera_sink_handler_test_002, TestSize.Level1) { std::string params = "test002"; - SetTokenID(); int32_t ret = DCameraSinkHandler::GetInstance().InitSink(params); EXPECT_EQ(DCAMERA_OK, ret); @@ -190,7 +185,6 @@ HWTEST_F(DCameraSinkHandlerTest, dcamera_sink_handler_test_005, TestSize.Level1) HWTEST_F(DCameraSinkHandlerTest, dcamera_sink_handler_test_006, TestSize.Level1) { std::string params = "test006"; - SetTokenID(); int32_t systemAbilityId = 4804; sptr loadCallback(new DCameraSinkLoadCallback(params)); loadCallback->OnLoadSystemAbilityFail(systemAbilityId); -- Gitee From 8fde65a51a9e38a0ce60b1fc9014731f10cd753d Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Wed, 20 Dec 2023 09:42:00 +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 --- .../unittest/common/camera_sink/dcamera_sink_handler_test.cpp | 1 - 1 file changed, 1 deletion(-) 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 cc2aaa39..84974e09 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 @@ -90,7 +90,6 @@ void DCameraSinkHandlerTest::TearDown(void) DHLOGI("enter"); } - /** * @tc.name: dcamera_sink_handler_test_001 * @tc.desc: Verify the InitSource function. -- Gitee