From a16e809bc30c06407bfd888280bc4c4b7b1f3f1a Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Sat, 9 Nov 2024 10:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5=E7=9A=84UT?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: pwx1285814 Change-Id: I899978c378e65383c923af9e870ff97d8853f459 --- .../test/unittest/src/screen_client_test.cpp | 4 +++- .../src/screen_client_window_adapter_test.cpp | 4 +++- .../screenregionmgr/2.0/src/screenregion_test.cpp | 13 +++++++++++++ .../1.0/src/screen_manager_adapter_test.cpp | 1 - .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 3 --- .../test/unittest/screendatachannel/BUILD.gn | 3 --- .../src/screen_data_channel_impl_test.cpp | 1 - .../test/unittest/screensourcetrans/BUILD.gn | 3 --- .../src/screen_source_trans_test.cpp | 1 - services/softbusadapter/test/unittest/BUILD.gn | 3 --- .../test/unittest/src/softbus_adapter_test.cpp | 1 - 11 files changed, 19 insertions(+), 18 deletions(-) diff --git a/services/screenclient/test/unittest/src/screen_client_test.cpp b/services/screenclient/test/unittest/src/screen_client_test.cpp index 0585e0a0..52998b1b 100644 --- a/services/screenclient/test/unittest/src/screen_client_test.cpp +++ b/services/screenclient/test/unittest/src/screen_client_test.cpp @@ -19,6 +19,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +constexpr static uint64_t DISPLAY_ID_INVALID = -1ULL; constexpr static uint32_t VIDEO_DATA_NUM = 480; void ScreenClientTest::SetUpTestCase(void) {} @@ -28,8 +29,9 @@ void ScreenClientTest::TearDownTestCase(void) {} void ScreenClientTest::SetUp() { windowProperty_ = std::make_shared(); - windowProperty_->width = VIDEO_DATA_NUM; + windowProperty_->displayId = DISPLAY_ID_INVALID; windowProperty_->height = VIDEO_DATA_NUM; + windowProperty_->width = VIDEO_DATA_NUM; } void ScreenClientTest::TearDown() diff --git a/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp b/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp index d777533f..d4f84a65 100644 --- a/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp +++ b/services/screenclient/test/unittest/src/screen_client_window_adapter_test.cpp @@ -20,6 +20,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { constexpr static uint32_t VIDEO_DATA_NUM = 480; +constexpr static uint64_t DISPLAY_ID_INVALID = -1ULL; void ScreenClientWindowAdapterTest::SetUpTestCase(void) {} @@ -28,8 +29,9 @@ void ScreenClientWindowAdapterTest::TearDownTestCase(void) {} void ScreenClientWindowAdapterTest::SetUp() { windowProperty_ = std::make_shared(); - windowProperty_->width = VIDEO_DATA_NUM; + windowProperty_->displayId = DISPLAY_ID_INVALID; windowProperty_->height = VIDEO_DATA_NUM; + windowProperty_->width = VIDEO_DATA_NUM; } void ScreenClientWindowAdapterTest::TearDown() diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregion_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregion_test.cpp index 97701531..a49f2fdf 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregion_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/screenregion_test.cpp @@ -14,6 +14,7 @@ */ #include "2.0/include/screenregion_test.h" +#include "display_manager.h" #include "dscreen_constants.h" #include "engine_test_utils.h" #include "iconsumer_surface.h" @@ -22,9 +23,19 @@ using namespace testing; using namespace testing::ext; +static uint64_t g_mockGetDefaultDisplayIdReturnId = 0; + namespace OHOS { +namespace Rosen { +uint64_t DisplayManager::GetDefaultDisplayId() +{ + return g_mockGetDefaultDisplayIdReturnId; +} +} // namespace Rosen + namespace DistributedHardware { namespace V2_0 { +constexpr static uint64_t DISPLAY_ID_INVALID = -1ULL; constexpr static uint32_t VIDEO_DATA_NUM = 480; void ScreenRegionTestV2::SetUpTestCase(void) {} @@ -35,6 +46,8 @@ void ScreenRegionTestV2::SetUp(void) { const std::string remoteDevId = "sourceDevId"; screenRegion_ = std::make_shared(remoteDevId); + screenRegion_->displayId_ = DISPLAY_ID_INVALID; + g_mockGetDefaultDisplayIdReturnId = DISPLAY_ID_INVALID; } void ScreenRegionTestV2::TearDown(void) diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp index f6dd85f3..079e9600 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp @@ -20,7 +20,6 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" #include "dscreen_util.h" -#include "token_setproc.h" #include "video_param.h" using namespace testing; diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 1a6e3ed8..1fbeb478 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -71,9 +71,6 @@ ohos_unittest("DscreenMgrTest") { ] external_deps = [ - "access_token:libaccesstoken_sdk", - "access_token:libnativetoken_shared", - "access_token:libtokensetproc_shared", "av_codec:av_codec_client", "cJSON:cjson", "c_utils:utils", diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index 54902787..1b07da36 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -57,9 +57,6 @@ ohos_unittest("DataChannelTest") { deps = [ "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans" ] external_deps = [ - "access_token:libaccesstoken_sdk", - "access_token:libnativetoken_shared", - "access_token:libtokensetproc_shared", "av_codec:av_codec_client", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", diff --git a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp index 8e775317..9c44de3d 100644 --- a/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp +++ b/services/screentransport/test/unittest/screendatachannel/src/screen_data_channel_impl_test.cpp @@ -18,7 +18,6 @@ #include "dscreen_util.h" #include "screen_source_trans.h" #include "softbus_adapter.h" -#include "token_setproc.h" static int32_t g_mockCreateSoftbusSessionServerReturnInt32Value = -1; static int32_t g_mockOpenSoftbusSessionReturnInt32Value = -1; diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index 5980239e..e6a644e3 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -58,9 +58,6 @@ ohos_unittest("SourceTransTest") { deps = [ "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans" ] external_deps = [ - "access_token:libaccesstoken_sdk", - "access_token:libnativetoken_shared", - "access_token:libtokensetproc_shared", "av_codec:av_codec_client", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", diff --git a/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp b/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp index 13274a92..43b6dec8 100644 --- a/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp +++ b/services/screentransport/test/unittest/screensourcetrans/src/screen_source_trans_test.cpp @@ -15,7 +15,6 @@ #include "screen_source_trans_test.h" #include "screentrans_test_utils.h" -#include "token_setproc.h" using namespace testing::ext; diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index 32aa4c74..c6fe6708 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -53,9 +53,6 @@ ohos_unittest("SoftBusAdapterTest") { deps = [ "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans" ] external_deps = [ - "access_token:libaccesstoken_sdk", - "access_token:libnativetoken_shared", - "access_token:libtokensetproc_shared", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", diff --git a/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp b/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp index 331eeecd..4ff4cb9c 100644 --- a/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp +++ b/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp @@ -16,7 +16,6 @@ #include "softbus_adapter_test.h" #include "socket.h" #include "softbus_adapter.h" -#include "token_setproc.h" using namespace testing::ext; -- Gitee