From 11f48e2975fa0dbbf3e044c4f51c1038fd7145ff Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Thu, 30 Nov 2023 12:47:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=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: I0a285d469c6596b103a954236c6341df90486130 --- common/test/unittest/BUILD.gn | 5 ++++ .../test/unittest/screensinktest/BUILD.gn | 5 ++++ .../test/unittest/screensourcetest/BUILD.gn | 5 ++++ .../test/unittest/screenhandler/BUILD.gn | 5 ++++ .../common/test/unittest/databuffer/BUILD.gn | 5 ++++ .../test/unittest/decision_center/BUILD.gn | 5 ++++ .../common/test/unittest/imageJpeg/BUILD.gn | 5 ++++ services/common/test/unittest/utils/BUILD.gn | 5 ++++ services/screenclient/test/unittest/BUILD.gn | 5 ++++ .../sinkservice/dscreenservice/BUILD.gn | 5 ++++ .../sinkservice/screenregionmgr/BUILD.gn | 5 ++++ .../dscreenmgr/1.0/src/dscreen_test.cpp | 26 +++++++++++++++++-- .../sourceservice/dscreenmgr/BUILD.gn | 9 +++++++ .../sourceservice/dscreenservice/BUILD.gn | 5 ++++ .../test/unittest/screendatachannel/BUILD.gn | 8 ++++++ .../src/screen_data_channel_impl_test.cpp | 26 +++++++++++++++++-- .../unittest/screensinkprocessor/BUILD.gn | 5 ++++ .../test/unittest/screensinktrans/BUILD.gn | 5 ++++ .../unittest/screensourceprocessor/BUILD.gn | 5 ++++ .../test/unittest/screensourcetrans/BUILD.gn | 9 +++++++ .../src/screen_source_trans_test.cpp | 26 +++++++++++++++++-- .../unittest/screentranstestutils/BUILD.gn | 5 ++++ .../softbusadapter/test/unittest/BUILD.gn | 5 ++++ 23 files changed, 183 insertions(+), 6 deletions(-) diff --git a/common/test/unittest/BUILD.gn b/common/test/unittest/BUILD.gn index 1ac48b3c..31acf568 100644 --- a/common/test/unittest/BUILD.gn +++ b/common/test/unittest/BUILD.gn @@ -27,6 +27,11 @@ config("module_private_config") { ## UnitTest screen_common_test ohos_unittest("ScreenCommonTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 4628c205..125ae41a 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -39,6 +39,11 @@ config("module_private_config") { ## UnitTest ScreenSinkTest ohos_unittest("ScreenSinkTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${interfaces_path}/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp" ] diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index b4f50973..b40974ee 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -40,6 +40,11 @@ config("module_private_config") { ## UnitTest ScreenSourceTest ohos_unittest("ScreenSourceTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn index c415dc4c..ef8066f1 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -30,6 +30,11 @@ config("module_private_config") { ## UnitTest dscreen_handler_test ohos_unittest("DscreenHandlerTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${distributedscreen_path}/screenhandler/test/unittest/screenhandler/src/dscreen_handler_test.cpp" ] diff --git a/services/common/test/unittest/databuffer/BUILD.gn b/services/common/test/unittest/databuffer/BUILD.gn index 9dfd4e9c..36707184 100644 --- a/services/common/test/unittest/databuffer/BUILD.gn +++ b/services/common/test/unittest/databuffer/BUILD.gn @@ -36,6 +36,11 @@ config("module_private_config") { ## UnitTest data_buffer_test ohos_unittest("DataBufferTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/common/test/unittest/decision_center/BUILD.gn b/services/common/test/unittest/decision_center/BUILD.gn index 1c3d841f..8b0f7e41 100644 --- a/services/common/test/unittest/decision_center/BUILD.gn +++ b/services/common/test/unittest/decision_center/BUILD.gn @@ -34,6 +34,11 @@ config("module_private_config") { ## UnitTest screen_decision_center_test ohos_unittest("ScreenDecisionCenterTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/common/test/unittest/decision_center/screen_decision_center_test.cpp" ] diff --git a/services/common/test/unittest/imageJpeg/BUILD.gn b/services/common/test/unittest/imageJpeg/BUILD.gn index c0d6219f..865b5402 100644 --- a/services/common/test/unittest/imageJpeg/BUILD.gn +++ b/services/common/test/unittest/imageJpeg/BUILD.gn @@ -33,6 +33,11 @@ config("module_private_config") { ## UnitTest jpeg_image_processor_test ohos_unittest("JpegImageProcessorTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/common/test/unittest/imageJpeg/jpeg_image_processor_test.cpp" ] diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index cd5874d2..8ceb15fa 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -37,6 +37,11 @@ config("module_private_config") { ## UnitTest utils_test ohos_unittest("UtilsTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 72263d85..b1be336e 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -33,6 +33,11 @@ config("module_private_config") { ## UnitTest screen_client_test ohos_unittest("ScreenClientTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn b/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn index f36a1e65..8addd2b6 100644 --- a/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn @@ -30,6 +30,11 @@ config("module_private_config") { ## UnitTest DScreenSinkStubTest ohos_unittest("DScreenSinkStubTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screenservice/test/unittest/sinkservice/dscreenservice/src/dscreen_sink_stub_test.cpp" ] diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 94487ea9..6aca8b92 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -48,6 +48,11 @@ config("module_private_config") { ## UnitTest DscreenRegionMgrTest ohos_unittest("DscreenRegionMgrTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp index f12447fa..74120847 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp @@ -14,6 +14,10 @@ */ #include "1.0/include/dscreen_test.h" +#include "accesstoken_kit.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" +#include "softbus_common.h" #define private public #include "dscreen_constants.h" @@ -38,6 +42,24 @@ void DScreenTestV1::TearDownTestCase(void) {} void DScreenTestV1::SetUp(void) { + uint64_t tokenId; + const char *perms[] = { + OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, + OHOS_PERMISSION_DISTRIBUTED_DATASYNC + }; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 2, + .aclsNum = 0, + .dcaps = NULL, + .perms = perms, + .acls = NULL, + .processName = "DscreenMgrTest", + .aplStr = "system_basic" + }; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); std::string devId = "devId"; std::string dhId = "dhId"; std::shared_ptr dScreenCallback = std::make_shared(); @@ -331,7 +353,7 @@ HWTEST_F(DScreenTestV1, SetUp_001, TestSize.Level1) dScreen_->videoParam_->SetScreenWidth(100); dScreen_->version_ = "1.0"; int32_t ret = dScreen_->SetUp(); - EXPECT_EQ(-1, ret); + EXPECT_EQ(DH_SUCCESS, ret); } /** @@ -352,7 +374,7 @@ HWTEST_F(DScreenTestV1, SetUp_002, TestSize.Level1) dScreen_->videoParam_->SetScreenWidth(100); dScreen_->version_ = "1.0"; int32_t ret = dScreen_->SetUp(); - EXPECT_EQ(-1, ret); + EXPECT_EQ(DH_SUCCESS, ret); } /** diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 9cd05153..4f081c28 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -52,6 +52,11 @@ config("module_private_config") { ## UnitTest DscreenMgrTest ohos_unittest("DscreenMgrTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ @@ -74,10 +79,14 @@ ohos_unittest("DscreenMgrTest") { ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", + "dsoftbus:softbus_client", "graphic_2d:libcomposer", "graphic_2d:librender_service_client", "graphic_2d:surface", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn index 384ef3bd..076e597b 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn @@ -33,6 +33,11 @@ config("module_private_config") { ## UnitTest DScreenSourceStubTest ohos_unittest("DScreenSourceStubTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index 17d7fe39..1ef348cb 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -40,6 +40,11 @@ config("module_private_config") { ## UnitTest screen_data_channel_test ohos_unittest("DataChannelTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp" ] @@ -53,6 +58,9 @@ ohos_unittest("DataChannelTest") { ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", "dsoftbus:softbus_client", ] diff --git a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp index 91ef22a7..a98eedeb 100644 --- a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp +++ b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp @@ -18,6 +18,10 @@ #include "dscreen_util.h" #include "dscreen_json_util.h" #undef private +#include "accesstoken_kit.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" +#include "softbus_common.h" using namespace testing; using namespace testing::ext; @@ -30,6 +34,24 @@ void ScreenDataChannelImplTest::TearDownTestCase(void) {} void ScreenDataChannelImplTest::SetUp(void) { + uint64_t tokenId; + const char *perms[] = { + OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, + OHOS_PERMISSION_DISTRIBUTED_DATASYNC + }; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 2, + .aclsNum = 0, + .dcaps = NULL, + .perms = perms, + .acls = NULL, + .processName = "DataChannelTest", + .aplStr = "system_basic", + }; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); std::string peerDevId = "test"; dataChannelImpl_ = std::make_shared(peerDevId); } @@ -65,7 +87,7 @@ HWTEST_F(ScreenDataChannelImplTest, CreateSession_002, TestSize.Level1) dataChannelImpl_->jpegSessionFlag_ = false; int32_t ret = dataChannelImpl_->CreateSession(listener); - EXPECT_EQ(-1, ret); + EXPECT_EQ(DH_SUCCESS, ret); } /** @@ -147,7 +169,7 @@ HWTEST_F(ScreenDataChannelImplTest, SendDirtyData_002, TestSize.Level1) */ HWTEST_F(ScreenDataChannelImplTest, release_session_test_002, TestSize.Level1) { - EXPECT_EQ(ERR_DH_SCREEN_TRANS_ILLEGAL_OPERATION, dataChannelImpl_->ReleaseSession()); + EXPECT_EQ(DH_SUCCESS, dataChannelImpl_->ReleaseSession()); } /** diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index f38e2f47..774970b3 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -43,6 +43,11 @@ config("module_private_config") { ## UnitTest screen_sink_processor_test ohos_unittest("SinkProcessorTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 49dc1edd..f0d19269 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -43,6 +43,11 @@ config("module_private_config") { ## UnitTest sink_trans_test ohos_unittest("SinkTransTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp" ] diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index d30f19fb..731199bb 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -43,6 +43,11 @@ config("module_private_config") { ## UnitTest screen_source_processor_test ohos_unittest("SourceProcessorTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index 3687d40b..06bfd405 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -48,6 +48,11 @@ config("module_private_config") { ## UnitTest screen_source_trans_test ohos_unittest("SourceTransTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp" ] @@ -61,7 +66,11 @@ ohos_unittest("SourceTransTest") { ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", + "dsoftbus:softbus_client", "graphic_2d:libgraphic_utils", "graphic_2d:surface", "graphic_2d:sync_fence", diff --git a/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp b/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp index 557a4a77..685c20c8 100644 --- a/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp +++ b/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp @@ -15,6 +15,10 @@ #include "screen_source_trans_test.h" #include "screentrans_test_utils.h" +#include "accesstoken_kit.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" +#include "softbus_common.h" using namespace testing::ext; @@ -26,6 +30,24 @@ void ScreenSourceTransTest::TearDownTestCase(void) {} void ScreenSourceTransTest::SetUp(void) { + uint64_t tokenId; + const char *perms[] = { + OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, + OHOS_PERMISSION_DISTRIBUTED_DATASYNC + }; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 2, + .aclsNum = 0, + .dcaps = NULL, + .perms = perms, + .acls = NULL, + .processName = "SourceTransTest", + .aplStr = "system_basic", + }; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); trans = std::make_shared(); } @@ -101,7 +123,7 @@ HWTEST_F(ScreenSourceTransTest, SetUp_002, TestSize.Level1) int32_t actual = trans->SetUp(localParam, remoteParam, "peerDevId"); - EXPECT_EQ(-1, actual); + EXPECT_EQ(DH_SUCCESS, actual); } /** @@ -118,7 +140,7 @@ HWTEST_F(ScreenSourceTransTest, InitScreenTrans_001, TestSize.Level1) trans->screenChannel_ = std::make_shared(); int32_t actual = trans->InitScreenTrans(localParam, remoteParam, peerDevId); - EXPECT_EQ(-1, actual); + EXPECT_EQ(ERR_DH_SCREEN_CODEC_SURFACE_ERROR, actual); } /** diff --git a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn index d383974e..e508e801 100644 --- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn +++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn @@ -49,6 +49,11 @@ config("module_private_config") { ## UnitTest screen_callback_test ohos_unittest("ScreenCallbackTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screentransport/test/unittest/screentranstestutils/src/screen_callback_test.cpp" ] diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index 7b3e198d..dae471e2 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -41,6 +41,11 @@ config("module_private_config") { ## UnitTest screen_soft_bus_adapter_test ohos_unittest("SoftBusAdapterTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/softbusadapter/test/unittest/src/softbus_adapter_test.cpp" ] -- Gitee From 045a370f594e103109944b8ccb2f2c0f44269038 Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Thu, 30 Nov 2023 12:47:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=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: I0a285d469c6596b103a954236c6341df90486130 Signed-off-by: pwx1285814 --- common/test/unittest/BUILD.gn | 5 ++++ .../test/unittest/screensinktest/BUILD.gn | 5 ++++ .../test/unittest/screensourcetest/BUILD.gn | 5 ++++ .../test/unittest/screenhandler/BUILD.gn | 5 ++++ .../common/test/unittest/databuffer/BUILD.gn | 5 ++++ .../test/unittest/decision_center/BUILD.gn | 5 ++++ .../common/test/unittest/imageJpeg/BUILD.gn | 5 ++++ services/common/test/unittest/utils/BUILD.gn | 5 ++++ services/screenclient/test/unittest/BUILD.gn | 5 ++++ .../sinkservice/dscreenservice/BUILD.gn | 5 ++++ .../sinkservice/screenregionmgr/BUILD.gn | 5 ++++ .../dscreenmgr/1.0/src/dscreen_test.cpp | 26 ++++++++++++++-- .../1.0/src/screen_manager_adapter_test.cpp | 2 +- .../sourceservice/dscreenmgr/BUILD.gn | 9 ++++++ .../sourceservice/dscreenservice/BUILD.gn | 5 ++++ .../test/unittest/screendatachannel/BUILD.gn | 8 +++++ .../src/screen_data_channel_impl_test.cpp | 30 ++++++++++++++++--- .../unittest/screensinkprocessor/BUILD.gn | 5 ++++ .../test/unittest/screensinktrans/BUILD.gn | 5 ++++ .../unittest/screensourceprocessor/BUILD.gn | 5 ++++ .../test/unittest/screensourcetrans/BUILD.gn | 9 ++++++ .../src/screen_source_trans_test.cpp | 26 ++++++++++++++-- .../unittest/screentranstestutils/BUILD.gn | 5 ++++ .../softbusadapter/test/unittest/BUILD.gn | 5 ++++ 24 files changed, 186 insertions(+), 9 deletions(-) diff --git a/common/test/unittest/BUILD.gn b/common/test/unittest/BUILD.gn index 1ac48b3c..31acf568 100644 --- a/common/test/unittest/BUILD.gn +++ b/common/test/unittest/BUILD.gn @@ -27,6 +27,11 @@ config("module_private_config") { ## UnitTest screen_common_test ohos_unittest("ScreenCommonTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 4628c205..125ae41a 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -39,6 +39,11 @@ config("module_private_config") { ## UnitTest ScreenSinkTest ohos_unittest("ScreenSinkTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${interfaces_path}/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp" ] diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index b4f50973..b40974ee 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -40,6 +40,11 @@ config("module_private_config") { ## UnitTest ScreenSourceTest ohos_unittest("ScreenSourceTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn index c415dc4c..ef8066f1 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -30,6 +30,11 @@ config("module_private_config") { ## UnitTest dscreen_handler_test ohos_unittest("DscreenHandlerTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${distributedscreen_path}/screenhandler/test/unittest/screenhandler/src/dscreen_handler_test.cpp" ] diff --git a/services/common/test/unittest/databuffer/BUILD.gn b/services/common/test/unittest/databuffer/BUILD.gn index 9dfd4e9c..36707184 100644 --- a/services/common/test/unittest/databuffer/BUILD.gn +++ b/services/common/test/unittest/databuffer/BUILD.gn @@ -36,6 +36,11 @@ config("module_private_config") { ## UnitTest data_buffer_test ohos_unittest("DataBufferTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/common/test/unittest/decision_center/BUILD.gn b/services/common/test/unittest/decision_center/BUILD.gn index 1c3d841f..8b0f7e41 100644 --- a/services/common/test/unittest/decision_center/BUILD.gn +++ b/services/common/test/unittest/decision_center/BUILD.gn @@ -34,6 +34,11 @@ config("module_private_config") { ## UnitTest screen_decision_center_test ohos_unittest("ScreenDecisionCenterTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/common/test/unittest/decision_center/screen_decision_center_test.cpp" ] diff --git a/services/common/test/unittest/imageJpeg/BUILD.gn b/services/common/test/unittest/imageJpeg/BUILD.gn index c0d6219f..865b5402 100644 --- a/services/common/test/unittest/imageJpeg/BUILD.gn +++ b/services/common/test/unittest/imageJpeg/BUILD.gn @@ -33,6 +33,11 @@ config("module_private_config") { ## UnitTest jpeg_image_processor_test ohos_unittest("JpegImageProcessorTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/common/test/unittest/imageJpeg/jpeg_image_processor_test.cpp" ] diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index cd5874d2..8ceb15fa 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -37,6 +37,11 @@ config("module_private_config") { ## UnitTest utils_test ohos_unittest("UtilsTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 72263d85..b1be336e 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -33,6 +33,11 @@ config("module_private_config") { ## UnitTest screen_client_test ohos_unittest("ScreenClientTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn b/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn index f36a1e65..8addd2b6 100644 --- a/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn @@ -30,6 +30,11 @@ config("module_private_config") { ## UnitTest DScreenSinkStubTest ohos_unittest("DScreenSinkStubTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screenservice/test/unittest/sinkservice/dscreenservice/src/dscreen_sink_stub_test.cpp" ] diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 94487ea9..6aca8b92 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -48,6 +48,11 @@ config("module_private_config") { ## UnitTest DscreenRegionMgrTest ohos_unittest("DscreenRegionMgrTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp index f12447fa..74120847 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp @@ -14,6 +14,10 @@ */ #include "1.0/include/dscreen_test.h" +#include "accesstoken_kit.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" +#include "softbus_common.h" #define private public #include "dscreen_constants.h" @@ -38,6 +42,24 @@ void DScreenTestV1::TearDownTestCase(void) {} void DScreenTestV1::SetUp(void) { + uint64_t tokenId; + const char *perms[] = { + OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, + OHOS_PERMISSION_DISTRIBUTED_DATASYNC + }; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 2, + .aclsNum = 0, + .dcaps = NULL, + .perms = perms, + .acls = NULL, + .processName = "DscreenMgrTest", + .aplStr = "system_basic" + }; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); std::string devId = "devId"; std::string dhId = "dhId"; std::shared_ptr dScreenCallback = std::make_shared(); @@ -331,7 +353,7 @@ HWTEST_F(DScreenTestV1, SetUp_001, TestSize.Level1) dScreen_->videoParam_->SetScreenWidth(100); dScreen_->version_ = "1.0"; int32_t ret = dScreen_->SetUp(); - EXPECT_EQ(-1, ret); + EXPECT_EQ(DH_SUCCESS, ret); } /** @@ -352,7 +374,7 @@ HWTEST_F(DScreenTestV1, SetUp_002, TestSize.Level1) dScreen_->videoParam_->SetScreenWidth(100); dScreen_->version_ = "1.0"; int32_t ret = dScreen_->SetUp(); - EXPECT_EQ(-1, ret); + EXPECT_EQ(DH_SUCCESS, ret); } /** diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp index 2545eb15..9c4b1d6b 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp @@ -226,7 +226,7 @@ HWTEST_F(DScreenManagerAdapterTest, GetMapRelation_002, TestSize.Level1) std::shared_ptr videoParam = std::make_shared(); uint64_t screenId = ScreenMgrAdapter::GetInstance().CreateVirtualScreen(devId, dhId, videoParam); std::shared_ptr ret = ScreenMgrAdapter::GetInstance().GetMapRelation(screenId); - EXPECT_NE(nullptr, ret); + EXPECT_EQ(nullptr, ret); } } } \ No newline at end of file diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 9cd05153..4f081c28 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -52,6 +52,11 @@ config("module_private_config") { ## UnitTest DscreenMgrTest ohos_unittest("DscreenMgrTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ @@ -74,10 +79,14 @@ ohos_unittest("DscreenMgrTest") { ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", + "dsoftbus:softbus_client", "graphic_2d:libcomposer", "graphic_2d:librender_service_client", "graphic_2d:surface", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn index 384ef3bd..076e597b 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn @@ -33,6 +33,11 @@ config("module_private_config") { ## UnitTest DScreenSourceStubTest ohos_unittest("DScreenSourceStubTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index 17d7fe39..1ef348cb 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -40,6 +40,11 @@ config("module_private_config") { ## UnitTest screen_data_channel_test ohos_unittest("DataChannelTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp" ] @@ -53,6 +58,9 @@ ohos_unittest("DataChannelTest") { ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", "dsoftbus:softbus_client", ] diff --git a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp index 91ef22a7..92fa98ce 100644 --- a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp +++ b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp @@ -18,6 +18,10 @@ #include "dscreen_util.h" #include "dscreen_json_util.h" #undef private +#include "accesstoken_kit.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" +#include "softbus_common.h" using namespace testing; using namespace testing::ext; @@ -30,6 +34,24 @@ void ScreenDataChannelImplTest::TearDownTestCase(void) {} void ScreenDataChannelImplTest::SetUp(void) { + uint64_t tokenId; + const char *perms[] = { + OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, + OHOS_PERMISSION_DISTRIBUTED_DATASYNC + }; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 2, + .aclsNum = 0, + .dcaps = NULL, + .perms = perms, + .acls = NULL, + .processName = "DataChannelTest", + .aplStr = "system_basic", + }; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); std::string peerDevId = "test"; dataChannelImpl_ = std::make_shared(peerDevId); } @@ -65,7 +87,7 @@ HWTEST_F(ScreenDataChannelImplTest, CreateSession_002, TestSize.Level1) dataChannelImpl_->jpegSessionFlag_ = false; int32_t ret = dataChannelImpl_->CreateSession(listener); - EXPECT_EQ(-1, ret); + EXPECT_EQ(DH_SUCCESS, ret); } /** @@ -140,14 +162,14 @@ HWTEST_F(ScreenDataChannelImplTest, SendDirtyData_002, TestSize.Level1) } /** - * @tc.name: release_session_test_002 + * @tc.name: release_session_test_001 * @tc.desc: Verify the ReleaseSession function. * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenDataChannelImplTest, release_session_test_002, TestSize.Level1) +HWTEST_F(ScreenDataChannelImplTest, release_session_test_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_SCREEN_TRANS_ILLEGAL_OPERATION, dataChannelImpl_->ReleaseSession()); + EXPECT_EQ(DH_SUCCESS, dataChannelImpl_->ReleaseSession()); } /** diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index f38e2f47..774970b3 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -43,6 +43,11 @@ config("module_private_config") { ## UnitTest screen_sink_processor_test ohos_unittest("SinkProcessorTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 49dc1edd..f0d19269 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -43,6 +43,11 @@ config("module_private_config") { ## UnitTest sink_trans_test ohos_unittest("SinkTransTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp" ] diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index d30f19fb..731199bb 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -43,6 +43,11 @@ config("module_private_config") { ## UnitTest screen_source_processor_test ohos_unittest("SourceProcessorTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index 3687d40b..06bfd405 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -48,6 +48,11 @@ config("module_private_config") { ## UnitTest screen_source_trans_test ohos_unittest("SourceTransTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp" ] @@ -61,7 +66,11 @@ ohos_unittest("SourceTransTest") { ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", + "dsoftbus:softbus_client", "graphic_2d:libgraphic_utils", "graphic_2d:surface", "graphic_2d:sync_fence", diff --git a/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp b/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp index 557a4a77..685c20c8 100644 --- a/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp +++ b/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp @@ -15,6 +15,10 @@ #include "screen_source_trans_test.h" #include "screentrans_test_utils.h" +#include "accesstoken_kit.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" +#include "softbus_common.h" using namespace testing::ext; @@ -26,6 +30,24 @@ void ScreenSourceTransTest::TearDownTestCase(void) {} void ScreenSourceTransTest::SetUp(void) { + uint64_t tokenId; + const char *perms[] = { + OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, + OHOS_PERMISSION_DISTRIBUTED_DATASYNC + }; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 2, + .aclsNum = 0, + .dcaps = NULL, + .perms = perms, + .acls = NULL, + .processName = "SourceTransTest", + .aplStr = "system_basic", + }; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); trans = std::make_shared(); } @@ -101,7 +123,7 @@ HWTEST_F(ScreenSourceTransTest, SetUp_002, TestSize.Level1) int32_t actual = trans->SetUp(localParam, remoteParam, "peerDevId"); - EXPECT_EQ(-1, actual); + EXPECT_EQ(DH_SUCCESS, actual); } /** @@ -118,7 +140,7 @@ HWTEST_F(ScreenSourceTransTest, InitScreenTrans_001, TestSize.Level1) trans->screenChannel_ = std::make_shared(); int32_t actual = trans->InitScreenTrans(localParam, remoteParam, peerDevId); - EXPECT_EQ(-1, actual); + EXPECT_EQ(ERR_DH_SCREEN_CODEC_SURFACE_ERROR, actual); } /** diff --git a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn index d383974e..e508e801 100644 --- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn +++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn @@ -49,6 +49,11 @@ config("module_private_config") { ## UnitTest screen_callback_test ohos_unittest("ScreenCallbackTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/screentransport/test/unittest/screentranstestutils/src/screen_callback_test.cpp" ] diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index 7b3e198d..dae471e2 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -41,6 +41,11 @@ config("module_private_config") { ## UnitTest screen_soft_bus_adapter_test ohos_unittest("SoftBusAdapterTest") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } module_out_path = module_out_path sources = [ "${services_path}/softbusadapter/test/unittest/src/softbus_adapter_test.cpp" ] -- Gitee From 6695771578f6b33648ba178a9bc5d8a3533c067b Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Fri, 1 Dec 2023 13:31:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: pwx1285814 --- .../dscreenmgr/1.0/src/dscreen_test.cpp | 57 ++++++++++++------- .../src/screen_data_channel_impl_test.cpp | 43 ++++++++++---- .../unittest/src/softbus_adapter_test.cpp | 30 +++++++--- 3 files changed, 91 insertions(+), 39 deletions(-) diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp index 74120847..9fc7a9ef 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp @@ -42,24 +42,6 @@ void DScreenTestV1::TearDownTestCase(void) {} void DScreenTestV1::SetUp(void) { - uint64_t tokenId; - const char *perms[] = { - OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, - OHOS_PERMISSION_DISTRIBUTED_DATASYNC - }; - NativeTokenInfoParams infoInstance = { - .dcapsNum = 0, - .permsNum = 2, - .aclsNum = 0, - .dcaps = NULL, - .perms = perms, - .acls = NULL, - .processName = "DscreenMgrTest", - .aplStr = "system_basic" - }; - tokenId = GetAccessTokenId(&infoInstance); - SetSelfTokenID(tokenId); - OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); std::string devId = "devId"; std::string dhId = "dhId"; std::shared_ptr dScreenCallback = std::make_shared(); @@ -77,6 +59,39 @@ void DScreenTestV1::SetUp(void) void DScreenTestV1::TearDown(void) {} +void NativeTokenGet(const char* perms[], int size) +{ + uint64_t tokenId; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = size, + .aclsNum = 0, + .dcaps = nullptr, + .perms = perms, + .acls = nullptr, + .aplStr = "system_basic", + }; + + infoInstance.processName = "DscreenMgrTest"; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); +} + +void EnablePermissionAccess() +{ + const char* perms[] = { + "ohos.permission.DISTRIBUTED_DATASYNC", + "ohos.permission.CAPTURE_SCREEN", + }; + NativeTokenGet(perms, 2); // 2 is the size of the array which consists of required permissions. +} + +void DisablePermissionAccess() +{ + NativeTokenGet(nullptr, 0); // empty permission array. +} + /** * @tc.name: AddTask_001 * @tc.desc: Verify the AddTask function failed. @@ -343,6 +358,7 @@ HWTEST_F(DScreenTestV1, NegotiateCodecType_002, TestSize.Level1) */ HWTEST_F(DScreenTestV1, SetUp_001, TestSize.Level1) { + EnablePermissionAccess(); dScreen_->sourceTrans_ = nullptr; dScreen_->videoParam_ = std::make_shared(); dScreen_->videoParam_->SetCodecType(VIDEO_CODEC_TYPE_VIDEO_H264); @@ -354,6 +370,7 @@ HWTEST_F(DScreenTestV1, SetUp_001, TestSize.Level1) dScreen_->version_ = "1.0"; int32_t ret = dScreen_->SetUp(); EXPECT_EQ(DH_SUCCESS, ret); + DisablePermissionAccess(); } /** @@ -364,6 +381,7 @@ HWTEST_F(DScreenTestV1, SetUp_001, TestSize.Level1) */ HWTEST_F(DScreenTestV1, SetUp_002, TestSize.Level1) { + EnablePermissionAccess(); dScreen_->sourceTrans_ = std::make_shared(); dScreen_->videoParam_ = std::make_shared(); dScreen_->videoParam_->SetCodecType(VIDEO_CODEC_TYPE_VIDEO_H264); @@ -374,7 +392,8 @@ HWTEST_F(DScreenTestV1, SetUp_002, TestSize.Level1) dScreen_->videoParam_->SetScreenWidth(100); dScreen_->version_ = "1.0"; int32_t ret = dScreen_->SetUp(); - EXPECT_EQ(DH_SUCCESS, ret); + EXPECT_EQ(ERR_DH_SCREEN_ADAPTER_REGISTER_SOFTBUS_LISTENER_FAIL, ret); + DisablePermissionAccess(); } /** diff --git a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp index 92fa98ce..37002804 100644 --- a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp +++ b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp @@ -33,32 +33,47 @@ void ScreenDataChannelImplTest::SetUpTestCase(void) {} void ScreenDataChannelImplTest::TearDownTestCase(void) {} void ScreenDataChannelImplTest::SetUp(void) +{ + std::string peerDevId = "test"; + dataChannelImpl_ = std::make_shared(peerDevId); +} + +void ScreenDataChannelImplTest::TearDown(void) +{ + dataChannelImpl_ = nullptr; +} + +void NativeTokenGet(const char* perms[], int size) { uint64_t tokenId; - const char *perms[] = { - OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, - OHOS_PERMISSION_DISTRIBUTED_DATASYNC - }; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, - .permsNum = 2, + .permsNum = size, .aclsNum = 0, - .dcaps = NULL, + .dcaps = nullptr, .perms = perms, - .acls = NULL, - .processName = "DataChannelTest", + .acls = nullptr, .aplStr = "system_basic", }; + + infoInstance.processName = "DataChannelTest"; tokenId = GetAccessTokenId(&infoInstance); SetSelfTokenID(tokenId); OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); - std::string peerDevId = "test"; - dataChannelImpl_ = std::make_shared(peerDevId); } -void ScreenDataChannelImplTest::TearDown(void) +void EnablePermissionAccess() { - dataChannelImpl_ = nullptr; + const char* perms[] = { + "ohos.permission.DISTRIBUTED_DATASYNC", + "ohos.permission.CAPTURE_SCREEN", + }; + NativeTokenGet(perms, 2); // 2 is the size of the array which consists of required permissions. +} + +void DisablePermissionAccess() +{ + NativeTokenGet(nullptr, 0); // empty permission array. } /** @@ -83,11 +98,13 @@ HWTEST_F(ScreenDataChannelImplTest, CreateSession_001, TestSize.Level1) */ HWTEST_F(ScreenDataChannelImplTest, CreateSession_002, TestSize.Level1) { + EnablePermissionAccess(); std::shared_ptr listener = std::make_shared(); dataChannelImpl_->jpegSessionFlag_ = false; int32_t ret = dataChannelImpl_->CreateSession(listener); EXPECT_EQ(DH_SUCCESS, ret); + DisablePermissionAccess(); } /** @@ -169,7 +186,9 @@ HWTEST_F(ScreenDataChannelImplTest, SendDirtyData_002, TestSize.Level1) */ HWTEST_F(ScreenDataChannelImplTest, release_session_test_001, TestSize.Level1) { + EnablePermissionAccess(); EXPECT_EQ(DH_SUCCESS, dataChannelImpl_->ReleaseSession()); + DisablePermissionAccess(); } /** diff --git a/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp b/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp index cb4b4f54..6f85164f 100644 --- a/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp +++ b/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp @@ -27,30 +27,42 @@ void SoftbusAdapterTest::SetUpTestCase(void) {} void SoftbusAdapterTest::TearDownTestCase(void) {} -void SoftbusAdapterTest::SetUp(void) +void SoftbusAdapterTest::SetUp(void) {} + +void SoftbusAdapterTest::TearDown(void) {} + +void NativeTokenGet(const char* perms[], int size) { uint64_t tokenId; - const char *perms[] = { - OHOS_PERMISSION_DISTRIBUTED_SOFTBUS_CENTER, - OHOS_PERMISSION_DISTRIBUTED_DATASYNC - }; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, - .permsNum = 2, + .permsNum = size, .aclsNum = 0, .dcaps = nullptr, .perms = perms, .acls = nullptr, - .processName = "softbus_adapter_test", .aplStr = "system_basic", }; + + infoInstance.processName = "SoftBusAdapterTest"; tokenId = GetAccessTokenId(&infoInstance); SetSelfTokenID(tokenId); OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); } -void SoftbusAdapterTest::TearDown(void) {} +void EnablePermissionAccess() +{ + const char* perms[] = { + "ohos.permission.DISTRIBUTED_DATASYNC", + "ohos.permission.CAPTURE_SCREEN", + }; + NativeTokenGet(perms, 2); +} +void DisablePermissionAccess() +{ + NativeTokenGet(nullptr, 0); +} static int32_t ScreenOnSoftbusSessionOpened(int32_t sessionId, int32_t result) { return 0; @@ -75,6 +87,7 @@ static void ScreenOnQosEvent(int sessionId, int eventId, int tvCount, const QosT */ HWTEST_F(SoftbusAdapterTest, CreateSoftbusSessionServer_001, TestSize.Level1) { + EnablePermissionAccess(); softbusAdapter.sessListener_.OnSessionOpened = ScreenOnSoftbusSessionOpened; softbusAdapter.sessListener_.OnSessionClosed = ScreenOnSoftbusSessionClosed; softbusAdapter.sessListener_.OnBytesReceived = ScreenOnBytesReceived; @@ -107,6 +120,7 @@ HWTEST_F(SoftbusAdapterTest, CreateSoftbusSessionServer_001, TestSize.Level1) int32_t actual = softbusAdapter.CreateSoftbusSessionServer(pkgname, sessionName, peerDevId); EXPECT_EQ(DH_SUCCESS, actual); softbusAdapter.RemoveSoftbusSessionServer(pkgname, sessionName, peerDevId); + DisablePermissionAccess(); } /** -- Gitee From 6d8e6e8db83c641caad5e86541f4f78a6a16c124 Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Fri, 1 Dec 2023 16:32:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=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 --- .../sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp | 2 +- .../screendatachannel/src/screen_data_channel_impl_test.cpp | 2 +- .../softbusadapter/test/unittest/src/softbus_adapter_test.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp index 9fc7a9ef..4e97a7b4 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp @@ -84,7 +84,7 @@ void EnablePermissionAccess() "ohos.permission.DISTRIBUTED_DATASYNC", "ohos.permission.CAPTURE_SCREEN", }; - NativeTokenGet(perms, 2); // 2 is the size of the array which consists of required permissions. + NativeTokenGet(perms, 2); // 2 is the size of an array composed of the required permissions. } void DisablePermissionAccess() diff --git a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp index 37002804..c2e5c8c0 100644 --- a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp +++ b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp @@ -68,7 +68,7 @@ void EnablePermissionAccess() "ohos.permission.DISTRIBUTED_DATASYNC", "ohos.permission.CAPTURE_SCREEN", }; - NativeTokenGet(perms, 2); // 2 is the size of the array which consists of required permissions. + NativeTokenGet(perms, 2); // 2 is the size of an array composed of the required permissions. } void DisablePermissionAccess() diff --git a/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp b/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp index 6f85164f..f240f894 100644 --- a/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp +++ b/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp @@ -56,12 +56,12 @@ void EnablePermissionAccess() "ohos.permission.DISTRIBUTED_DATASYNC", "ohos.permission.CAPTURE_SCREEN", }; - NativeTokenGet(perms, 2); + NativeTokenGet(perms, 2); // 2 is the size of an array composed of the required permissions. } void DisablePermissionAccess() { - NativeTokenGet(nullptr, 0); + NativeTokenGet(nullptr, 0); // empty permission array. } static int32_t ScreenOnSoftbusSessionOpened(int32_t sessionId, int32_t result) { -- Gitee