From 4a9206ae4aa370bd5cf8176e2b9a3baac30d023e Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 19 Jul 2023 21:18:47 +0800 Subject: [PATCH 1/6] 7.19 Signed-off-by: yangli --- .../2.0/include/screenregionmgr_test.h | 40 +++ .../2.0/src/screenregionmgr_test.cpp | 114 ++++++++ .../sinkservice/screenregionmgr/BUILD.gn | 1 + .../2.0/include/dscreen_manager_test.h | 40 +++ .../2.0/src/dscreen_manager_test.cpp | 267 ++++++++++++++++++ .../sourceservice/dscreenmgr/BUILD.gn | 1 + 6 files changed, 463 insertions(+) create mode 100644 services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h create mode 100644 services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp create mode 100644 services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h create mode 100644 services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h new file mode 100644 index 00000000..e547efad --- /dev/null +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_SCREEN_REGION_MANAGER_TEST_V2_0_H +#define OHOS_SCREEN_REGION_MANAGER_TEST_V2_0_H + +#include +#include +#include "dscreen_errcode.h" + +#define private public +#include "2.0/include/screenregionmgr.h" +#undef private + +namespace OHOS { +namespace DistributedHardware { +namespace V2_0 { +class ScreenRegionManagerTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); +}; +} // namespace V2_0 +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp new file mode 100644 index 00000000..053efc0f --- /dev/null +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "2.0/include/screenregionmgr_test.h" + +using namespace testing; +using namespace testing::ext; + +namespace OHOS { +namespace DistributedHardware { +namespace V2_0 { +void ScreenRegionManagerTest::SetUpTestCase(void) {} + +void ScreenRegionManagerTest::TearDownTestCase(void) {} + +void ScreenRegionManagerTest::SetUp(void) {} + +void ScreenRegionManagerTest::TearDown(void) +{ + sleep(1); +} + +/** + * @tc.name: Initialize_001 + * @tc.desc: Verify the Initialize function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionManagerTest, Initialize_001, TestSize.Level1) +{ + EXPECT_NE(DH_SUCCESS, ScreenRegionManager::GetInstance().Initialize()); + EXPECT_EQ(DH_SUCCESS, ScreenRegionManager::GetInstance().Release()); +} + +/** + * @tc.name: CreateDScreenRegion_001 + * @tc.desc: Verify the CreateDScreenRegion function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionManagerTest, CreateDScreenRegion_001, TestSize.Level1) +{ + std::string peerDevId = "peerDevId"; + int32_t ret =ScreenRegionManager::GetInstance().CreateDScreenRegion(peerDevId); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: DestoryDScreenRegion_001 + * @tc.desc: Verify the DestoryDScreenRegion function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionManagerTest, DestoryDScreenRegion_001, TestSize.Level1) +{ + std::string peerDevId = "peerDevId"; + int32_t ret =ScreenRegionManager::GetInstance().DestoryDScreenRegion(peerDevId); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: GetScreenDumpInfo_001 + * @tc.desc: Verify the GetScreenDumpInfo function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionManagerTest, GetScreenDumpInfo_001, TestSize.Level1) +{ + std::string result; + ScreenRegionManager::GetInstance().GetScreenDumpInfo(result); + EXPECT_EQ(false, result.empty()); +} + +/** + * @tc.name: GetScreenDumpInfo_002 + * @tc.desc: Verify the GetScreenDumpInfo function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionManagerTest, GetScreenDumpInfo_002, TestSize.Level1) +{ + std::string result; + ScreenRegionManager::GetInstance().GetScreenDumpInfo(result); + EXPECT_EQ(false, result.empty()); +} + +/** + * @tc.name: OnProviderEvent_002 + * @tc.desc: Verify the OnProviderEvent function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenRegionManagerTest, OnProviderEvent_002, TestSize.Level1) +{ + AVTransEvent event; + EngineProviderListener engineProviderListener; + int32_t ret = engineProviderListener.OnProviderEvent(event); + EXPECT_EQ(DH_SUCCESS, ret); +} +} +} +} \ No newline at end of file diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 1bf5e26c..93f839ad 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -55,6 +55,7 @@ ohos_unittest("DscreenRegionMgrTest") { "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregion_test.cpp", "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp", "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp", + "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp", ] configs = [ ":module_private_config" ] diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h new file mode 100644 index 00000000..a0ea242a --- /dev/null +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DSCREEN_MANAGER_TEST_V2_0_H +#define OHOS_DSCREEN_MANAGER_TEST_V2_0_H + +#include +#include +#include "dscreen_errcode.h" + +#define private public +#include "2.0/include/dscreen_manager.h" +#undef private + +namespace OHOS { +namespace DistributedHardware { +namespace V2_0 { +class DScreenManagerTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); +}; +} // namespace V2_0 +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp new file mode 100644 index 00000000..f0f0936e --- /dev/null +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp @@ -0,0 +1,267 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "2.0/include/dscreen_manager_test.h" + +using namespace testing; +using namespace testing::ext; + +namespace OHOS { +namespace DistributedHardware { +namespace V2_0 { +void DScreenManagerTest::SetUpTestCase(void) {} + +void DScreenManagerTest::TearDownTestCase(void) {} + +void DScreenManagerTest::SetUp() {} + +void DScreenManagerTest::TearDown() {} + +/** + * @tc.name: Initialize_001 + * @tc.desc: Verify the Init function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, Initialize_001, TestSize.Level1) +{ + sptr dScreenGroupListener_ = new (std::nothrow) DScreenGroupListener(); + int32_t ret = DScreenManager::GetInstance().Initialize(); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: Release_001 + * @tc.desc: Verify the Release function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, Release_001, TestSize.Level1) +{ + int32_t ret = DScreenManager::GetInstance().Release(); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: HandleScreenChange_001 + * @tc.desc: Verify the HandleScreenChange function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, HandleScreenChange_001, TestSize.Level1) +{ + std::shared_ptr changedScreen = nullptr; + Rosen::ScreenGroupChangeEvent event = Rosen::ScreenGroupChangeEvent::ADD_TO_GROUP; + DScreenManager::GetInstance().HandleScreenChange(changedScreen, event); + + std::shared_ptr dScreenCallback = std::make_shared(); + changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); + DScreenManager::GetInstance().HandleScreenChange(changedScreen, event); + + event = Rosen::ScreenGroupChangeEvent::REMOVE_FROM_GROUP; + DScreenManager::GetInstance().HandleScreenChange(changedScreen, event); + + event = Rosen::ScreenGroupChangeEvent::CHANGE_GROUP; + DScreenManager::GetInstance().HandleScreenChange(changedScreen, event); + + event = (Rosen::ScreenGroupChangeEvent)99; + DScreenManager::GetInstance().HandleScreenChange(changedScreen, event); + + int32_t ret = DScreenManager::GetInstance().Initialize(); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: StartDScreenMirror_001 + * @tc.desc: Verify the StartDScreenMirror function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, StartDScreenMirror_001, TestSize.Level1) +{ + std::shared_ptr changedScreen = nullptr; + int32_t ret = DScreenManager::GetInstance().StartDScreenMirror(changedScreen); + EXPECT_EQ(ERR_DH_SCREEN_SA_VALUE_NOT_INIT, ret); + + std::shared_ptr dScreenCallback = std::make_shared(); + changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); + ret = DScreenManager::GetInstance().StartDScreenMirror(changedScreen); + + changedScreen->SetState(CONNECTING); + ret = DScreenManager::GetInstance().StartDScreenMirror(changedScreen); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: StopDScreenMirror_001 + * @tc.desc: Verify the StopDScreenMirror function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, StopDScreenMirror_001, TestSize.Level1) +{ + std::shared_ptr changedScreen = nullptr; + int32_t ret = DScreenManager::GetInstance().StopDScreenMirror(changedScreen); + EXPECT_EQ(ERR_DH_SCREEN_SA_VALUE_NOT_INIT, ret); + + std::shared_ptr dScreenCallback = std::make_shared(); + changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); + ret = DScreenManager::GetInstance().StopDScreenMirror(changedScreen); + EXPECT_EQ(DH_SUCCESS, ret); + + changedScreen->SetState(CONNECTING); + ret = DScreenManager::GetInstance().StopDScreenMirror(changedScreen); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: OnRegResult_001 + * @tc.desc: Verify the OnRegResult function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, OnRegResult_001, TestSize.Level1) +{ + std::shared_ptr dScreenCallback = std::make_shared(); + std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); + DScreenManager::GetInstance().OnRegResult(changedScreen, "taskId000", DH_SUCCESS, "dscreen enable success."); + + int32_t ret = DScreenManager::GetInstance().Release(); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: OnUnregResult_001 + * @tc.desc: Verify the OnUnregResult function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, OnUnregResult_001, TestSize.Level1) +{ + std::shared_ptr dScreenCallback = std::make_shared(); + std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); + DScreenManager::GetInstance().OnUnregResult(changedScreen, "taskId000", DH_SUCCESS, "dscreen disable success."); + + int32_t ret = DScreenManager::GetInstance().Release(); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: EnableDistributedScreen_001 + * @tc.desc: Verify the EnableDistributedScreen function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, EnableDistributedScreen_001, TestSize.Level1) +{ + std::shared_ptr dScreenCallback = nullptr; + int32_t ret = DScreenManager::GetInstance().EnableDistributedScreen("", "", EnableParam{"", ""}, ""); + EXPECT_EQ(ERR_DH_SCREEN_SA_ENABLE_FAILED, ret); + + std::string devId = "devId000"; + std::string dhId = "dhId000"; + EnableParam param = {"2.0", "attrs000"}; + std::string reqId = "reqId000"; + ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); + EXPECT_EQ(DH_SUCCESS, ret); + + std::shared_ptr dScreen = DScreenManager::GetInstance().FindDScreenById(SCREEN_ID_INVALID); + dScreen->SetState(DScreenState::ENABLED); + ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); + EXPECT_EQ(DH_SUCCESS, ret); + + dScreen->SetState(DScreenState::DISCONNECTING); + ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); + + dScreen->SetState(DScreenState::ENABLING); + ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: DisableDistributedScreen_001 + * @tc.desc: Verify the DisableDistributedScreen function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, DisableDistributedScreen_001, TestSize.Level1) +{ + int32_t ret = DScreenManager::GetInstance().DisableDistributedScreen("devId111", "dhId111", "reqId111"); + EXPECT_EQ(DH_SUCCESS, ret); + + ret = DScreenManager::GetInstance().Release(); + EXPECT_EQ(DH_SUCCESS, ret); +} + +/** + * @tc.name: FindDScreenById_001 + * @tc.desc: Verify the FindDScreenById function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, FindDScreenById_001, TestSize.Level1) +{ + std::shared_ptr dScreen = DScreenManager::GetInstance().FindDScreenById(99); + EXPECT_EQ(nullptr, dScreen); +} + +/** + * @tc.name: GetScreenDumpInfo_001 + * @tc.desc: Verify the GetScreenDumpInfo function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_001, TestSize.Level1) +{ + std::string result; + DScreenManager::GetInstance().GetScreenDumpInfo(result); + EXPECT_EQ(false, result.empty()); +} + +/** + * @tc.name: GetScreenDumpInfo_002 + * @tc.desc: Verify the GetScreenDumpInfo function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_002, TestSize.Level1) +{ + std::string result; + DScreenManager::GetInstance().GetScreenDumpInfo(result); + EXPECT_EQ(false, result.empty()); +} + +/** + * @tc.name: PublishMessage_001 + * @tc.desc: Verify the PublishMessage function failed. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenManagerTest, PublishMessage_001, TestSize.Level1) +{ + std::shared_ptr dScreenCallback = std::make_shared(); + std::shared_ptr dScreen = std::make_shared("devId000", "dhId000", dScreenCallback); + DScreenManager::GetInstance().PublishMessage(DHTopic::TOPIC_START_DSCREEN, dScreen); + + DScreenManager::GetInstance().PublishMessage(DHTopic::TOPIC_STOP_DSCREEN, dScreen); + + DScreenManager::GetInstance().PublishMessage(DHTopic::TOPIC_MIN, dScreen); + + int32_t ret = DScreenManager::GetInstance().Release(); + EXPECT_EQ(DH_SUCCESS, 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 efe2d7e3..480d2027 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -60,6 +60,7 @@ ohos_unittest("DscreenMgrTest") { "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp", "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp", "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp", + "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp", ] configs = [ ":module_private_config" ] -- Gitee From 237515b845adf25860313f00af155b3e50d0e1a3 Mon Sep 17 00:00:00 2001 From: yangli Date: Thu, 20 Jul 2023 10:39:05 +0800 Subject: [PATCH 2/6] 7.19 Signed-off-by: yangli --- .../1.0/include/screenregion_test.h | 2 +- .../1.0/include/screenregionmgr_test.h | 2 +- .../1.0/src/screenregion_test.cpp | 42 +++++++++--------- .../1.0/src/screenregionmgr_test.cpp | 24 +++++----- .../2.0/include/screenregionmgr_test.h | 2 +- .../2.0/src/screenregionmgr_test.cpp | 20 ++++----- .../1.0/include/dscreen_manager_test.h | 2 +- .../dscreenmgr/1.0/include/dscreen_test.h | 2 +- .../1.0/src/dscreen_manager_test.cpp | 40 ++++++++--------- .../dscreenmgr/1.0/src/dscreen_test.cpp | 44 +++++++++---------- .../2.0/include/dscreen_manager_test.h | 2 +- .../2.0/src/dscreen_manager_test.cpp | 41 +++++++++-------- 12 files changed, 111 insertions(+), 112 deletions(-) diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h index 191f6e5b..0c9834b5 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h @@ -28,7 +28,7 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { -class ScreenRegionTest : public testing::Test { +class ScreenRegionTest1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h index 8752f79c..17ebd34b 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { -class ScreenRegionManagerTest : public testing::Test { +class ScreenRegionManagerTest1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); 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 54a35ce6..fc22125c 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 @@ -22,11 +22,11 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V1_0 { -void ScreenRegionTest::SetUpTestCase(void) {} +void ScreenRegionTest1::SetUpTestCase(void) {} -void ScreenRegionTest::TearDownTestCase(void) {} +void ScreenRegionTest1::TearDownTestCase(void) {} -void ScreenRegionTest::SetUp(void) +void ScreenRegionTest1::SetUp(void) { const std::string remoteDevId = "sourceDevId"; uint64_t screenId = 0; @@ -34,7 +34,7 @@ void ScreenRegionTest::SetUp(void) screenRegion_ = std::make_shared(remoteDevId, screenId, displayId); } -void ScreenRegionTest::TearDown(void) {} +void ScreenRegionTest1::TearDown(void) {} /** * @tc.name: OnTransError_001 @@ -42,10 +42,10 @@ void ScreenRegionTest::TearDown(void) {} * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, OnTransError_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, OnTransError_001, TestSize.Level1) { int32_t err = 0; - const std::string content = "ScreenRegionTest"; + const std::string content = "ScreenRegionTest1"; screenRegion_->OnTransError(err, content); EXPECT_EQ(false, screenRegion_->isRunning); } @@ -56,7 +56,7 @@ HWTEST_F(ScreenRegionTest, OnTransError_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, SetMapRelation_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, SetMapRelation_001, TestSize.Level1) { std::shared_ptr mapRelation = std::make_shared(); screenRegion_->SetMapRelation(mapRelation); @@ -69,7 +69,7 @@ HWTEST_F(ScreenRegionTest, SetMapRelation_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, GetScreenId_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, GetScreenId_001, TestSize.Level1) { screenRegion_->screenId_ = 5; uint64_t ret = screenRegion_->GetScreenId(); @@ -82,7 +82,7 @@ HWTEST_F(ScreenRegionTest, GetScreenId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, GetDisplayId_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, GetDisplayId_001, TestSize.Level1) { screenRegion_->displayId_ = 5; uint64_t ret = screenRegion_->GetDisplayId(); @@ -95,7 +95,7 @@ HWTEST_F(ScreenRegionTest, GetDisplayId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, GetRemoteDevId_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, GetRemoteDevId_001, TestSize.Level1) { screenRegion_->remoteDevId_ = "remoteDevId"; std::string ret = screenRegion_->GetRemoteDevId(); @@ -108,7 +108,7 @@ HWTEST_F(ScreenRegionTest, GetRemoteDevId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, GetWindowId_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, GetWindowId_001, TestSize.Level1) { screenRegion_->windowId_ = 5; int32_t ret = screenRegion_->GetWindowId(); @@ -121,7 +121,7 @@ HWTEST_F(ScreenRegionTest, GetWindowId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, GetVideoParam_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, GetVideoParam_001, TestSize.Level1) { screenRegion_->videoParam_ = std::make_shared(); std::shared_ptr ret = screenRegion_->GetVideoParam(); @@ -134,7 +134,7 @@ HWTEST_F(ScreenRegionTest, GetVideoParam_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, GetWindowProperty_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, GetWindowProperty_001, TestSize.Level1) { screenRegion_->windowProperty_ = std::make_shared(); std::shared_ptr ret = screenRegion_->GetWindowProperty(); @@ -147,7 +147,7 @@ HWTEST_F(ScreenRegionTest, GetWindowProperty_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, SetUpWindow_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, SetUpWindow_001, TestSize.Level1) { screenRegion_->mapRelation_ = nullptr; int32_t ret = screenRegion_->SetUpWindow(); @@ -160,7 +160,7 @@ HWTEST_F(ScreenRegionTest, SetUpWindow_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, SetUp_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, SetUp_001, TestSize.Level1) { screenRegion_->mapRelation_ = std::make_shared(); ScreenRect screenRect; @@ -190,7 +190,7 @@ HWTEST_F(ScreenRegionTest, SetUp_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, SetUp_002, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, SetUp_002, TestSize.Level1) { screenRegion_->mapRelation_ = nullptr; std::string version = "1.0"; @@ -205,7 +205,7 @@ HWTEST_F(ScreenRegionTest, SetUp_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, Start_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, Start_001, TestSize.Level1) { int32_t ret = screenRegion_->Start(); @@ -218,7 +218,7 @@ HWTEST_F(ScreenRegionTest, Start_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, Start_002, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, Start_002, TestSize.Level1) { screenRegion_->sinkTrans_ = std::make_shared(); int32_t ret = screenRegion_->Start(); @@ -232,7 +232,7 @@ HWTEST_F(ScreenRegionTest, Start_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, Stop_001, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, Stop_001, TestSize.Level1) { screenRegion_->isRunning = false; int32_t ret = screenRegion_->Stop(); @@ -246,7 +246,7 @@ HWTEST_F(ScreenRegionTest, Stop_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, Stop_002, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, Stop_002, TestSize.Level1) { screenRegion_->isRunning = true; int32_t ret = screenRegion_->Stop(); @@ -260,7 +260,7 @@ HWTEST_F(ScreenRegionTest, Stop_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest, Stop_003, TestSize.Level1) +HWTEST_F(ScreenRegionTest1, Stop_003, TestSize.Level1) { screenRegion_->isRunning = true; screenRegion_->sinkTrans_ = std::make_shared(); diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp index dfd01a93..61427d59 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp @@ -21,13 +21,13 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V1_0 { -void ScreenRegionManagerTest::SetUpTestCase(void) {} +void ScreenRegionManagerTest1::SetUpTestCase(void) {} -void ScreenRegionManagerTest::TearDownTestCase(void) {} +void ScreenRegionManagerTest1::TearDownTestCase(void) {} -void ScreenRegionManagerTest::SetUp(void) {} +void ScreenRegionManagerTest1::SetUp(void) {} -void ScreenRegionManagerTest::TearDown(void) +void ScreenRegionManagerTest1::TearDown(void) { sleep(1); } @@ -38,7 +38,7 @@ void ScreenRegionManagerTest::TearDown(void) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, ReleaseAllRegions_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_001, TestSize.Level1) { const std::string remoteDevId = "sourceDevId"; uint64_t screenId = 0; @@ -56,7 +56,7 @@ HWTEST_F(ScreenRegionManagerTest, ReleaseAllRegions_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, ReleaseAllRegions_002, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_002, TestSize.Level1) { const std::string remoteDevId = "sourceDevId"; std::shared_ptr screenRegion = nullptr; @@ -72,7 +72,7 @@ HWTEST_F(ScreenRegionManagerTest, ReleaseAllRegions_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, ReleaseAllRegions_003, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_003, TestSize.Level1) { std::string remoteDevId = "sourceDevId"; int32_t eventCode = 100; @@ -113,7 +113,7 @@ HWTEST_F(ScreenRegionManagerTest, ReleaseAllRegions_003, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, NotifyRemoteScreenService_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest1, NotifyRemoteScreenService_001, TestSize.Level1) { const std::string remoteDevId = "sourceDevId"; const std::string dhId = "sinkDhId"; @@ -131,7 +131,7 @@ HWTEST_F(ScreenRegionManagerTest, NotifyRemoteScreenService_001, TestSize.Level1 * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_001, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; @@ -152,7 +152,7 @@ HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_002, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_002, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; @@ -172,7 +172,7 @@ HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_003, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_003, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; @@ -193,7 +193,7 @@ HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_003, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, GetDScreenSourceSA_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest1, GetDScreenSourceSA_001, TestSize.Level1) { const std::string remoteDevId = "sourceDevId"; sptr ret = ScreenRegionManager::GetInstance().GetDScreenSourceSA(remoteDevId); diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h index e547efad..e6707ca2 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V2_0 { -class ScreenRegionManagerTest : public testing::Test { +class ScreenRegionManagerTest2 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp index 053efc0f..fcd845fd 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp @@ -21,13 +21,13 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V2_0 { -void ScreenRegionManagerTest::SetUpTestCase(void) {} +void ScreenRegionManagerTest2::SetUpTestCase(void) {} -void ScreenRegionManagerTest::TearDownTestCase(void) {} +void ScreenRegionManagerTest2::TearDownTestCase(void) {} -void ScreenRegionManagerTest::SetUp(void) {} +void ScreenRegionManagerTest2::SetUp(void) {} -void ScreenRegionManagerTest::TearDown(void) +void ScreenRegionManagerTest2::TearDown(void) { sleep(1); } @@ -38,7 +38,7 @@ void ScreenRegionManagerTest::TearDown(void) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, Initialize_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest2, Initialize_001, TestSize.Level1) { EXPECT_NE(DH_SUCCESS, ScreenRegionManager::GetInstance().Initialize()); EXPECT_EQ(DH_SUCCESS, ScreenRegionManager::GetInstance().Release()); @@ -50,7 +50,7 @@ HWTEST_F(ScreenRegionManagerTest, Initialize_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, CreateDScreenRegion_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest2, CreateDScreenRegion_001, TestSize.Level1) { std::string peerDevId = "peerDevId"; int32_t ret =ScreenRegionManager::GetInstance().CreateDScreenRegion(peerDevId); @@ -63,7 +63,7 @@ HWTEST_F(ScreenRegionManagerTest, CreateDScreenRegion_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, DestoryDScreenRegion_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest2, DestoryDScreenRegion_001, TestSize.Level1) { std::string peerDevId = "peerDevId"; int32_t ret =ScreenRegionManager::GetInstance().DestoryDScreenRegion(peerDevId); @@ -76,7 +76,7 @@ HWTEST_F(ScreenRegionManagerTest, DestoryDScreenRegion_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, GetScreenDumpInfo_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest2, GetScreenDumpInfo_001, TestSize.Level1) { std::string result; ScreenRegionManager::GetInstance().GetScreenDumpInfo(result); @@ -89,7 +89,7 @@ HWTEST_F(ScreenRegionManagerTest, GetScreenDumpInfo_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, GetScreenDumpInfo_002, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest2, GetScreenDumpInfo_002, TestSize.Level1) { std::string result; ScreenRegionManager::GetInstance().GetScreenDumpInfo(result); @@ -102,7 +102,7 @@ HWTEST_F(ScreenRegionManagerTest, GetScreenDumpInfo_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest, OnProviderEvent_002, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTest2, OnProviderEvent_002, TestSize.Level1) { AVTransEvent event; EngineProviderListener engineProviderListener; diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h index ecec03a5..b18a530a 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { -class DScreenManagerTest : public testing::Test { +class DScreenManagerTest1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h index 528f816f..3e2a6ef8 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h @@ -25,7 +25,7 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { -class DScreenTest : public testing::Test { +class DScreenTest1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp index 564ead43..448f7644 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp @@ -21,13 +21,13 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V1_0 { -void DScreenManagerTest::SetUpTestCase(void) {} +void DScreenManagerTest1::SetUpTestCase(void) {} -void DScreenManagerTest::TearDownTestCase(void) {} +void DScreenManagerTest1::TearDownTestCase(void) {} -void DScreenManagerTest::SetUp() {} +void DScreenManagerTest1::SetUp() {} -void DScreenManagerTest::TearDown() {} +void DScreenManagerTest1::TearDown() {} /** * @tc.name: Init_001 @@ -35,7 +35,7 @@ void DScreenManagerTest::TearDown() {} * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, Init_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, Init_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().Init(); EXPECT_EQ(DH_SUCCESS, ret); @@ -47,7 +47,7 @@ HWTEST_F(DScreenManagerTest, Init_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, HandleScreenChange_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, HandleScreenChange_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; Rosen::ScreenGroupChangeEvent event = Rosen::ScreenGroupChangeEvent::ADD_TO_GROUP; @@ -76,7 +76,7 @@ HWTEST_F(DScreenManagerTest, HandleScreenChange_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, AddToGroup_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, AddToGroup_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; int32_t ret = DScreenManager::GetInstance().AddToGroup(changedScreen, 0); @@ -98,7 +98,7 @@ HWTEST_F(DScreenManagerTest, AddToGroup_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, RemoveFromGroup_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, RemoveFromGroup_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; int32_t ret = DScreenManager::GetInstance().RemoveFromGroup(changedScreen, 0); @@ -120,7 +120,7 @@ HWTEST_F(DScreenManagerTest, RemoveFromGroup_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, OnRegResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, OnRegResult_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -136,7 +136,7 @@ HWTEST_F(DScreenManagerTest, OnRegResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, OnUnregResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, OnUnregResult_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -152,7 +152,7 @@ HWTEST_F(DScreenManagerTest, OnUnregResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, GetScreenDumpInfo_001, TestSize.Level1) { std::string result; DScreenManager::GetInstance().GetScreenDumpInfo(result); @@ -165,7 +165,7 @@ HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, EnableDistributedScreen_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, EnableDistributedScreen_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().UnInit(); EXPECT_EQ(DH_SUCCESS, ret); @@ -199,7 +199,7 @@ HWTEST_F(DScreenManagerTest, EnableDistributedScreen_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, FindDScreenByScreenId_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, FindDScreenByScreenId_001, TestSize.Level1) { std::shared_ptr dScreen = DScreenManager::GetInstance().FindDScreenByScreenId(99); EXPECT_EQ(nullptr, dScreen); @@ -211,7 +211,7 @@ HWTEST_F(DScreenManagerTest, FindDScreenByScreenId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_002, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, GetScreenDumpInfo_002, TestSize.Level1) { std::string result; DScreenManager::GetInstance().GetScreenDumpInfo(result); @@ -224,7 +224,7 @@ HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, HandleDScreenNotify_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, HandleDScreenNotify_001, TestSize.Level1) { std::string devId = "devId111"; int32_t eventCode = -1; @@ -244,7 +244,7 @@ HWTEST_F(DScreenManagerTest, HandleDScreenNotify_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, NotifyRemoteScreenService_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, NotifyRemoteScreenService_001, TestSize.Level1) { std::string devId = "devId111"; int32_t eventCode = NOTIFY_SOURCE_SETUP_RESULT; @@ -259,7 +259,7 @@ HWTEST_F(DScreenManagerTest, NotifyRemoteScreenService_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, PublishMessage_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, PublishMessage_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr dScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -279,7 +279,7 @@ HWTEST_F(DScreenManagerTest, PublishMessage_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, NotifyRemoteSinkSetUp_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, NotifyRemoteSinkSetUp_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr dScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -295,7 +295,7 @@ HWTEST_F(DScreenManagerTest, NotifyRemoteSinkSetUp_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, HandleNotifySetUpResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, HandleNotifySetUpResult_001, TestSize.Level1) { DScreenManager::GetInstance().HandleNotifySetUpResult("remoteDevId", "eventContent"); @@ -324,7 +324,7 @@ HWTEST_F(DScreenManagerTest, HandleNotifySetUpResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, DisableDistributedScreen_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest1, DisableDistributedScreen_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().DisableDistributedScreen("devId111", "dhId111", "reqId111"); EXPECT_EQ(DH_SUCCESS, ret); 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 1907cd7a..83be49dc 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 @@ -32,11 +32,11 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { constexpr static int32_t videoDataNum = 100; -void DScreenTest::SetUpTestCase(void) {} +void DScreenTest1::SetUpTestCase(void) {} -void DScreenTest::TearDownTestCase(void) {} +void DScreenTest1::TearDownTestCase(void) {} -void DScreenTest::SetUp(void) +void DScreenTest1::SetUp(void) { std::string devId = "devId"; std::string dhId = "dhId"; @@ -53,7 +53,7 @@ void DScreenTest::SetUp(void) dScreen_->devId_ = "peerDevId"; } -void DScreenTest::TearDown(void) {} +void DScreenTest1::TearDown(void) {} /** * @tc.name: AddTask_001 @@ -61,7 +61,7 @@ void DScreenTest::TearDown(void) {} * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, AddTask_001, TestSize.Level1) +HWTEST_F(DScreenTest1, AddTask_001, TestSize.Level1) { int32_t err = 0; std::string content = "content"; @@ -91,7 +91,7 @@ HWTEST_F(DScreenTest, AddTask_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, AddTask_002, TestSize.Level1) +HWTEST_F(DScreenTest1, AddTask_002, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -112,7 +112,7 @@ HWTEST_F(DScreenTest, AddTask_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, HandleEnable_001, TestSize.Level1) +HWTEST_F(DScreenTest1, HandleEnable_001, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -131,7 +131,7 @@ HWTEST_F(DScreenTest, HandleEnable_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, HandleEnable_002, TestSize.Level1) +HWTEST_F(DScreenTest1, HandleEnable_002, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -152,7 +152,7 @@ HWTEST_F(DScreenTest, HandleEnable_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, HandleEnable_003, TestSize.Level1) +HWTEST_F(DScreenTest1, HandleEnable_003, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -172,7 +172,7 @@ HWTEST_F(DScreenTest, HandleEnable_003, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, HandleEnable_004, TestSize.Level1) +HWTEST_F(DScreenTest1, HandleEnable_004, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -192,7 +192,7 @@ HWTEST_F(DScreenTest, HandleEnable_004, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, HandleEnable_005, TestSize.Level1) +HWTEST_F(DScreenTest1, HandleEnable_005, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -216,7 +216,7 @@ HWTEST_F(DScreenTest, HandleEnable_005, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, CheckJsonData_001, TestSize.Level1) +HWTEST_F(DScreenTest1, CheckJsonData_001, TestSize.Level1) { json attrJson; @@ -244,7 +244,7 @@ HWTEST_F(DScreenTest, CheckJsonData_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, CheckJsonData_002, TestSize.Level1) +HWTEST_F(DScreenTest1, CheckJsonData_002, TestSize.Level1) { json attrJson; attrJson["dhid"] = "dhid"; @@ -264,7 +264,7 @@ HWTEST_F(DScreenTest, CheckJsonData_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, CheckJsonData_003, TestSize.Level1) +HWTEST_F(DScreenTest1, CheckJsonData_003, TestSize.Level1) { json attrJson; uint32_t width = 100; @@ -292,7 +292,7 @@ HWTEST_F(DScreenTest, CheckJsonData_003, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, NegotiateCodecType_001, TestSize.Level1) +HWTEST_F(DScreenTest1, NegotiateCodecType_001, TestSize.Level1) { std::string remoteCodecInfoStr = "remoteCodecInfoStr"; int32_t ret = dScreen_->NegotiateCodecType(remoteCodecInfoStr); @@ -305,7 +305,7 @@ HWTEST_F(DScreenTest, NegotiateCodecType_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, NegotiateCodecType_002, TestSize.Level1) +HWTEST_F(DScreenTest1, NegotiateCodecType_002, TestSize.Level1) { std::string remoteCodecInfoStr = "{\"codecType\":\"[\"OMX_rk_video_encoder_avc\", \"OMX_rk_video_encoder_hevc\", \ \"avenc_mpeg4\"]\"}"; @@ -319,7 +319,7 @@ HWTEST_F(DScreenTest, NegotiateCodecType_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, SetUp_001, TestSize.Level1) +HWTEST_F(DScreenTest1, SetUp_001, TestSize.Level1) { dScreen_->sourceTrans_ = nullptr; dScreen_->videoParam_ = std::make_shared(); @@ -340,7 +340,7 @@ HWTEST_F(DScreenTest, SetUp_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, SetUp_002, TestSize.Level1) +HWTEST_F(DScreenTest1, SetUp_002, TestSize.Level1) { dScreen_->sourceTrans_ = std::make_shared(); dScreen_->videoParam_ = std::make_shared(); @@ -361,7 +361,7 @@ HWTEST_F(DScreenTest, SetUp_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, Start_001, TestSize.Level1) +HWTEST_F(DScreenTest1, Start_001, TestSize.Level1) { dScreen_->sourceTrans_ = nullptr; int32_t ret = dScreen_->Start(); @@ -374,7 +374,7 @@ HWTEST_F(DScreenTest, Start_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, Start_002, TestSize.Level1) +HWTEST_F(DScreenTest1, Start_002, TestSize.Level1) { dScreen_->sourceTrans_ = std::make_shared(); int32_t ret = dScreen_->Start(); @@ -387,7 +387,7 @@ HWTEST_F(DScreenTest, Start_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, Stop_001, TestSize.Level1) +HWTEST_F(DScreenTest1, Stop_001, TestSize.Level1) { dScreen_->sourceTrans_ = nullptr; int32_t ret = dScreen_->Stop(); @@ -400,7 +400,7 @@ HWTEST_F(DScreenTest, Stop_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest, Stop_002, TestSize.Level1) +HWTEST_F(DScreenTest1, Stop_002, TestSize.Level1) { dScreen_->sourceTrans_ = std::make_shared(); int32_t ret = dScreen_->Stop(); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h index a0ea242a..8431cada 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V2_0 { -class DScreenManagerTest : public testing::Test { +class DScreenManagerTest1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp index f0f0936e..a953b21c 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp @@ -21,13 +21,13 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V2_0 { -void DScreenManagerTest::SetUpTestCase(void) {} +void DScreenManagerTest2::SetUpTestCase(void) {} -void DScreenManagerTest::TearDownTestCase(void) {} +void DScreenManagerTest2::TearDownTestCase(void) {} -void DScreenManagerTest::SetUp() {} +void DScreenManagerTest2::SetUp() {} -void DScreenManagerTest::TearDown() {} +void DScreenManagerTest2::TearDown() {} /** * @tc.name: Initialize_001 @@ -35,7 +35,7 @@ void DScreenManagerTest::TearDown() {} * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, Initialize_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, Initialize_001, TestSize.Level1) { sptr dScreenGroupListener_ = new (std::nothrow) DScreenGroupListener(); int32_t ret = DScreenManager::GetInstance().Initialize(); @@ -48,7 +48,7 @@ HWTEST_F(DScreenManagerTest, Initialize_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, Release_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, Release_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().Release(); EXPECT_EQ(DH_SUCCESS, ret); @@ -60,7 +60,7 @@ HWTEST_F(DScreenManagerTest, Release_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, HandleScreenChange_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, HandleScreenChange_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; Rosen::ScreenGroupChangeEvent event = Rosen::ScreenGroupChangeEvent::ADD_TO_GROUP; @@ -89,7 +89,7 @@ HWTEST_F(DScreenManagerTest, HandleScreenChange_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, StartDScreenMirror_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, StartDScreenMirror_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; int32_t ret = DScreenManager::GetInstance().StartDScreenMirror(changedScreen); @@ -110,7 +110,7 @@ HWTEST_F(DScreenManagerTest, StartDScreenMirror_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, StopDScreenMirror_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, StopDScreenMirror_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; int32_t ret = DScreenManager::GetInstance().StopDScreenMirror(changedScreen); @@ -132,7 +132,7 @@ HWTEST_F(DScreenManagerTest, StopDScreenMirror_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, OnRegResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, OnRegResult_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -148,7 +148,7 @@ HWTEST_F(DScreenManagerTest, OnRegResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, OnUnregResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, OnUnregResult_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -164,9 +164,8 @@ HWTEST_F(DScreenManagerTest, OnUnregResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, EnableDistributedScreen_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, EnableDistributedScreen_001, TestSize.Level1) { - std::shared_ptr dScreenCallback = nullptr; int32_t ret = DScreenManager::GetInstance().EnableDistributedScreen("", "", EnableParam{"", ""}, ""); EXPECT_EQ(ERR_DH_SCREEN_SA_ENABLE_FAILED, ret); @@ -174,10 +173,10 @@ HWTEST_F(DScreenManagerTest, EnableDistributedScreen_001, TestSize.Level1) std::string dhId = "dhId000"; EnableParam param = {"2.0", "attrs000"}; std::string reqId = "reqId000"; - ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); - EXPECT_EQ(DH_SUCCESS, ret); - std::shared_ptr dScreen = DScreenManager::GetInstance().FindDScreenById(SCREEN_ID_INVALID); + DScreenManager::GetInstance().dScreenCallback_ = std::make_shared(); + std::shared_ptr dScreenCallback = std::make_shared(); + std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); dScreen->SetState(DScreenState::ENABLED); ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); EXPECT_EQ(DH_SUCCESS, ret); @@ -196,7 +195,7 @@ HWTEST_F(DScreenManagerTest, EnableDistributedScreen_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, DisableDistributedScreen_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, DisableDistributedScreen_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().DisableDistributedScreen("devId111", "dhId111", "reqId111"); EXPECT_EQ(DH_SUCCESS, ret); @@ -211,7 +210,7 @@ HWTEST_F(DScreenManagerTest, DisableDistributedScreen_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, FindDScreenById_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, FindDScreenById_001, TestSize.Level1) { std::shared_ptr dScreen = DScreenManager::GetInstance().FindDScreenById(99); EXPECT_EQ(nullptr, dScreen); @@ -223,7 +222,7 @@ HWTEST_F(DScreenManagerTest, FindDScreenById_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, GetScreenDumpInfo_001, TestSize.Level1) { std::string result; DScreenManager::GetInstance().GetScreenDumpInfo(result); @@ -236,7 +235,7 @@ HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_002, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, GetScreenDumpInfo_002, TestSize.Level1) { std::string result; DScreenManager::GetInstance().GetScreenDumpInfo(result); @@ -249,7 +248,7 @@ HWTEST_F(DScreenManagerTest, GetScreenDumpInfo_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest, PublishMessage_001, TestSize.Level1) +HWTEST_F(DScreenManagerTest2, PublishMessage_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr dScreen = std::make_shared("devId000", "dhId000", dScreenCallback); -- Gitee From d874617be0afd1fa21e1343e4e4b1826e71827ac Mon Sep 17 00:00:00 2001 From: yangli Date: Thu, 20 Jul 2023 10:42:24 +0800 Subject: [PATCH 3/6] 7.19 Signed-off-by: yangli --- .../screenregionmgr/2.0/src/screenregionmgr_test.cpp | 2 +- .../sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h | 2 +- .../sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp index fcd845fd..39979372 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp @@ -40,7 +40,7 @@ void ScreenRegionManagerTest2::TearDown(void) */ HWTEST_F(ScreenRegionManagerTest2, Initialize_001, TestSize.Level1) { - EXPECT_NE(DH_SUCCESS, ScreenRegionManager::GetInstance().Initialize()); + EXPECT_EQ(DH_SUCCESS, ScreenRegionManager::GetInstance().Initialize()); EXPECT_EQ(DH_SUCCESS, ScreenRegionManager::GetInstance().Release()); } diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h index 8431cada..b40c6f42 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V2_0 { -class DScreenManagerTest1 : public testing::Test { +class DScreenManagerTest2 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp index a953b21c..640c83b4 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp @@ -176,7 +176,7 @@ HWTEST_F(DScreenManagerTest2, EnableDistributedScreen_001, TestSize.Level1) DScreenManager::GetInstance().dScreenCallback_ = std::make_shared(); std::shared_ptr dScreenCallback = std::make_shared(); - std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); + std::shared_ptr changedScreen = std::make_shared(devId, dhId, dScreenCallback); dScreen->SetState(DScreenState::ENABLED); ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); EXPECT_EQ(DH_SUCCESS, ret); -- Gitee From 6493cb57551809ba848134939a5a41c415d1ddda Mon Sep 17 00:00:00 2001 From: yangli Date: Thu, 20 Jul 2023 10:43:53 +0800 Subject: [PATCH 4/6] 7.19 Signed-off-by: yangli --- .../sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp index 640c83b4..b472098c 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp @@ -176,7 +176,7 @@ HWTEST_F(DScreenManagerTest2, EnableDistributedScreen_001, TestSize.Level1) DScreenManager::GetInstance().dScreenCallback_ = std::make_shared(); std::shared_ptr dScreenCallback = std::make_shared(); - std::shared_ptr changedScreen = std::make_shared(devId, dhId, dScreenCallback); + std::shared_ptr dScreen = std::make_shared(devId, dhId, dScreenCallback); dScreen->SetState(DScreenState::ENABLED); ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); EXPECT_EQ(DH_SUCCESS, ret); -- Gitee From 3052050e544bb8765106277ccdf0aa435984f646 Mon Sep 17 00:00:00 2001 From: yangli Date: Thu, 20 Jul 2023 14:40:18 +0800 Subject: [PATCH 5/6] 7.19 Signed-off-by: yangli --- .../screenregionmgr/2.0/src/screenregionmgr_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp index 39979372..92ebc8fc 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp @@ -52,7 +52,7 @@ HWTEST_F(ScreenRegionManagerTest2, Initialize_001, TestSize.Level1) */ HWTEST_F(ScreenRegionManagerTest2, CreateDScreenRegion_001, TestSize.Level1) { - std::string peerDevId = "peerDevId"; + std::string peerDevId = "peerDevId"; int32_t ret =ScreenRegionManager::GetInstance().CreateDScreenRegion(peerDevId); EXPECT_EQ(DH_SUCCESS, ret); } @@ -65,7 +65,7 @@ HWTEST_F(ScreenRegionManagerTest2, CreateDScreenRegion_001, TestSize.Level1) */ HWTEST_F(ScreenRegionManagerTest2, DestoryDScreenRegion_001, TestSize.Level1) { - std::string peerDevId = "peerDevId"; + std::string peerDevId = "peerDevId"; int32_t ret =ScreenRegionManager::GetInstance().DestoryDScreenRegion(peerDevId); EXPECT_EQ(DH_SUCCESS, ret); } -- Gitee From 9942e3f3355f263e716fdd9a0b486c71d161815e Mon Sep 17 00:00:00 2001 From: yangli Date: Thu, 20 Jul 2023 20:37:50 +0800 Subject: [PATCH 6/6] 0720 Signed-off-by: yangli --- .../1.0/include/screenregion_test.h | 2 +- .../1.0/include/screenregionmgr_test.h | 2 +- .../1.0/src/screenregion_test.cpp | 42 +++++++++--------- .../1.0/src/screenregionmgr_test.cpp | 24 +++++----- .../2.0/include/screenregionmgr_test.h | 2 +- .../2.0/src/screenregionmgr_test.cpp | 20 ++++----- .../1.0/include/dscreen_manager_test.h | 2 +- .../dscreenmgr/1.0/include/dscreen_test.h | 2 +- .../1.0/src/dscreen_manager_test.cpp | 40 ++++++++--------- .../dscreenmgr/1.0/src/dscreen_test.cpp | 44 +++++++++---------- .../2.0/include/dscreen_manager_test.h | 2 +- .../2.0/src/dscreen_manager_test.cpp | 34 +++++++------- 12 files changed, 108 insertions(+), 108 deletions(-) diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h index 0c9834b5..ab55fff9 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h @@ -28,7 +28,7 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { -class ScreenRegionTest1 : public testing::Test { +class ScreenRegionTestV1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h index 17ebd34b..32e8b6cf 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { -class ScreenRegionManagerTest1 : public testing::Test { +class ScreenRegionManagerTestV1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); 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 fc22125c..0cca9bb1 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 @@ -22,11 +22,11 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V1_0 { -void ScreenRegionTest1::SetUpTestCase(void) {} +void ScreenRegionTestV1::SetUpTestCase(void) {} -void ScreenRegionTest1::TearDownTestCase(void) {} +void ScreenRegionTestV1::TearDownTestCase(void) {} -void ScreenRegionTest1::SetUp(void) +void ScreenRegionTestV1::SetUp(void) { const std::string remoteDevId = "sourceDevId"; uint64_t screenId = 0; @@ -34,7 +34,7 @@ void ScreenRegionTest1::SetUp(void) screenRegion_ = std::make_shared(remoteDevId, screenId, displayId); } -void ScreenRegionTest1::TearDown(void) {} +void ScreenRegionTestV1::TearDown(void) {} /** * @tc.name: OnTransError_001 @@ -42,10 +42,10 @@ void ScreenRegionTest1::TearDown(void) {} * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, OnTransError_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, OnTransError_001, TestSize.Level1) { int32_t err = 0; - const std::string content = "ScreenRegionTest1"; + const std::string content = "ScreenRegionTestV1"; screenRegion_->OnTransError(err, content); EXPECT_EQ(false, screenRegion_->isRunning); } @@ -56,7 +56,7 @@ HWTEST_F(ScreenRegionTest1, OnTransError_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, SetMapRelation_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, SetMapRelation_001, TestSize.Level1) { std::shared_ptr mapRelation = std::make_shared(); screenRegion_->SetMapRelation(mapRelation); @@ -69,7 +69,7 @@ HWTEST_F(ScreenRegionTest1, SetMapRelation_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, GetScreenId_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, GetScreenId_001, TestSize.Level1) { screenRegion_->screenId_ = 5; uint64_t ret = screenRegion_->GetScreenId(); @@ -82,7 +82,7 @@ HWTEST_F(ScreenRegionTest1, GetScreenId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, GetDisplayId_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, GetDisplayId_001, TestSize.Level1) { screenRegion_->displayId_ = 5; uint64_t ret = screenRegion_->GetDisplayId(); @@ -95,7 +95,7 @@ HWTEST_F(ScreenRegionTest1, GetDisplayId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, GetRemoteDevId_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, GetRemoteDevId_001, TestSize.Level1) { screenRegion_->remoteDevId_ = "remoteDevId"; std::string ret = screenRegion_->GetRemoteDevId(); @@ -108,7 +108,7 @@ HWTEST_F(ScreenRegionTest1, GetRemoteDevId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, GetWindowId_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, GetWindowId_001, TestSize.Level1) { screenRegion_->windowId_ = 5; int32_t ret = screenRegion_->GetWindowId(); @@ -121,7 +121,7 @@ HWTEST_F(ScreenRegionTest1, GetWindowId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, GetVideoParam_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, GetVideoParam_001, TestSize.Level1) { screenRegion_->videoParam_ = std::make_shared(); std::shared_ptr ret = screenRegion_->GetVideoParam(); @@ -134,7 +134,7 @@ HWTEST_F(ScreenRegionTest1, GetVideoParam_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, GetWindowProperty_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, GetWindowProperty_001, TestSize.Level1) { screenRegion_->windowProperty_ = std::make_shared(); std::shared_ptr ret = screenRegion_->GetWindowProperty(); @@ -147,7 +147,7 @@ HWTEST_F(ScreenRegionTest1, GetWindowProperty_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, SetUpWindow_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, SetUpWindow_001, TestSize.Level1) { screenRegion_->mapRelation_ = nullptr; int32_t ret = screenRegion_->SetUpWindow(); @@ -160,7 +160,7 @@ HWTEST_F(ScreenRegionTest1, SetUpWindow_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, SetUp_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, SetUp_001, TestSize.Level1) { screenRegion_->mapRelation_ = std::make_shared(); ScreenRect screenRect; @@ -190,7 +190,7 @@ HWTEST_F(ScreenRegionTest1, SetUp_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, SetUp_002, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, SetUp_002, TestSize.Level1) { screenRegion_->mapRelation_ = nullptr; std::string version = "1.0"; @@ -205,7 +205,7 @@ HWTEST_F(ScreenRegionTest1, SetUp_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, Start_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, Start_001, TestSize.Level1) { int32_t ret = screenRegion_->Start(); @@ -218,7 +218,7 @@ HWTEST_F(ScreenRegionTest1, Start_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, Start_002, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, Start_002, TestSize.Level1) { screenRegion_->sinkTrans_ = std::make_shared(); int32_t ret = screenRegion_->Start(); @@ -232,7 +232,7 @@ HWTEST_F(ScreenRegionTest1, Start_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, Stop_001, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, Stop_001, TestSize.Level1) { screenRegion_->isRunning = false; int32_t ret = screenRegion_->Stop(); @@ -246,7 +246,7 @@ HWTEST_F(ScreenRegionTest1, Stop_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, Stop_002, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, Stop_002, TestSize.Level1) { screenRegion_->isRunning = true; int32_t ret = screenRegion_->Stop(); @@ -260,7 +260,7 @@ HWTEST_F(ScreenRegionTest1, Stop_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionTest1, Stop_003, TestSize.Level1) +HWTEST_F(ScreenRegionTestV1, Stop_003, TestSize.Level1) { screenRegion_->isRunning = true; screenRegion_->sinkTrans_ = std::make_shared(); diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp index 61427d59..50936edc 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp @@ -21,13 +21,13 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V1_0 { -void ScreenRegionManagerTest1::SetUpTestCase(void) {} +void ScreenRegionManagerTestV1::SetUpTestCase(void) {} -void ScreenRegionManagerTest1::TearDownTestCase(void) {} +void ScreenRegionManagerTestV1::TearDownTestCase(void) {} -void ScreenRegionManagerTest1::SetUp(void) {} +void ScreenRegionManagerTestV1::SetUp(void) {} -void ScreenRegionManagerTest1::TearDown(void) +void ScreenRegionManagerTestV1::TearDown(void) { sleep(1); } @@ -38,7 +38,7 @@ void ScreenRegionManagerTest1::TearDown(void) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV1, ReleaseAllRegions_001, TestSize.Level1) { const std::string remoteDevId = "sourceDevId"; uint64_t screenId = 0; @@ -56,7 +56,7 @@ HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_002, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV1, ReleaseAllRegions_002, TestSize.Level1) { const std::string remoteDevId = "sourceDevId"; std::shared_ptr screenRegion = nullptr; @@ -72,7 +72,7 @@ HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_003, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV1, ReleaseAllRegions_003, TestSize.Level1) { std::string remoteDevId = "sourceDevId"; int32_t eventCode = 100; @@ -113,7 +113,7 @@ HWTEST_F(ScreenRegionManagerTest1, ReleaseAllRegions_003, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest1, NotifyRemoteScreenService_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV1, NotifyRemoteScreenService_001, TestSize.Level1) { const std::string remoteDevId = "sourceDevId"; const std::string dhId = "sinkDhId"; @@ -131,7 +131,7 @@ HWTEST_F(ScreenRegionManagerTest1, NotifyRemoteScreenService_001, TestSize.Level * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV1, HandleNotifySetUp_001, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; @@ -152,7 +152,7 @@ HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_002, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV1, HandleNotifySetUp_002, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; @@ -172,7 +172,7 @@ HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_003, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV1, HandleNotifySetUp_003, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; @@ -193,7 +193,7 @@ HWTEST_F(ScreenRegionManagerTest1, HandleNotifySetUp_003, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest1, GetDScreenSourceSA_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV1, GetDScreenSourceSA_001, TestSize.Level1) { const std::string remoteDevId = "sourceDevId"; sptr ret = ScreenRegionManager::GetInstance().GetDScreenSourceSA(remoteDevId); diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h index e6707ca2..d93f73ef 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/screenregionmgr_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V2_0 { -class ScreenRegionManagerTest2 : public testing::Test { +class ScreenRegionManagerTestV2 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp index 92ebc8fc..9ebb32db 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregionmgr_test.cpp @@ -21,13 +21,13 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V2_0 { -void ScreenRegionManagerTest2::SetUpTestCase(void) {} +void ScreenRegionManagerTestV2::SetUpTestCase(void) {} -void ScreenRegionManagerTest2::TearDownTestCase(void) {} +void ScreenRegionManagerTestV2::TearDownTestCase(void) {} -void ScreenRegionManagerTest2::SetUp(void) {} +void ScreenRegionManagerTestV2::SetUp(void) {} -void ScreenRegionManagerTest2::TearDown(void) +void ScreenRegionManagerTestV2::TearDown(void) { sleep(1); } @@ -38,7 +38,7 @@ void ScreenRegionManagerTest2::TearDown(void) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest2, Initialize_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV2, Initialize_001, TestSize.Level1) { EXPECT_EQ(DH_SUCCESS, ScreenRegionManager::GetInstance().Initialize()); EXPECT_EQ(DH_SUCCESS, ScreenRegionManager::GetInstance().Release()); @@ -50,7 +50,7 @@ HWTEST_F(ScreenRegionManagerTest2, Initialize_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest2, CreateDScreenRegion_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV2, CreateDScreenRegion_001, TestSize.Level1) { std::string peerDevId = "peerDevId"; int32_t ret =ScreenRegionManager::GetInstance().CreateDScreenRegion(peerDevId); @@ -63,7 +63,7 @@ HWTEST_F(ScreenRegionManagerTest2, CreateDScreenRegion_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest2, DestoryDScreenRegion_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV2, DestoryDScreenRegion_001, TestSize.Level1) { std::string peerDevId = "peerDevId"; int32_t ret =ScreenRegionManager::GetInstance().DestoryDScreenRegion(peerDevId); @@ -76,7 +76,7 @@ HWTEST_F(ScreenRegionManagerTest2, DestoryDScreenRegion_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest2, GetScreenDumpInfo_001, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV2, GetScreenDumpInfo_001, TestSize.Level1) { std::string result; ScreenRegionManager::GetInstance().GetScreenDumpInfo(result); @@ -89,7 +89,7 @@ HWTEST_F(ScreenRegionManagerTest2, GetScreenDumpInfo_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest2, GetScreenDumpInfo_002, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV2, GetScreenDumpInfo_002, TestSize.Level1) { std::string result; ScreenRegionManager::GetInstance().GetScreenDumpInfo(result); @@ -102,7 +102,7 @@ HWTEST_F(ScreenRegionManagerTest2, GetScreenDumpInfo_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenRegionManagerTest2, OnProviderEvent_002, TestSize.Level1) +HWTEST_F(ScreenRegionManagerTestV2, OnProviderEvent_002, TestSize.Level1) { AVTransEvent event; EngineProviderListener engineProviderListener; diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h index b18a530a..679bc085 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { -class DScreenManagerTest1 : public testing::Test { +class DScreenManagerTestV1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h index 3e2a6ef8..22fd20c9 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h @@ -25,7 +25,7 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { -class DScreenTest1 : public testing::Test { +class DScreenTestV1 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp index 448f7644..cd81d971 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp @@ -21,13 +21,13 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V1_0 { -void DScreenManagerTest1::SetUpTestCase(void) {} +void DScreenManagerTestV1::SetUpTestCase(void) {} -void DScreenManagerTest1::TearDownTestCase(void) {} +void DScreenManagerTestV1::TearDownTestCase(void) {} -void DScreenManagerTest1::SetUp() {} +void DScreenManagerTestV1::SetUp() {} -void DScreenManagerTest1::TearDown() {} +void DScreenManagerTestV1::TearDown() {} /** * @tc.name: Init_001 @@ -35,7 +35,7 @@ void DScreenManagerTest1::TearDown() {} * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, Init_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, Init_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().Init(); EXPECT_EQ(DH_SUCCESS, ret); @@ -47,7 +47,7 @@ HWTEST_F(DScreenManagerTest1, Init_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, HandleScreenChange_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, HandleScreenChange_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; Rosen::ScreenGroupChangeEvent event = Rosen::ScreenGroupChangeEvent::ADD_TO_GROUP; @@ -76,7 +76,7 @@ HWTEST_F(DScreenManagerTest1, HandleScreenChange_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, AddToGroup_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, AddToGroup_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; int32_t ret = DScreenManager::GetInstance().AddToGroup(changedScreen, 0); @@ -98,7 +98,7 @@ HWTEST_F(DScreenManagerTest1, AddToGroup_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, RemoveFromGroup_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, RemoveFromGroup_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; int32_t ret = DScreenManager::GetInstance().RemoveFromGroup(changedScreen, 0); @@ -120,7 +120,7 @@ HWTEST_F(DScreenManagerTest1, RemoveFromGroup_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, OnRegResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, OnRegResult_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -136,7 +136,7 @@ HWTEST_F(DScreenManagerTest1, OnRegResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, OnUnregResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, OnUnregResult_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -152,7 +152,7 @@ HWTEST_F(DScreenManagerTest1, OnUnregResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, GetScreenDumpInfo_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, GetScreenDumpInfo_001, TestSize.Level1) { std::string result; DScreenManager::GetInstance().GetScreenDumpInfo(result); @@ -165,7 +165,7 @@ HWTEST_F(DScreenManagerTest1, GetScreenDumpInfo_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, EnableDistributedScreen_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, EnableDistributedScreen_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().UnInit(); EXPECT_EQ(DH_SUCCESS, ret); @@ -199,7 +199,7 @@ HWTEST_F(DScreenManagerTest1, EnableDistributedScreen_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, FindDScreenByScreenId_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, FindDScreenByScreenId_001, TestSize.Level1) { std::shared_ptr dScreen = DScreenManager::GetInstance().FindDScreenByScreenId(99); EXPECT_EQ(nullptr, dScreen); @@ -211,7 +211,7 @@ HWTEST_F(DScreenManagerTest1, FindDScreenByScreenId_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, GetScreenDumpInfo_002, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, GetScreenDumpInfo_002, TestSize.Level1) { std::string result; DScreenManager::GetInstance().GetScreenDumpInfo(result); @@ -224,7 +224,7 @@ HWTEST_F(DScreenManagerTest1, GetScreenDumpInfo_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, HandleDScreenNotify_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, HandleDScreenNotify_001, TestSize.Level1) { std::string devId = "devId111"; int32_t eventCode = -1; @@ -244,7 +244,7 @@ HWTEST_F(DScreenManagerTest1, HandleDScreenNotify_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, NotifyRemoteScreenService_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, NotifyRemoteScreenService_001, TestSize.Level1) { std::string devId = "devId111"; int32_t eventCode = NOTIFY_SOURCE_SETUP_RESULT; @@ -259,7 +259,7 @@ HWTEST_F(DScreenManagerTest1, NotifyRemoteScreenService_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, PublishMessage_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, PublishMessage_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr dScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -279,7 +279,7 @@ HWTEST_F(DScreenManagerTest1, PublishMessage_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, NotifyRemoteSinkSetUp_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, NotifyRemoteSinkSetUp_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr dScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -295,7 +295,7 @@ HWTEST_F(DScreenManagerTest1, NotifyRemoteSinkSetUp_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, HandleNotifySetUpResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, HandleNotifySetUpResult_001, TestSize.Level1) { DScreenManager::GetInstance().HandleNotifySetUpResult("remoteDevId", "eventContent"); @@ -324,7 +324,7 @@ HWTEST_F(DScreenManagerTest1, HandleNotifySetUpResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest1, DisableDistributedScreen_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV1, DisableDistributedScreen_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().DisableDistributedScreen("devId111", "dhId111", "reqId111"); EXPECT_EQ(DH_SUCCESS, ret); 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 83be49dc..f12447fa 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 @@ -32,11 +32,11 @@ namespace OHOS { namespace DistributedHardware { namespace V1_0 { constexpr static int32_t videoDataNum = 100; -void DScreenTest1::SetUpTestCase(void) {} +void DScreenTestV1::SetUpTestCase(void) {} -void DScreenTest1::TearDownTestCase(void) {} +void DScreenTestV1::TearDownTestCase(void) {} -void DScreenTest1::SetUp(void) +void DScreenTestV1::SetUp(void) { std::string devId = "devId"; std::string dhId = "dhId"; @@ -53,7 +53,7 @@ void DScreenTest1::SetUp(void) dScreen_->devId_ = "peerDevId"; } -void DScreenTest1::TearDown(void) {} +void DScreenTestV1::TearDown(void) {} /** * @tc.name: AddTask_001 @@ -61,7 +61,7 @@ void DScreenTest1::TearDown(void) {} * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, AddTask_001, TestSize.Level1) +HWTEST_F(DScreenTestV1, AddTask_001, TestSize.Level1) { int32_t err = 0; std::string content = "content"; @@ -91,7 +91,7 @@ HWTEST_F(DScreenTest1, AddTask_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, AddTask_002, TestSize.Level1) +HWTEST_F(DScreenTestV1, AddTask_002, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -112,7 +112,7 @@ HWTEST_F(DScreenTest1, AddTask_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, HandleEnable_001, TestSize.Level1) +HWTEST_F(DScreenTestV1, HandleEnable_001, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -131,7 +131,7 @@ HWTEST_F(DScreenTest1, HandleEnable_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, HandleEnable_002, TestSize.Level1) +HWTEST_F(DScreenTestV1, HandleEnable_002, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -152,7 +152,7 @@ HWTEST_F(DScreenTest1, HandleEnable_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, HandleEnable_003, TestSize.Level1) +HWTEST_F(DScreenTestV1, HandleEnable_003, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -172,7 +172,7 @@ HWTEST_F(DScreenTest1, HandleEnable_003, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, HandleEnable_004, TestSize.Level1) +HWTEST_F(DScreenTestV1, HandleEnable_004, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -192,7 +192,7 @@ HWTEST_F(DScreenTest1, HandleEnable_004, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, HandleEnable_005, TestSize.Level1) +HWTEST_F(DScreenTestV1, HandleEnable_005, TestSize.Level1) { std::string reqId = "reqId"; std::string attrs = "attrs"; @@ -216,7 +216,7 @@ HWTEST_F(DScreenTest1, HandleEnable_005, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, CheckJsonData_001, TestSize.Level1) +HWTEST_F(DScreenTestV1, CheckJsonData_001, TestSize.Level1) { json attrJson; @@ -244,7 +244,7 @@ HWTEST_F(DScreenTest1, CheckJsonData_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, CheckJsonData_002, TestSize.Level1) +HWTEST_F(DScreenTestV1, CheckJsonData_002, TestSize.Level1) { json attrJson; attrJson["dhid"] = "dhid"; @@ -264,7 +264,7 @@ HWTEST_F(DScreenTest1, CheckJsonData_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, CheckJsonData_003, TestSize.Level1) +HWTEST_F(DScreenTestV1, CheckJsonData_003, TestSize.Level1) { json attrJson; uint32_t width = 100; @@ -292,7 +292,7 @@ HWTEST_F(DScreenTest1, CheckJsonData_003, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, NegotiateCodecType_001, TestSize.Level1) +HWTEST_F(DScreenTestV1, NegotiateCodecType_001, TestSize.Level1) { std::string remoteCodecInfoStr = "remoteCodecInfoStr"; int32_t ret = dScreen_->NegotiateCodecType(remoteCodecInfoStr); @@ -305,7 +305,7 @@ HWTEST_F(DScreenTest1, NegotiateCodecType_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, NegotiateCodecType_002, TestSize.Level1) +HWTEST_F(DScreenTestV1, NegotiateCodecType_002, TestSize.Level1) { std::string remoteCodecInfoStr = "{\"codecType\":\"[\"OMX_rk_video_encoder_avc\", \"OMX_rk_video_encoder_hevc\", \ \"avenc_mpeg4\"]\"}"; @@ -319,7 +319,7 @@ HWTEST_F(DScreenTest1, NegotiateCodecType_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, SetUp_001, TestSize.Level1) +HWTEST_F(DScreenTestV1, SetUp_001, TestSize.Level1) { dScreen_->sourceTrans_ = nullptr; dScreen_->videoParam_ = std::make_shared(); @@ -340,7 +340,7 @@ HWTEST_F(DScreenTest1, SetUp_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, SetUp_002, TestSize.Level1) +HWTEST_F(DScreenTestV1, SetUp_002, TestSize.Level1) { dScreen_->sourceTrans_ = std::make_shared(); dScreen_->videoParam_ = std::make_shared(); @@ -361,7 +361,7 @@ HWTEST_F(DScreenTest1, SetUp_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, Start_001, TestSize.Level1) +HWTEST_F(DScreenTestV1, Start_001, TestSize.Level1) { dScreen_->sourceTrans_ = nullptr; int32_t ret = dScreen_->Start(); @@ -374,7 +374,7 @@ HWTEST_F(DScreenTest1, Start_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, Start_002, TestSize.Level1) +HWTEST_F(DScreenTestV1, Start_002, TestSize.Level1) { dScreen_->sourceTrans_ = std::make_shared(); int32_t ret = dScreen_->Start(); @@ -387,7 +387,7 @@ HWTEST_F(DScreenTest1, Start_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, Stop_001, TestSize.Level1) +HWTEST_F(DScreenTestV1, Stop_001, TestSize.Level1) { dScreen_->sourceTrans_ = nullptr; int32_t ret = dScreen_->Stop(); @@ -400,7 +400,7 @@ HWTEST_F(DScreenTest1, Stop_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenTest1, Stop_002, TestSize.Level1) +HWTEST_F(DScreenTestV1, Stop_002, TestSize.Level1) { dScreen_->sourceTrans_ = std::make_shared(); int32_t ret = dScreen_->Stop(); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h index b40c6f42..05352b3b 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/dscreen_manager_test.h @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { namespace V2_0 { -class DScreenManagerTest2 : public testing::Test { +class DScreenManagerTestV2 : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp index b472098c..780f30bc 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp @@ -21,13 +21,13 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V2_0 { -void DScreenManagerTest2::SetUpTestCase(void) {} +void DScreenManagerTestV2::SetUpTestCase(void) {} -void DScreenManagerTest2::TearDownTestCase(void) {} +void DScreenManagerTestV2::TearDownTestCase(void) {} -void DScreenManagerTest2::SetUp() {} +void DScreenManagerTestV2::SetUp() {} -void DScreenManagerTest2::TearDown() {} +void DScreenManagerTestV2::TearDown() {} /** * @tc.name: Initialize_001 @@ -35,7 +35,7 @@ void DScreenManagerTest2::TearDown() {} * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, Initialize_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, Initialize_001, TestSize.Level1) { sptr dScreenGroupListener_ = new (std::nothrow) DScreenGroupListener(); int32_t ret = DScreenManager::GetInstance().Initialize(); @@ -48,7 +48,7 @@ HWTEST_F(DScreenManagerTest2, Initialize_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, Release_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, Release_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().Release(); EXPECT_EQ(DH_SUCCESS, ret); @@ -60,7 +60,7 @@ HWTEST_F(DScreenManagerTest2, Release_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, HandleScreenChange_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, HandleScreenChange_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; Rosen::ScreenGroupChangeEvent event = Rosen::ScreenGroupChangeEvent::ADD_TO_GROUP; @@ -89,7 +89,7 @@ HWTEST_F(DScreenManagerTest2, HandleScreenChange_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, StartDScreenMirror_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, StartDScreenMirror_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; int32_t ret = DScreenManager::GetInstance().StartDScreenMirror(changedScreen); @@ -110,7 +110,7 @@ HWTEST_F(DScreenManagerTest2, StartDScreenMirror_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, StopDScreenMirror_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, StopDScreenMirror_001, TestSize.Level1) { std::shared_ptr changedScreen = nullptr; int32_t ret = DScreenManager::GetInstance().StopDScreenMirror(changedScreen); @@ -132,7 +132,7 @@ HWTEST_F(DScreenManagerTest2, StopDScreenMirror_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, OnRegResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, OnRegResult_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -148,7 +148,7 @@ HWTEST_F(DScreenManagerTest2, OnRegResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, OnUnregResult_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, OnUnregResult_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr changedScreen = std::make_shared("devId000", "dhId000", dScreenCallback); @@ -164,7 +164,7 @@ HWTEST_F(DScreenManagerTest2, OnUnregResult_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, EnableDistributedScreen_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, EnableDistributedScreen_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().EnableDistributedScreen("", "", EnableParam{"", ""}, ""); EXPECT_EQ(ERR_DH_SCREEN_SA_ENABLE_FAILED, ret); @@ -195,7 +195,7 @@ HWTEST_F(DScreenManagerTest2, EnableDistributedScreen_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, DisableDistributedScreen_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, DisableDistributedScreen_001, TestSize.Level1) { int32_t ret = DScreenManager::GetInstance().DisableDistributedScreen("devId111", "dhId111", "reqId111"); EXPECT_EQ(DH_SUCCESS, ret); @@ -210,7 +210,7 @@ HWTEST_F(DScreenManagerTest2, DisableDistributedScreen_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, FindDScreenById_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, FindDScreenById_001, TestSize.Level1) { std::shared_ptr dScreen = DScreenManager::GetInstance().FindDScreenById(99); EXPECT_EQ(nullptr, dScreen); @@ -222,7 +222,7 @@ HWTEST_F(DScreenManagerTest2, FindDScreenById_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, GetScreenDumpInfo_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, GetScreenDumpInfo_001, TestSize.Level1) { std::string result; DScreenManager::GetInstance().GetScreenDumpInfo(result); @@ -235,7 +235,7 @@ HWTEST_F(DScreenManagerTest2, GetScreenDumpInfo_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, GetScreenDumpInfo_002, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, GetScreenDumpInfo_002, TestSize.Level1) { std::string result; DScreenManager::GetInstance().GetScreenDumpInfo(result); @@ -248,7 +248,7 @@ HWTEST_F(DScreenManagerTest2, GetScreenDumpInfo_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(DScreenManagerTest2, PublishMessage_001, TestSize.Level1) +HWTEST_F(DScreenManagerTestV2, PublishMessage_001, TestSize.Level1) { std::shared_ptr dScreenCallback = std::make_shared(); std::shared_ptr dScreen = std::make_shared("devId000", "dhId000", dScreenCallback); -- Gitee