diff --git a/services/common/test/unittest/utils/video_param_test.cpp b/services/common/test/unittest/utils/video_param_test.cpp index 7d822da4c76fb1dbd09530f2acd8356b2f7d3592..49578400449e0a1deff23bbbf4530ddafbe60151 100644 --- a/services/common/test/unittest/utils/video_param_test.cpp +++ b/services/common/test/unittest/utils/video_param_test.cpp @@ -23,6 +23,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +constexpr static uint32_t videoDataNum = 480; void VideoParamTest::SetUpTestCase(void) {} void VideoParamTest::TearDownTestCase(void) {} @@ -141,19 +142,15 @@ HWTEST_F(VideoParamTest, GetVideoFormat_001, TestSize.Level1) HWTEST_F(VideoParamTest, to_json_001, TestSize.Level1) { json j; - uint32_t screenWidth = 100; - uint32_t screenHeight = 100; - uint32_t videoWidth = 100; - uint32_t videoHeight = 100; double fps = 30.0; uint8_t videoFormat = DEFAULT_VIDEO_FORMAT; uint8_t codecType = DEFAULT_CODECTYPE; VideoParam videoParam; - videoParam.SetScreenWidth(screenWidth); - videoParam.SetScreenHeight(screenHeight); - videoParam.SetVideoWidth(videoWidth); - videoParam.SetVideoHeight(videoHeight); + videoParam.SetScreenWidth(videoDataNum); + videoParam.SetScreenHeight(videoDataNum); + videoParam.SetVideoWidth(videoDataNum); + videoParam.SetVideoHeight(videoDataNum); videoParam.SetFps(fps); videoParam.SetVideoFormat(videoFormat); videoParam.SetCodecType(codecType); @@ -161,7 +158,7 @@ HWTEST_F(VideoParamTest, to_json_001, TestSize.Level1) uint32_t jsonVideoWidth = 0; j.at(KEY_VIDEO_WIDTH).get_to(jsonVideoWidth); - EXPECT_EQ(videoWidth, jsonVideoWidth); + EXPECT_EQ(videoDataNum, jsonVideoWidth); } /** diff --git a/services/screenclient/test/unittest/src/screen_client_test.cpp b/services/screenclient/test/unittest/src/screen_client_test.cpp index d6f4eda77cd471a3dc39eb57370f1b26256944e4..0b7ad4d602f68045d6f24af0baa5a77312b526c5 100644 --- a/services/screenclient/test/unittest/src/screen_client_test.cpp +++ b/services/screenclient/test/unittest/src/screen_client_test.cpp @@ -52,7 +52,6 @@ HWTEST_F(ScreenClientTest, AddWindow_002, TestSize.Level1) { std::shared_ptr windowProperty = std::make_shared(); int32_t expectId = ScreenClient::GetInstance().AddWindow(windowProperty); - EXPECT_EQ(0, expectId); int32_t ret = ScreenClient::GetInstance().RemoveWindow(expectId); EXPECT_EQ(DH_SUCCESS, ret); } 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 f22b64d5ae3708a7bb5cc80d282d3866614c6a60..dbc699de1990cf948fbb56fde85f9d45781c39b7 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 @@ -176,7 +176,7 @@ HWTEST_F(ScreenRegionTestV1, SetUp_001, TestSize.Level1) videoParam->videoHeight_ = DSCREEN_MAX_VIDEO_DATA_HEIGHT; videoParam->codecType_ = VIDEO_CODEC_TYPE_VIDEO_H264; videoParam->videoFormat_ = VIDEO_DATA_FORMAT_YUVI420; - videoParam->fps_ = 30; + videoParam->fps_ = 30.0; screenRegion_->SetVideoParam(videoParam); std::string version = "1.0"; int32_t ret = screenRegion_->SetUp(version); 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 b55c2ada431c5dd8a0c7284954986a3eab1d6014..2f0c494ab1d45f265d2abc77281647661aa4318b 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 @@ -34,7 +34,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V1_0 { -constexpr static int32_t videoDataNum = 100; +constexpr static uint32_t videoDataNum = 480; void DScreenTestV1::SetUpTestCase(void) {} void DScreenTestV1::TearDownTestCase(void) {} @@ -248,13 +248,6 @@ HWTEST_F(DScreenTestV1, CheckJsonData_001, TestSize.Level1) std::string taskId = "taskId"; dScreen_->dscreenCallback_ = nullptr; - dScreen_->videoParam_ = std::make_shared(); - dScreen_->videoParam_->SetCodecType(VIDEO_CODEC_TYPE_VIDEO_H264); - dScreen_->videoParam_->SetVideoFormat(VIDEO_DATA_FORMAT_YUVI420); - dScreen_->videoParam_->SetVideoHeight(100); - dScreen_->videoParam_->SetVideoWidth(100); - dScreen_->videoParam_->SetScreenHeight(100); - dScreen_->videoParam_->SetScreenWidth(100); dScreen_->HandleDisable(taskId); dScreen_->HandleConnect(); dScreen_->curState_ = CONNECTED; @@ -353,13 +346,6 @@ HWTEST_F(DScreenTestV1, SetUp_001, TestSize.Level1) }; EnablePermissionAccess(perms, sizeof(perms) / sizeof(perms[0]), tokenId_); dScreen_->sourceTrans_ = nullptr; - dScreen_->videoParam_ = std::make_shared(); - dScreen_->videoParam_->SetCodecType(VIDEO_CODEC_TYPE_VIDEO_H264); - dScreen_->videoParam_->SetVideoFormat(VIDEO_DATA_FORMAT_YUVI420); - dScreen_->videoParam_->SetVideoHeight(100); - dScreen_->videoParam_->SetVideoWidth(100); - dScreen_->videoParam_->SetScreenHeight(100); - dScreen_->videoParam_->SetScreenWidth(100); dScreen_->version_ = "1.0"; int32_t ret = dScreen_->SetUp(); EXPECT_EQ(DH_SUCCESS, ret); @@ -380,13 +366,6 @@ HWTEST_F(DScreenTestV1, SetUp_002, TestSize.Level1) }; EnablePermissionAccess(perms, sizeof(perms) / sizeof(perms[0]), tokenId_); dScreen_->sourceTrans_ = std::make_shared(); - dScreen_->videoParam_ = std::make_shared(); - dScreen_->videoParam_->SetCodecType(VIDEO_CODEC_TYPE_VIDEO_H264); - dScreen_->videoParam_->SetVideoFormat(VIDEO_DATA_FORMAT_YUVI420); - dScreen_->videoParam_->SetVideoHeight(100); - dScreen_->videoParam_->SetVideoWidth(100); - dScreen_->videoParam_->SetScreenHeight(100); - dScreen_->videoParam_->SetScreenWidth(100); dScreen_->version_ = "1.0"; int32_t ret = dScreen_->SetUp(); EXPECT_EQ(DH_SUCCESS, ret); 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 85e1acc0ce893b6bbb93bfb04c5f73346de5df4d..f127296bd1af45b2ca0ac6b3c99e934d51bff6af 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 @@ -31,6 +31,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +constexpr static uint32_t videoDataNum = 480; void DScreenManagerAdapterTest::SetUpTestCase(void) {} void DScreenManagerAdapterTest::TearDownTestCase(void) {} @@ -255,10 +256,14 @@ HWTEST_F(DScreenManagerAdapterTest, GetMapRelation_002, TestSize.Level1) std::string dhId = "dhId"; ScreenMgrAdapter::GetInstance().screenIdMap_.clear(); std::shared_ptr videoParam = std::make_shared(); + videoParam->SetScreenWidth(videoDataNum); + videoParam->SetScreenHeight(videoDataNum); uint64_t screenId = ScreenMgrAdapter::GetInstance().CreateVirtualScreen(devId, dhId, videoParam); std::shared_ptr ret = ScreenMgrAdapter::GetInstance().GetMapRelation(screenId); DisablePermissionAccess(tokenId_); EXPECT_NE(nullptr, ret); + ScreenMgrAdapter::GetInstance().RemoveVirtualScreen(screenId); + ScreenMgrAdapter::GetInstance().screenIdMap_.clear(); } } } \ No newline at end of file diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp index 4fcda388d64d4f24413c2d7eda96d04dff1c13ce..84c08e79ffa47f4b6ca2348146b6458245e7259e 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_test.cpp @@ -32,7 +32,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace V2_0 { -constexpr static int32_t videoDataNum = 100; +constexpr static uint32_t videoDataNum = 480; void DScreenTestV2::SetUpTestCase(void) {} void DScreenTestV2::TearDownTestCase(void) {} 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 0786d9aa249f43d1518b152f4ab57f6a097e22dc..9f5b0daca80541fcc346ddd98995884beb1aae5d 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 @@ -27,7 +27,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { - namespace { +namespace { const std::string PEER_SESSION_NAME = "ohos.dhardware.dscreen.session8647073e02e7a78f09473aa122"; const std::string REMOTE_DEV_ID = "f6d4c0864707aefte7a78f09473aa122ff57fc81c00981fcf5be989e7d112591"; const std::string DSCREEN_PKG_NAME_TEST = "ohos.dhardware.dscreen"; @@ -44,7 +44,11 @@ void ScreenDataChannelImplTest::SetUp(void) void ScreenDataChannelImplTest::TearDown(void) { - dataChannelImpl_ = nullptr; + if (dataChannelImpl_ != nullptr) { + dataChannelImpl_->CloseSession(); + dataChannelImpl_->ReleaseSession(); + dataChannelImpl_ = nullptr; + } } void EnablePermissionAccess(const char* perms[], size_t permsNum, uint64_t &tokenId) @@ -114,7 +118,19 @@ HWTEST_F(ScreenDataChannelImplTest, OpenSession_001, TestSize.Level1) { std::shared_ptr listener = std::make_shared(); int32_t ret = dataChannelImpl_->OpenSession(listener); - EXPECT_EQ(ERR_DH_SCREEN_ADAPTER_REGISTER_SOFTBUS_LISTENER_FAIL, ret); + EXPECT_EQ(ERR_DH_SCREEN_TRANS_ERROR, ret); +} + +/** + * @tc.name: OpenSession_002 + * @tc.desc: Verify the OpenSession function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(ScreenDataChannelImplTest, OpenSession_002, TestSize.Level1) +{ + int32_t ret = dataChannelImpl_->OpenSession(nullptr); + EXPECT_EQ(ERR_DH_SCREEN_TRANS_NULL_VALUE, ret); } /** diff --git a/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_decoder_test.h b/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_decoder_test.h index 77a9bcc7c0d70ce0a3ecd83a242cd046d6c1d5d0..96029c79cca7fb6d9d8644330cde0bbd339150ac 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_decoder_test.h +++ b/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_decoder_test.h @@ -35,6 +35,7 @@ public: VideoParam param_; std::shared_ptr imageDecoder_ = nullptr; + std::shared_ptr videoDecoder_ = nullptr; std::shared_ptr imageListener_ = nullptr; }; } // namespace DistributedHardware diff --git a/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_processor_test.h b/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_processor_test.h index a56bf79a6f63c722ac874b2034a9e03d7ec36f02..1d6984d33dd03eafe76ceb7a3499d6ff0263a06d 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_processor_test.h +++ b/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_processor_test.h @@ -36,6 +36,7 @@ public: VideoParam param_; std::shared_ptr processor_; std::shared_ptr imageListener_; + std::shared_ptr videoDecoder_ = nullptr; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_decoder_test.cpp b/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_decoder_test.cpp index f07f96b0aec430134b888de6e8b3d49aab55d902..c855d00bac3727800ff386756deef1bd5939cdc6 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_decoder_test.cpp +++ b/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_decoder_test.cpp @@ -27,27 +27,36 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +constexpr static uint32_t videoDataNum = 480; void ImageSinkDecoderTest::SetUpTestCase(void) {} void ImageSinkDecoderTest::TearDownTestCase(void) {} void ImageSinkDecoderTest::SetUp(void) { - param_.screenWidth_ = DSCREEN_MAX_SCREEN_DATA_WIDTH; - param_.screenHeight_ = DSCREEN_MAX_SCREEN_DATA_HEIGHT; - param_.videoWidth_ = DSCREEN_MAX_VIDEO_DATA_WIDTH; - param_.videoHeight_ = DSCREEN_MAX_VIDEO_DATA_HEIGHT; + param_.screenWidth_ = videoDataNum; + param_.screenHeight_ = videoDataNum; + param_.videoWidth_ = videoDataNum; + param_.videoHeight_ = videoDataNum; param_.codecType_ = VIDEO_CODEC_TYPE_VIDEO_H264; param_.videoFormat_ = VIDEO_DATA_FORMAT_YUVI420; param_.fps_ = FPS; imageListener_ = std::make_shared(); imageDecoder_ = std::make_shared(imageListener_); - imageDecoder_->videoDecoder_ = MediaAVCodec::VideoDecoderFactory::CreateByMime( + videoDecoder_ = MediaAVCodec::VideoDecoderFactory::CreateByMime( std::string(MediaAVCodec::CodecMimeType::VIDEO_AVC)); + imageDecoder_->videoDecoder_ = videoDecoder_; } -void ImageSinkDecoderTest::TearDown(void) {} +void ImageSinkDecoderTest::TearDown(void) +{ + if (videoDecoder_ != nullptr) { + videoDecoder_->Stop(); + videoDecoder_->Release(); + videoDecoder_ = nullptr; + } +} /** * @tc.name: configure_decoder_test_001 diff --git a/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp b/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp index 56516af904573946089b413103e3c04e1ea808e4..9d40d5d36cf1343b648b8e31ce537a9b74e4a16f 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp +++ b/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp @@ -26,16 +26,17 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +constexpr static uint32_t videoDataNum = 480; void ImageSinkProcessorTest::SetUpTestCase(void) {} void ImageSinkProcessorTest::TearDownTestCase(void) {} void ImageSinkProcessorTest::SetUp(void) { - param_.screenWidth_ = DSCREEN_MAX_SCREEN_DATA_WIDTH; - param_.screenHeight_ = DSCREEN_MAX_SCREEN_DATA_HEIGHT; - param_.videoWidth_ = DSCREEN_MAX_VIDEO_DATA_WIDTH; - param_.videoHeight_ = DSCREEN_MAX_VIDEO_DATA_HEIGHT; + param_.screenWidth_ = videoDataNum; + param_.screenHeight_ = videoDataNum; + param_.videoWidth_ = videoDataNum; + param_.videoHeight_ = videoDataNum; param_.fps_ = FPS; param_.codecType_ = VIDEO_CODEC_TYPE_VIDEO_H264; param_.videoFormat_ = VIDEO_DATA_FORMAT_YUVI420; @@ -43,11 +44,19 @@ void ImageSinkProcessorTest::SetUp(void) processor_ = std::make_shared(); imageListener_ = std::make_shared(); processor_->imageDecoder_ = std::make_shared(imageListener_); - processor_->imageDecoder_->videoDecoder_ = MediaAVCodec::VideoDecoderFactory::CreateByMime( + videoDecoder_ = MediaAVCodec::VideoDecoderFactory::CreateByMime( std::string(MediaAVCodec::CodecMimeType::VIDEO_AVC)); + processor_->imageDecoder_->videoDecoder_ = videoDecoder_; } -void ImageSinkProcessorTest::TearDown(void) {} +void ImageSinkProcessorTest::TearDown(void) +{ + if (videoDecoder_ != nullptr) { + videoDecoder_->Stop(); + videoDecoder_->Release(); + videoDecoder_ = nullptr; + } +} /** * @tc.name: configure_image_processor_test_001 diff --git a/services/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp b/services/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp index 5a6a088ab9d18308bcd5bf9d4df657e5ccee5d75..4dfce5b04130ff0378eac7e0c1633ac769d242bf 100644 --- a/services/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp +++ b/services/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp @@ -26,6 +26,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +constexpr static uint32_t videoDataNum = 480; void ScreenSinkTransTest::SetUpTestCase(void) {} void ScreenSinkTransTest::TearDownTestCase(void) {} @@ -42,16 +43,22 @@ void ScreenSinkTransTest::SetUp(void) trans_->decoderSurface_ = pSurface; trans_->transCallback_ = std::make_shared(); - param_.screenWidth_ = DSCREEN_MAX_SCREEN_DATA_WIDTH; - param_.screenHeight_ = DSCREEN_MAX_SCREEN_DATA_HEIGHT; - param_.videoWidth_ = DSCREEN_MAX_VIDEO_DATA_WIDTH; - param_.videoHeight_ = DSCREEN_MAX_VIDEO_DATA_HEIGHT; + param_.screenWidth_ = videoDataNum; + param_.screenHeight_ = videoDataNum; + param_.videoWidth_ = videoDataNum; + param_.videoHeight_ = videoDataNum; param_.codecType_ = VIDEO_CODEC_TYPE_VIDEO_H264; param_.videoFormat_ = VIDEO_DATA_FORMAT_YUVI420; param_.fps_ = FPS; } -void ScreenSinkTransTest::TearDown(void) {} +void ScreenSinkTransTest::TearDown(void) +{ + if (trans_ != nullptr) { + trans_->Stop(); + trans_->Release(); + } +} /** * @tc.name: setup_test_001 diff --git a/services/screentransport/test/unittest/screensourceprocessor/src/image_source_encoder_test.cpp b/services/screentransport/test/unittest/screensourceprocessor/src/image_source_encoder_test.cpp index 391c4e36f802021130fe558ba1b69bdcc64c4e5e..0d27e32103c293395d340f86f5e7b38daaef2df4 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/src/image_source_encoder_test.cpp +++ b/services/screentransport/test/unittest/screensourceprocessor/src/image_source_encoder_test.cpp @@ -29,7 +29,13 @@ void ImageSourceEncoderTest::SetUp(void) encoder = std::make_shared(imageListener); } -void ImageSourceEncoderTest::TearDown(void) {} +void ImageSourceEncoderTest::TearDown(void) +{ + if (encoder != nullptr) { + encoder->StopEncoder(); + encoder->ReleaseEncoder(); + } +} /** * @tc.name: ConfigureEncoder_001 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 b60a9fd485d173deafdb21392753ab2ee8d6fbab..e3016b3ddff885d6e63ecdfee1cef5650ceaf8a0 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 @@ -23,6 +23,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +constexpr static uint32_t videoDataNum = 480; void ScreenSourceTransTest::SetUpTestCase(void) {} void ScreenSourceTransTest::TearDownTestCase(void) {} @@ -117,17 +118,17 @@ HWTEST_F(ScreenSourceTransTest, SetUp_002, TestSize.Level1) VideoParam localParam; localParam.SetCodecType(VIDEO_CODEC_TYPE_VIDEO_H264); localParam.SetVideoFormat(VIDEO_DATA_FORMAT_YUVI420); - localParam.SetVideoHeight(100); - localParam.SetVideoWidth(100); - localParam.SetScreenHeight(100); - localParam.SetScreenWidth(100); + localParam.SetVideoHeight(videoDataNum); + localParam.SetVideoWidth(videoDataNum); + localParam.SetScreenHeight(videoDataNum); + localParam.SetScreenWidth(videoDataNum); VideoParam remoteParam; remoteParam.SetCodecType(VIDEO_CODEC_TYPE_VIDEO_H264); remoteParam.SetVideoFormat(VIDEO_DATA_FORMAT_YUVI420); - remoteParam.SetVideoHeight(100); - remoteParam.SetVideoWidth(100); - remoteParam.SetScreenHeight(100); - remoteParam.SetScreenWidth(100); + remoteParam.SetVideoHeight(videoDataNum); + remoteParam.SetVideoWidth(videoDataNum); + remoteParam.SetScreenHeight(videoDataNum); + remoteParam.SetScreenWidth(videoDataNum); int32_t actual = trans->SetUp(localParam, remoteParam, "peerDevId"); DisablePermissionAccess(tokenId_);