diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 057379e38fb8e6ee9ed925d90a2597afaad336a7..3aef257ac0823306c23454fc727127d468c14651 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -51,6 +51,9 @@ ohos_unittest("ScreenClientTest") { ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", "googletest:gmock", @@ -58,6 +61,7 @@ ohos_unittest("ScreenClientTest") { "graphic_2d:librender_service_client", "graphic_surface:surface", "input:libmmi-client", + "window_manager:libdm", "window_manager:libwm", ] } diff --git a/services/screenclient/test/unittest/src/screen_client_test.cpp b/services/screenclient/test/unittest/src/screen_client_test.cpp index 0585e0a011fc95096e96e4723c937389fadea0b0..1824510cc74e2c5e2155c2fc4bb0f25e31e5a9da 100644 --- a/services/screenclient/test/unittest/src/screen_client_test.cpp +++ b/services/screenclient/test/unittest/src/screen_client_test.cpp @@ -14,6 +14,10 @@ */ #include "screen_client_test.h" +#include "accesstoken_kit.h" +#include "display_manager.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" using namespace testing::ext; @@ -27,13 +31,32 @@ void ScreenClientTest::TearDownTestCase(void) {} void ScreenClientTest::SetUp() { + const char **perms = new const char *[1]; + perms[0] = "ohos.permission.SYSTEM_FLOAT_WINDOW"; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 1, + .aclsNum = 0, + .dcaps = nullptr, + .perms = perms, + .acls = nullptr, + .processName = "screen_client_unittest", + .aplStr = "system_core", + }; + uint64_t tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); + delete[] perms; + windowProperty_ = std::make_shared(); windowProperty_->width = VIDEO_DATA_NUM; windowProperty_->height = VIDEO_DATA_NUM; + windowProperty_->displayId = Rosen::DisplayManager::GetInstance().GetDefaultDisplay()->GetId(); } void ScreenClientTest::TearDown() { + ScreenClient::GetInstance().DestroyAllWindow(); windowProperty_ = nullptr; } diff --git a/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp b/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp index d777533f850bc693c18eff0cb412542db7cce615..41fac5c856d6f58ee35ba0fcd24621c9794ccf62 100644 --- a/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp +++ b/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp @@ -14,6 +14,10 @@ */ #include "screen_client_window_adapter_test.h" +#include "accesstoken_kit.h" +#include "display_manager.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" using namespace testing::ext; @@ -27,9 +31,27 @@ void ScreenClientWindowAdapterTest::TearDownTestCase(void) {} void ScreenClientWindowAdapterTest::SetUp() { + const char **perms = new const char *[1]; + perms[0] = "ohos.permission.SYSTEM_FLOAT_WINDOW"; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 1, + .aclsNum = 0, + .dcaps = nullptr, + .perms = perms, + .acls = nullptr, + .processName = "screen_client_unittest", + .aplStr = "system_core", + }; + uint64_t tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); + delete[] perms; + windowProperty_ = std::make_shared(); windowProperty_->width = VIDEO_DATA_NUM; windowProperty_->height = VIDEO_DATA_NUM; + windowProperty_->displayId = Rosen::DisplayManager::GetInstance().GetDefaultDisplay()->GetId(); } void ScreenClientWindowAdapterTest::TearDown() diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregion_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregion_test.cpp index 790088874e0683299fef60f1919d15a39fe22ffb..4573127af3fbc6e2a416978ec4dfdf85086a60df 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregion_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregion_test.cpp @@ -14,7 +14,11 @@ */ #include "1.0/include/screenregion_test.h" +#include "accesstoken_kit.h" #include "dscreen_constants.h" +#include "display_manager.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" using namespace testing; using namespace testing::ext; @@ -30,6 +34,23 @@ void ScreenRegionTestV1::TearDownTestCase(void) {} void ScreenRegionTestV1::SetUp(void) { + const char **perms = new const char *[1]; + perms[0] = "ohos.permission.SYSTEM_FLOAT_WINDOW"; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = 1, + .aclsNum = 0, + .dcaps = nullptr, + .perms = perms, + .acls = nullptr, + .processName = "screen_client_unittest", + .aplStr = "system_core", + }; + uint64_t tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); + delete[] perms; + const std::string remoteDevId = "sourceDevId"; uint64_t screenId = 0; uint64_t displayId = 0; @@ -141,6 +162,7 @@ HWTEST_F(ScreenRegionTestV1, GetWindowProperty_001, TestSize.Level1) screenRegion_->windowProperty_ = std::make_shared(); screenRegion_->windowProperty_->width = VIDEO_DATA_NUM; screenRegion_->windowProperty_->height = VIDEO_DATA_NUM; + screenRegion_->windowProperty_->displayId = Rosen::DisplayManager::GetInstance().GetDefaultDisplay()->GetId(); std::shared_ptr ret = screenRegion_->GetWindowProperty(); EXPECT_EQ(screenRegion_->windowProperty_, ret); } diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index fb9d52d48453d986ed2fc73b034d48b71d661096..2a3ead452675ea6c1f25882342c5f6ebbf26269b 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -70,6 +70,9 @@ ohos_unittest("DscreenRegionMgrTest") { ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "av_codec:av_codec_client", "cJSON:cjson", "c_utils:utils",