From 128a5bf3549922c2a92f5ac015f22b2ff541db88 Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Mon, 24 Oct 2022 14:51:20 +0800 Subject: [PATCH 1/2] ut Signed-off-by: gaoqiang_strong --- .../src/dscreen_source_handler_test.cpp | 132 ++++++++++++++- .../screenregionmgr/src/screenregion_test.cpp | 157 ++++++++++++++++++ 2 files changed, 288 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp index 86903c93..ffbfda1e 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp @@ -52,12 +52,82 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_001, TestSize.Lev std::shared_ptr callback = std::make_shared(); int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); EXPECT_EQ(DH_SUCCESS, ret); +} +/** + * @tc.name: RegisterDistributedHardware_002 + * @tc.desc: Verify the RegisterDistributedHardware function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_002, TestSize.Level1) +{ + const std::string devId = "devId"; + const std::string dhId = "dhId"; + EnableParam param; + param.version = "1"; + param.attrs = "attrs"; + std::shared_ptr callback = std::make_shared(); + DScreenSourceHandler::GetInstance().dScreenSourceProxy_ = nullptr; + int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); + EXPECT_EQ(ERR_DH_SCREEN_SA_SOURCEPROXY_NOT_INIT, ret); +} + +/** + * @tc.name: RegisterDistributedHardware_003 + * @tc.desc: Verify the RegisterDistributedHardware function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_003, TestSize.Level1) +{ + const std::string devId = "devId"; + const std::string dhId = "dhId"; + EnableParam param; + param.version = "1"; + param.attrs = "attrs"; + std::shared_ptr callback = std::make_shared(); DScreenSourceHandler::GetInstance().dScreenSourceCallback_ = nullptr; - ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); + int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); EXPECT_EQ(ERR_DH_SCREEN_SA_SOURCEPCALLBACK_NOT_INIT, ret); } +/** + * @tc.name: RegisterDistributedHardware_004 + * @tc.desc: Verify the RegisterDistributedHardware function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_004, TestSize.Level1) +{ + const std::string devId = ""; + const std::string dhId = ""; + EnableParam param; + param.version = "1"; + param.attrs = "attrs"; + std::shared_ptr callback = std::make_shared(); + int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); + EXPECT_EQ(ERR_DH_SCREEN_STRING_PARAM_EMPTY, ret); +} + +/** + * @tc.name: RegisterDistributedHardware_005 + * @tc.desc: Verify the RegisterDistributedHardware function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_005, TestSize.Level1) +{ + const std::string devId = "devId"; + const std::string dhId = "dhId"; + EnableParam param; + param.version = "1"; + param.attrs = "attrs"; + std::shared_ptr callback = nullptr; + int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); + EXPECT_EQ(ERR_DH_SCREEN_REGISTER_CALLBACK_NOT_INIT, ret); +} + /** * @tc.name: UnregisterDistributedHardware_001 * @tc.desc: Verify the UnregisterDistributedHardware function. @@ -83,6 +153,36 @@ HWTEST_F(DScreenSourceHandlerTest, UnregisterDistributedHardware_001, TestSize.L * @tc.require: Issue Number */ HWTEST_F(DScreenSourceHandlerTest, UnregisterDistributedHardware_002, TestSize.Level1) +{ + const std::string devId = ""; + const std::string dhId = ""; + std::shared_ptr callback = std::make_shared(); + int32_t ret = DScreenSourceHandler::GetInstance().UnregisterDistributedHardware(devId, dhId, callback); + EXPECT_EQ(ERR_DH_SCREEN_STRING_PARAM_EMPTY, ret); +} + +/** + * @tc.name: UnregisterDistributedHardware_003 + * @tc.desc: Verify the UnregisterDistributedHardware function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, UnregisterDistributedHardware_003, TestSize.Level1) +{ + const std::string devId = "devId"; + const std::string dhId = "dhId"; + std::shared_ptr callback = nullptr; + int32_t ret = DScreenSourceHandler::GetInstance().UnregisterDistributedHardware(devId, dhId, callback); + EXPECT_EQ(ERR_DH_SCREEN_REGISTER_CALLBACK_NOT_INIT, ret); +} + +/** + * @tc.name: UnregisterDistributedHardware_004 + * @tc.desc: Verify the UnregisterDistributedHardware function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, UnregisterDistributedHardware_004, TestSize.Level1) { const std::string devId = "devId"; const std::string dhId = "dhId"; @@ -93,6 +193,23 @@ HWTEST_F(DScreenSourceHandlerTest, UnregisterDistributedHardware_002, TestSize.L EXPECT_EQ(ERR_DH_SCREEN_SA_SOURCEPCALLBACK_NOT_INIT, ret); } +/** + * @tc.name: UnregisterDistributedHardware_005 + * @tc.desc: Verify the UnregisterDistributedHardware function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, UnregisterDistributedHardware_005, TestSize.Level1) +{ + const std::string devId = "devId"; + const std::string dhId = "dhId"; + std::shared_ptr callback = std::make_shared(); + DScreenSourceHandler::GetInstance().dScreenSourceProxy_ = nullptr; + + int32_t ret = DScreenSourceHandler::GetInstance().UnregisterDistributedHardware(devId, dhId, callback); + EXPECT_EQ(ERR_DH_SCREEN_SA_SOURCEPROXY_NOT_INIT, ret); +} + /** * @tc.name: ConfigDistributedHardware_001 * @tc.desc: Verify the ConfigDistributedHardware function. @@ -109,5 +226,18 @@ HWTEST_F(DScreenSourceHandlerTest, ConfigDistributedHardware_001, TestSize.Level int32_t ret = DScreenSourceHandler::GetInstance().ConfigDistributedHardware(devId, dhId, key, value); EXPECT_EQ(DH_SUCCESS, ret); } + +/** + * @tc.name: ReleaseSource_001 + * @tc.desc: Verify the ReleaseSource function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, ReleaseSource_001, TestSize.Level1) +{ + DScreenSourceHandler::GetInstance().dScreenSourceProxy_ = nullptr; + int32_t ret = DScreenSourceHandler::GetInstance().ReleaseSource(); + EXPECT_EQ(ERR_DH_SCREEN_SA_SOURCEPROXY_NOT_INIT, ret); +} } } \ No newline at end of file diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp index cdbafde3..7806b754 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp @@ -38,6 +38,143 @@ void ScreenRegionTest::TearDown(void) sleep(1); } +/** + * @tc.name: OnTransError_001 + * @tc.desc: Verify the OnTransError function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, OnTransError_001, TestSize.Level1) +{ + int32_t err = 0; + const std::string content = "ScreenRegionTest"; + screenRegion_->OnTransError(); + EXPECT_EQ(false, screenRegion_->isRunning); +} + +/** + * @tc.name: SetMapRelation_001 + * @tc.desc: Verify the SetMapRelation function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, SetMapRelation_001, TestSize.Level1) +{ + std::shared_ptr mapRelation = std::make_shared(); + screenRegion_->SetMapRelation(mapRelation); + EXPECT_EQ(mapRelation, screenRegion_->mapRelation_); +} + +/** + * @tc.name: GetScreenId_001 + * @tc.desc: Verify the GetScreenId function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, GetScreenId_001, TestSize.Level1) +{ + screenRegion_->screenId_ = 5; + uint64_t ret = screenRegion_->GetScreenId(); + EXPECT_EQ(screenRegion_->screenId_, ret); +} + +/** + * @tc.name: GetDisplayId_001 + * @tc.desc: Verify the GetDisplayId function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, GetDisplayId_001, TestSize.Level1) +{ + screenRegion_->displayId_ = 5; + uint64_t ret = screenRegion_->GetDisplayId(); + EXPECT_EQ(screenRegion_->displayId_, ret); +} + +/** + * @tc.name: GetRemoteDevId_001 + * @tc.desc: Verify the GetRemoteDevId function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, GetRemoteDevId_001, TestSize.Level1) +{ + screenRegion_->remoteDevId_ = "remoteDevId"; + std::string ret = screenRegion_->GetRemoteDevId(); + EXPECT_EQ(screenRegion_->remoteDevId_, ret); +} + +/** + * @tc.name: GetWindowId_001 + * @tc.desc: Verify the GetWindowId function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, GetWindowId_001, TestSize.Level1) +{ + screenRegion_->windowId_ = 5; + int32_t ret = screenRegion_->GetWindowId(); + EXPECT_EQ(screenRegion_->windowId_, ret); +} + +/** + * @tc.name: GetVideoParam_001 + * @tc.desc: Verify the GetVideoParam function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, GetVideoParam_001, TestSize.Level1) +{ + screenRegion_->videoParam_ = std::make_shared(); + std::shared_ptr ret = screenRegion_->GetVideoParam(); + EXPECT_EQ(screenRegion_->videoParam_, ret); +} + +/** + * @tc.name: GetWindowProperty_001 + * @tc.desc: Verify the GetWindowProperty function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, GetWindowProperty_001, TestSize.Level1) +{ + screenRegion_->windowProperty_ = std::make_shared(); + std::shared_ptr ret = screenRegion_->GetWindowProperty(); + EXPECT_EQ(screenRegion_->windowProperty_, ret); +} + +/** + * @tc.name: SetUpWindow_001 + * @tc.desc: Verify the SetUpWindow function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, SetUpWindow_001, TestSize.Level1) +{ + screenRegion_->mapRelation_ = nullptr; + int32_t ret = screenRegion_->SetUpWindow(); + EXPECT_EQ(ERR_DH_SCREEN_SA_DSCREEN_SCREENGION_SETUP_FAILED, ret); +} + +/** + * @tc.name: SetUpWindow_002 + * @tc.desc: Verify the SetUpWindow function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, SetUpWindow_002, TestSize.Level1) +{ + screenRegion_->mapRelation_ = std::make_shared(); + ScreenRect screenRect; + screenRect.startX = -1; + screenRect.startY = -1; + screenRect.width = 0; + screenRect.height = 0; + screenRegion_->mapRelation_->SetScreenRect(screenRect); + int32_t ret = screenRegion_->SetUpWindow(); + EXPECT_EQ(ERR_DH_SCREEN_SA_DSCREEN_SCREENGION_SETUP_FAILED, ret); +} + /** * @tc.name: SetUp_001 * @tc.desc: Verify the SetUp function failed. @@ -67,6 +204,26 @@ HWTEST_F(ScreenRegionTest, SetUp_001, TestSize.Level1) EXPECT_EQ(ERR_DH_SCREEN_SA_DSCREEN_SCREENGION_SETUP_FAILED, ret); } +/** + * @tc.name: SetUp_002 + * @tc.desc: Verify the SetUp function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionTest, SetUp_002, TestSize.Level1) +{ + screenRegion_->mapRelation_ = std::make_shared(); + ScreenRect screenRect; + screenRect.startX = -1; + screenRect.startY = -1; + screenRect.width = 0; + screenRect.height = 0; + screenRegion_->mapRelation_->SetScreenRect(screenRect); + int32_t ret = screenRegion_->SetUp(); + + EXPECT_EQ(ERR_DH_SCREEN_SA_DSCREEN_SCREENGION_SETUP_FAILED, ret); +} + /** * @tc.name: Start_001 * @tc.desc: Verify the Start function failed. -- Gitee From 150f64dc77fc87b55d4f4aeeb87eafd4814eba0d Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Mon, 24 Oct 2022 17:18:13 +0800 Subject: [PATCH 2/2] ut Signed-off-by: gaoqiang_strong --- .../test/unittest/screensourcetest/BUILD.gn | 2 ++ .../src/dscreen_source_handler_test.cpp | 20 +++++++++++ .../screenregionmgr/src/screenregion_test.cpp | 34 ++----------------- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index a7a9126b..20213111 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -21,6 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", + "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", ] @@ -61,6 +62,7 @@ ohos_unittest("ScreenSourceTest") { external_deps = [ "c_utils:utils", "ipc:ipc_core", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp index ffbfda1e..e71ca896 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp @@ -15,6 +15,9 @@ #define private public #include "dscreen_source_handler_test.h" +#include "if_system_ability_manager.h" +#include "iservice_registry.h" +#include "dscreen_constants.h" #undef private using namespace testing; @@ -239,5 +242,22 @@ HWTEST_F(DScreenSourceHandlerTest, ReleaseSource_001, TestSize.Level1) int32_t ret = DScreenSourceHandler::GetInstance().ReleaseSource(); EXPECT_EQ(ERR_DH_SCREEN_SA_SOURCEPROXY_NOT_INIT, ret); } + +/** + * @tc.name: OnRemoteDied_001 + * @tc.desc: Verify the OnRemoteDied function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenSourceHandlerTest, OnRemoteDied_001, TestSize.Level1) +{ + sptr samgr = + SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + + sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID); + wptr remote(remoteObject); + DScreenSourceHandler::GetInstance().sourceSvrRecipient_->OnRemoteDied(remote); + EXPECT_EQ(nullptr, DScreenSourceHandler::GetInstance().dScreenSourceProxy_); +} } } \ No newline at end of file diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp index 7806b754..ab31d9de 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp @@ -33,10 +33,7 @@ void ScreenRegionTest::SetUp(void) screenRegion_ = std::make_shared(remoteDevId, screenId, displayId); } -void ScreenRegionTest::TearDown(void) -{ - sleep(1); -} +void ScreenRegionTest::TearDown(void) {} /** * @tc.name: OnTransError_001 @@ -48,7 +45,7 @@ HWTEST_F(ScreenRegionTest, OnTransError_001, TestSize.Level1) { int32_t err = 0; const std::string content = "ScreenRegionTest"; - screenRegion_->OnTransError(); + screenRegion_->OnTransError(err, content); EXPECT_EQ(false, screenRegion_->isRunning); } @@ -156,25 +153,6 @@ HWTEST_F(ScreenRegionTest, SetUpWindow_001, TestSize.Level1) EXPECT_EQ(ERR_DH_SCREEN_SA_DSCREEN_SCREENGION_SETUP_FAILED, ret); } -/** - * @tc.name: SetUpWindow_002 - * @tc.desc: Verify the SetUpWindow function failed. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenRegionTest, SetUpWindow_002, TestSize.Level1) -{ - screenRegion_->mapRelation_ = std::make_shared(); - ScreenRect screenRect; - screenRect.startX = -1; - screenRect.startY = -1; - screenRect.width = 0; - screenRect.height = 0; - screenRegion_->mapRelation_->SetScreenRect(screenRect); - int32_t ret = screenRegion_->SetUpWindow(); - EXPECT_EQ(ERR_DH_SCREEN_SA_DSCREEN_SCREENGION_SETUP_FAILED, ret); -} - /** * @tc.name: SetUp_001 * @tc.desc: Verify the SetUp function failed. @@ -212,13 +190,7 @@ HWTEST_F(ScreenRegionTest, SetUp_001, TestSize.Level1) */ HWTEST_F(ScreenRegionTest, SetUp_002, TestSize.Level1) { - screenRegion_->mapRelation_ = std::make_shared(); - ScreenRect screenRect; - screenRect.startX = -1; - screenRect.startY = -1; - screenRect.width = 0; - screenRect.height = 0; - screenRegion_->mapRelation_->SetScreenRect(screenRect); + screenRegion_->mapRelation_ = nullptr; int32_t ret = screenRegion_->SetUp(); EXPECT_EQ(ERR_DH_SCREEN_SA_DSCREEN_SCREENGION_SETUP_FAILED, ret); -- Gitee