diff --git a/bundle.json b/bundle.json index c89001c4d7aafd1795574fcb81772b4c54460a96..1c71c17f11abf3157a1680f959d36d4a0098be32 100644 --- a/bundle.json +++ b/bundle.json @@ -79,9 +79,8 @@ "test":[ "//foundation/distributedhardware/distributedscreen/services/screentransport/test/unittest:screen_transport_test", "//foundation/distributedhardware/distributedscreen/services/softbusadapter/test/unittest:SoftBusAdapterTest", - "//foundation/distributedhardware/distributedscreen/services/screenclient/test/unittest:screen_client_test", "//foundation/distributedhardware/distributedscreen/services/common/test/unittest:service_common_test" ] } } -} \ No newline at end of file +} diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn deleted file mode 100644 index 4993b5ff906bf64a62127a2b724791788a45a9f4..0000000000000000000000000000000000000000 --- a/services/screenclient/test/unittest/BUILD.gn +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright (c) 2022 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. - -import("//build/test.gni") -import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") - -module_out_path = "distributed_screen/screen_client_test" - -config("module_private_config") { - visibility = [ ":*" ] - - include_dirs = [ - "${windowmanager_path}/interfaces/innerkits/wm", - "${graphicstandard_path}/interfaces/innerkits/surface", - "${graphicstandard_path}/rosen/modules/render_service_client/core/ui", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - ] - - include_dirs += [ - "include", - "${common_path}/include", - "${services_path}/screenclient/include", - "${services_path}/screenclient/test/unittest/include", - ] -} - -## UnitTest screen_client_test -ohos_unittest("ScreenClientTest") { - module_out_path = module_out_path - - sources = [ - "${services_path}/screenclient/test/unittest/src/screen_client_test.cpp", - "${services_path}/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp", - ] - - configs = [ ":module_private_config" ] - - deps = [ - "${fwk_utils_path}:distributedhardwareutils", - "${graphicstandard_path}/frameworks/surface:surface", - "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", - "${windowmanager_path}/wm:libwm", - "//foundation/distributedhardware/distributedscreen/services/screenclient:distributed_screen_client", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "input:libmmi-client", - ] -} - -group("screen_client_test") { - testonly = true - deps = [ ":ScreenClientTest" ] -} diff --git a/services/screenclient/test/unittest/include/screen_client_test.h b/services/screenclient/test/unittest/include/screen_client_test.h deleted file mode 100644 index 465c22dbdc6f40c108a5dcb5a675eb2c33197219..0000000000000000000000000000000000000000 --- a/services/screenclient/test/unittest/include/screen_client_test.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2022 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_CLIENT_TEST_H -#define OHOS_SCREEN_CLIENT_TEST_H - -#include - -#include "dscreen_errcode.h" -#include "dscreen_log.h" -#include "screen_client.h" -#include "screen_client_window_adapter.h" - -namespace OHOS { -namespace DistributedHardware { -class ScreenClientTest : public testing::Test { -public: - static void SetUpTestCase(void); - static void TearDownTestCase(void); - void SetUp(); - void TearDown(); -}; -} // namespace DistributedHardware -} // namespace OHOS -#endif \ No newline at end of file diff --git a/services/screenclient/test/unittest/include/screen_client_window_adapter_test.h b/services/screenclient/test/unittest/include/screen_client_window_adapter_test.h deleted file mode 100644 index 68467e77427a19918a5d95aaec89d95cbfdc1f7f..0000000000000000000000000000000000000000 --- a/services/screenclient/test/unittest/include/screen_client_window_adapter_test.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 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_CLIENT_WINDOW_ADAPTER_TEST_H -#define OHOS_SCREEN_CLIENT_WINDOW_ADAPTER_TEST_H - -#include - -#include "rs_surface_node.h" -#include "window_option.h" -#include "wm_common.h" - -#include "dscreen_constants.h" -#include "dscreen_errcode.h" -#include "dscreen_log.h" -#include "screen_client_window_adapter.h" - -namespace OHOS { -namespace DistributedHardware { -class ScreenClientWindowAdapterTest : public testing::Test { -public: - static void SetUpTestCase(void); - static void TearDownTestCase(void); - void SetUp(); - void TearDown(); -}; -} // namespace DistributedHardware -} // namespace OHOS -#endif \ No newline at end of file diff --git a/services/screenclient/test/unittest/src/screen_client_test.cpp b/services/screenclient/test/unittest/src/screen_client_test.cpp deleted file mode 100644 index 859df30d566dc2e139d8e37345c404c1fca58355..0000000000000000000000000000000000000000 --- a/services/screenclient/test/unittest/src/screen_client_test.cpp +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (c) 2022 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. - */ - -#define private public -#include "screen_client_test.h" -#undef private - -using namespace testing::ext; - -namespace OHOS { -namespace DistributedHardware { -void ScreenClientTest::SetUpTestCase(void) {} - -void ScreenClientTest::TearDownTestCase(void) {} - -void ScreenClientTest::SetUp() {} - -void ScreenClientTest::TearDown() {} - -/** - * @tc.name: ShowWindow_001 - * @tc.desc: Verify the ShowWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, ShowWindow_001, TestSize.Level1) -{ - int32_t windowId = 0; - int32_t actual = ScreenClient::GetInstance().ShowWindow(windowId); - EXPECT_EQ(ERR_DH_SCREEN_SCREENCLIENT_SHOW_WINDOW_ERROR, actual); -} - -/** - * @tc.name: ShowWindow_002 - * @tc.desc: Verify the ShowWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, ShowWindow_002, TestSize.Level1) -{ - std::shared_ptr windowProperty = std::make_shared(); - ScreenClient::GetInstance().windowId_ = 0; - int32_t windowId = ScreenClient::GetInstance().AddWindow(windowProperty); - int32_t actual = ScreenClient::GetInstance().ShowWindow(windowId); - EXPECT_EQ(DH_SUCCESS, actual); -} - -/** - * @tc.name: AddWindow_001 - * @tc.desc: Verify the AddWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, AddWindow_001, TestSize.Level1) -{ - std::shared_ptr windowProperty = nullptr; - int32_t actual = ScreenClient::GetInstance().AddWindow(windowProperty); - EXPECT_EQ(ERR_DH_SCREEN_SCREENCLIENT_ADD_WINDOW_ERROR, actual); -} - -/** - * @tc.name: AddWindow_002 - * @tc.desc: Verify the AddWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, AddWindow_002, TestSize.Level1) -{ - std::shared_ptr windowProperty = std::make_shared(); - ScreenClient::GetInstance().windowId_ = 2; - int32_t actual = ScreenClient::GetInstance().AddWindow(windowProperty); - EXPECT_EQ(3, actual); -} - -/** - * @tc.name: MoveWindow_001 - * @tc.desc: Verify the MoveWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, MoveWindow_001, TestSize.Level1) -{ - int32_t windowId = 0; - int32_t startX = 0; - int32_t startY = 0; - int32_t actual = ScreenClient::GetInstance().MoveWindow(windowId, startX, startY); - EXPECT_EQ(ERR_DH_SCREEN_SCREENCLIENT_MOVE_WINDOW_ERROR, actual); -} - -/** - * @tc.name: MoveWindow_002 - * @tc.desc: Verify the MoveWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, MoveWindow_002, TestSize.Level1) -{ - int32_t windowId = 1; - int32_t startX = 0; - int32_t startY = 0; - int32_t actual = ScreenClient::GetInstance().MoveWindow(windowId, startX, startY); - EXPECT_EQ(DH_SUCCESS, actual); -} - -/** - * @tc.name: RemoveWindow_001 - * @tc.desc: Verify the RemoveWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, RemoveWindow_001, TestSize.Level1) -{ - int32_t windowId = 0; - int32_t actual = ScreenClient::GetInstance().RemoveWindow(windowId); - EXPECT_EQ(ERR_DH_SCREEN_SCREENCLIENT_REMOVE_WINDOW_ERROR, actual); -} - -/** - * @tc.name: RemoveWindow_002 - * @tc.desc: Verify the RemoveWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, RemoveWindow_002, TestSize.Level1) -{ - int32_t windowId = 1; - int32_t actual = ScreenClient::GetInstance().RemoveWindow(windowId); - EXPECT_EQ(DH_SUCCESS, actual); -} - -/** - * @tc.name: GetSurface_001 - * @tc.desc: Verify the GetSurface function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, GetSurface_001, TestSize.Level1) -{ - int32_t windowId = 0; - sptr actualSurface = ScreenClient::GetInstance().GetSurface(windowId); - EXPECT_EQ(nullptr, actualSurface); -} - -/** - * @tc.name: GetSurface_002 - * @tc.desc: Verify the GetSurface function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientTest, GetSurface_002, TestSize.Level1) -{ - std::shared_ptr windowProperty = std::make_shared(); - ScreenClient::GetInstance().windowId_ = 0; - int32_t windowId = ScreenClient::GetInstance().AddWindow(windowProperty); - sptr actualSurface = ScreenClient::GetInstance().GetSurface(windowId); - EXPECT_NE(nullptr, actualSurface); -} -} -} \ No newline at end of file diff --git a/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp b/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp deleted file mode 100644 index 464b9dd87debe4b4c72cc7f1d7cb8dacc4cb46cf..0000000000000000000000000000000000000000 --- a/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (c) 2022 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. - */ - -#define private public -#include "screen_client_window_adapter_test.h" -#undef private - -using namespace testing::ext; - -namespace OHOS { -namespace DistributedHardware { -void ScreenClientWindowAdapterTest::SetUpTestCase(void) {} - -void ScreenClientWindowAdapterTest::TearDownTestCase(void) {} - -void ScreenClientWindowAdapterTest::SetUp() {} - -void ScreenClientWindowAdapterTest::TearDown() {} - -/** - * @tc.name: CreateWindow_001 - * @tc.desc: Verify the CreateWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientWindowAdapterTest, CreateWindow_001, TestSize.Level1) -{ - std::shared_ptr windowProperty = nullptr; - int32_t windowId = 0; - sptr actualSurface = ScreenClientWindowAdapter::GetInstance().CreateWindow(windowProperty, windowId); - EXPECT_EQ(nullptr, actualSurface); -} - -/** - * @tc.name: CreateWindow_002 - * @tc.desc: Verify the CreateWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientWindowAdapterTest, CreateWindow_002, TestSize.Level1) -{ - std::shared_ptr windowProperty = std::make_shared(); - int32_t windowId = 2; - sptr surface = nullptr; - sptr actualSurface = ScreenClientWindowAdapter::GetInstance().CreateWindow(windowProperty, windowId); - EXPECT_NE(surface, actualSurface); -} - -/** - * @tc.name: ShowWindow_001 - * @tc.desc: Verify the ShowWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientWindowAdapterTest, ShowWindow_001, TestSize.Level1) -{ - int32_t windowId = 0; - int32_t actual = ScreenClientWindowAdapter::GetInstance().ShowWindow(windowId); - EXPECT_EQ(ERR_DH_SCREEN_SCREENCLIENT_SHOW_WINDOW_ERROR, actual); -} - -/** - * @tc.name: ShowWindow_002 - * @tc.desc: Verify the ShowWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientWindowAdapterTest, ShowWindow_002, TestSize.Level1) -{ - int32_t windowId = 1; - int32_t actual = ScreenClientWindowAdapter::GetInstance().ShowWindow(windowId); - EXPECT_EQ(DH_SUCCESS, actual); -} - -/** - * @tc.name: MoveWindow_001 - * @tc.desc: Verify the MoveWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientWindowAdapterTest, MoveWindow_001, TestSize.Level1) -{ - int32_t windowId = 0; - int32_t startX = 0; - int32_t startY = 0; - int32_t actual = ScreenClientWindowAdapter::GetInstance().MoveWindow(windowId, startX, startY); - EXPECT_EQ(ERR_DH_SCREEN_SCREENCLIENT_MOVE_WINDOW_ERROR, actual); -} - -/** - * @tc.name: MoveWindow_002 - * @tc.desc: Verify the MoveWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientWindowAdapterTest, MoveWindow_002, TestSize.Level1) -{ - int32_t windowId = 1; - int32_t startX = 0; - int32_t startY = 0; - int32_t actual = ScreenClientWindowAdapter::GetInstance().MoveWindow(windowId, startX, startY); - EXPECT_EQ(DH_SUCCESS, actual); -} - -/** - * @tc.name: RemoveWindow_001 - * @tc.desc: Verify the RemoveWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientWindowAdapterTest, RemoveWindow_001, TestSize.Level1) -{ - int32_t windowId = 0; - int32_t actual = ScreenClientWindowAdapter::GetInstance().RemoveWindow(windowId); - EXPECT_EQ(ERR_DH_SCREEN_SCREENCLIENT_REMOVE_WINDOW_ERROR, actual); -} - -/** - * @tc.name: RemoveWindow_002 - * @tc.desc: Verify the RemoveWindow function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(ScreenClientWindowAdapterTest, RemoveWindow_002, TestSize.Level1) -{ - int32_t windowId = 1; - int32_t actual = ScreenClientWindowAdapter::GetInstance().RemoveWindow(windowId); - EXPECT_EQ(DH_SUCCESS, actual); -} -} -} \ No newline at end of file