From 67a3f840a1d7fa95162d47815c563ea251ccb38e Mon Sep 17 00:00:00 2001 From: yangli Date: Tue, 18 Jul 2023 11:09:04 +0800 Subject: [PATCH 1/7] 7.18 Signed-off-by: yangli --- .../{ => 1.0}/include/screenregion_test.h | 0 .../{ => 1.0}/include/screenregionmgr_test.h | 0 .../{ => 1.0}/src/screenregion_test.cpp | 2 +- .../{ => 1.0}/src/screenregionmgr_test.cpp | 2 +- .../include/av_receiver_engine_adapter_test.h | 40 ++++ .../src/av_receiver_engine_adapter_test.cpp | 160 ++++++++++++++ .../engineutils/include/engine_test_utils.h | 153 ++++++++++++++ .../{ => 1.0}/include/dscreen_manager_test.h | 0 .../{ => 1.0}/include/dscreen_test.h | 0 .../include/screen_manager_adapter_test.h | 0 .../{ => 1.0}/src/dscreen_manager_test.cpp | 2 +- .../dscreenmgr/{ => 1.0}/src/dscreen_test.cpp | 2 +- .../src/screen_manager_adapter_test.cpp | 2 +- .../include/av_sender_engine_adapter_test.h | 39 ++++ .../2.0/src/av_sender_engine_adapter_test.cpp | 200 ++++++++++++++++++ 15 files changed, 597 insertions(+), 5 deletions(-) rename services/screenservice/test/unittest/sinkservice/screenregionmgr/{ => 1.0}/include/screenregion_test.h (100%) rename services/screenservice/test/unittest/sinkservice/screenregionmgr/{ => 1.0}/include/screenregionmgr_test.h (100%) rename services/screenservice/test/unittest/sinkservice/screenregionmgr/{ => 1.0}/src/screenregion_test.cpp (99%) rename services/screenservice/test/unittest/sinkservice/screenregionmgr/{ => 1.0}/src/screenregionmgr_test.cpp (99%) create mode 100644 services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter_test.h create mode 100644 services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp create mode 100644 services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h rename services/screenservice/test/unittest/sourceservice/dscreenmgr/{ => 1.0}/include/dscreen_manager_test.h (100%) rename services/screenservice/test/unittest/sourceservice/dscreenmgr/{ => 1.0}/include/dscreen_test.h (100%) rename services/screenservice/test/unittest/sourceservice/dscreenmgr/{ => 1.0}/include/screen_manager_adapter_test.h (100%) rename services/screenservice/test/unittest/sourceservice/dscreenmgr/{ => 1.0}/src/dscreen_manager_test.cpp (99%) rename services/screenservice/test/unittest/sourceservice/dscreenmgr/{ => 1.0}/src/dscreen_test.cpp (99%) rename services/screenservice/test/unittest/sourceservice/dscreenmgr/{ => 1.0}/src/screen_manager_adapter_test.cpp (99%) create mode 100644 services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter_test.h create mode 100644 services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/include/screenregion_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h similarity index 100% rename from services/screenservice/test/unittest/sinkservice/screenregionmgr/include/screenregion_test.h rename to services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregion_test.h diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/include/screenregionmgr_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h similarity index 100% rename from services/screenservice/test/unittest/sinkservice/screenregionmgr/include/screenregionmgr_test.h rename to services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/include/screenregionmgr_test.h diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregion_test.cpp similarity index 99% rename from services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp rename to services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregion_test.cpp index 140fbada..54a35ce6 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregion_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "screenregion_test.h" +#include "1.0/include/screenregion_test.h" #include "dscreen_constants.h" using namespace testing; diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregionmgr_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp similarity index 99% rename from services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregionmgr_test.cpp rename to services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp index dddf4c46..a41b62ef 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregionmgr_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/1.0/src/screenregionmgr_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "screenregionmgr_test.h" +#include "1.0/include/screenregionmgr_test.h" using namespace testing; using namespace testing::ext; diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter_test.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter_test.h new file mode 100644 index 00000000..741f0080 --- /dev/null +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter_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_DAUDIO_AV_RECEIVER_ENGINE_ADAPTER_TEST_H +#define OHOS_DAUDIO_AV_RECEIVER_ENGINE_ADAPTER_TEST_H + +#include +#include + +#define private public +#include "dscreen_errcode.h" +#include "2.0/include/av_receiver_engine_adapter.h" +#undef private + +namespace OHOS { +namespace DistributedHardware { +class AVReceiverEngineAdapterTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); + + std::shared_ptr receiverAdapter_ = nullptr; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DAUDIO_AV_RECEIVER_ENGINE_ADAPTER_TEST_H diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp new file mode 100644 index 00000000..4b5aa369 --- /dev/null +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp @@ -0,0 +1,160 @@ +/* + * 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/av_receiver_engine_adapter_test.h" + +#include "dscreen_errcode.h" +#include "dscreen_log.h" +#include "dscreen_util.h" +#include "engine_test_utils.h" +#include "1.0/include/dscreen.h" + +using namespace testing::ext; + +namespace OHOS { +namespace DistributedHardware { +void AVReceiverEngineAdapterTest::SetUpTestCase(void) {} + +void AVReceiverEngineAdapterTest::TearDownTestCase(void) {} + +void AVReceiverEngineAdapterTest::SetUp(void) +{ + receiverAdapter_ = std::make_shared(); +} + +void AVReceiverEngineAdapterTest::TearDown(void) +{ + receiverAdapter_ = nullptr; +} + +/** + * @tc.name: Initialize_001 + * @tc.desc: Verify the Initialize function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVReceiverEngineAdapterTest, Initialize_001, TestSize.Level1) +{ + IAVEngineProvider *providerPtr = nullptr; + std::string peerDevId = "peerDevId"; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->Initialize(providerPtr, peerDevId)); + receiverAdapter_->initialized_ = true; + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->Initialize(providerPtr, peerDevId)); +} + +/** + * @tc.name: Initialize_002 + * @tc.desc: Verify the Initialize function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVReceiverEngineAdapterTest, Initialize_002, TestSize.Level1) +{ + std::string peerDevId = "peerDevId"; + receiverAdapter_->receiverEngine_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->Start()); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->Stop()); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->Release()); +} + +/** + * @tc.name: Start_001 + * @tc.desc: Verify the Start and Stop function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVReceiverEngineAdapterTest, Start_001, TestSize.Level1) +{ + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->Start()); + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->Stop()); +} + +/** + * @tc.name: SetParameter_001 + * @tc.desc: Verify the Start and SetParameter function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVReceiverEngineAdapterTest, SetParameter_001, TestSize.Level1) +{ + std::string param = "param"; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->SetParameter(AVTransTag::VIDEO_FRAME_RETE, param)); +} + +/** + * @tc.name: SetParameter_002 + * @tc.desc: Verify the Start and SetParameter function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVReceiverEngineAdapterTest, SetParameter_002, TestSize.Level1) +{ + std::string param = "param"; + receiverAdapter_->receiverEngine_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->SetParameter(AVTransTag::VIDEO_FRAME_RETE, param)); +} + +/** + * @tc.name: SendMessageToRemote_001 + * @tc.desc: Verify the Start and SendMessageToRemote function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVReceiverEngineAdapterTest, SendMessageToRemote_001, TestSize.Level1) +{ + uint32_t type = 0; + std::string content = "content"; + std::string dstDevId = "dstDevId"; + auto message = std::make_shared(type, content, dstDevId); + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->SendMessageToRemote(message)); + receiverAdapter_->receiverEngine_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->SendMessageToRemote(message)); +} + +/** + * @tc.name: RegisterAdapterCallback_001 + * @tc.desc: Verify the Start and RegisterAdapterCallback function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVReceiverEngineAdapterTest, RegisterAdapterCallback_001, TestSize.Level1) +{ + std::shared_ptr callback = nullptr; + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverAdapter_->RegisterAdapterCallback(callback)); + callback = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->RegisterAdapterCallback(callback)); +} + +/** + * @tc.name: OnReceiverEvent_001 + * @tc.desc: Verify the Start and OnReceiverEvent function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVReceiverEngineAdapterTest, OnReceiverEvent_001, TestSize.Level1) +{ + AVTransEvent event; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->OnReceiverEvent(event)); + std::shared_ptr message = nullptr; + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->OnMessageReceived(message)); + std::shared_ptr buffer = nullptr; + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->OnDataAvailable(buffer)); + receiverAdapter_->adapterCallback_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->OnReceiverEvent(event)); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->OnMessageReceived(message)); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->OnDataAvailable(buffer)); +} +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h new file mode 100644 index 00000000..2c79794d --- /dev/null +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h @@ -0,0 +1,153 @@ +/* + * 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_ENGINE_TEST_UTILS_H +#define OHOS_ENGINE_TEST_UTILS_H + +#include "i_av_receiver_engine.h" +#include "i_av_sender_engine.h" +#include "2.0/include/av_receiver_engine_adapter.h" +#include "2.0/include/av_sender_engine_adapter.h" + +namespace OHOS { +namespace DistributedHardware { +class MockAVReceiverAdapterCallback : public AVReceiverAdapterCallback { +public: + explicit MockAVReceiverAdapterCallback() {} + ~MockAVReceiverAdapterCallback() {} + void OnEngineEvent(const AVTransEvent &event) override {} + void OnEngineMessage(const std::shared_ptr &message) override {} + void OnEngineDataAvailable(const std::shared_ptr &buffer) override {} +}; + +class MockAVSenderAdapterCallback : public AVSenderAdapterCallback { +public: + explicit MockAVSenderAdapterCallback() {} + ~MockAVSenderAdapterCallback() {} + void OnEngineEvent(const AVTransEvent &event) override {} + void OnEngineMessage(const std::shared_ptr &message) override {} +}; + +class MockIAVReceiverEngine : public IAVReceiverEngine { +public: + explicit MockIAVReceiverEngine() {} + ~MockIAVReceiverEngine() {} + + int32_t Initialize() override + { + return 0; + } + + int32_t Start() override + { + return 0; + } + + int32_t Stop() override + { + return 0; + } + + int32_t Release() override + { + return 0; + } + + int32_t SetParameter(AVTransTag tag, const std::string &value) override + { + (void) tag; + (void) value; + return 0; + } + + int32_t SendMessage(const std::shared_ptr &message) override + { + return 0; + } + + int32_t CreateControlChannel(const std::vector &dstDevIds, + const ChannelAttribute &attribution) override + { + (void) dstDevIds; + (void) attribution; + return 0; + } + + int32_t RegisterReceiverCallback(const std::shared_ptr &callback) + { + (void) callback; + return 0; + } +}; + +class MockIAVSenderEngine : public IAVSenderEngine { +public: + explicit MockIAVSenderEngine() {} + ~MockIAVSenderEngine() {} + + int32_t Initialize() override + { + return 0; + } + + int32_t Start() override + { + return 0; + } + + int32_t Stop() override + { + return 0; + } + + int32_t Release() override + { + return 0; + } + + int32_t PushData(const std::shared_ptr &buffer) override + { + return 0; + } + + int32_t SetParameter(AVTransTag tag, const std::string &value) override + { + (void) tag; + (void) value; + return 0; + } + + int32_t SendMessage(const std::shared_ptr &message) override + { + return 0; + } + + int32_t CreateControlChannel(const std::vector &dstDevIds, + const ChannelAttribute &attribution) override + { + (void) dstDevIds; + (void) attribution; + return 0; + } + + int32_t RegisterSenderCallback(const std::shared_ptr &callback) + { + (void) callback; + return 0; + } +}; +} // DistributedHardware +} // OHOS +#endif // OHOS_ENGINE_TEST_UTILS_H \ No newline at end of file diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/include/dscreen_manager_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h similarity index 100% rename from services/screenservice/test/unittest/sourceservice/dscreenmgr/include/dscreen_manager_test.h rename to services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_manager_test.h diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/include/dscreen_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h similarity index 100% rename from services/screenservice/test/unittest/sourceservice/dscreenmgr/include/dscreen_test.h rename to services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/dscreen_test.h diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/include/screen_manager_adapter_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/screen_manager_adapter_test.h similarity index 100% rename from services/screenservice/test/unittest/sourceservice/dscreenmgr/include/screen_manager_adapter_test.h rename to services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/include/screen_manager_adapter_test.h diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp similarity index 99% rename from services/screenservice/test/unittest/sourceservice/dscreenmgr/src/dscreen_manager_test.cpp rename to services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp index dfe69538..564ead43 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "dscreen_manager_test.h" +#include "1.0/include/dscreen_manager_test.h" using namespace testing; using namespace testing::ext; diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/src/dscreen_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp similarity index 99% rename from services/screenservice/test/unittest/sourceservice/dscreenmgr/src/dscreen_test.cpp rename to services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp index 9c776eb8..6fe2668e 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/src/dscreen_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "dscreen_test.h" +#include "1.0/include/dscreen_test.h" #define private public #include "dscreen_constants.h" diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/src/screen_manager_adapter_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp similarity index 99% rename from services/screenservice/test/unittest/sourceservice/dscreenmgr/src/screen_manager_adapter_test.cpp rename to services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp index 2797e1ee..2545eb15 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/src/screen_manager_adapter_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/screen_manager_adapter_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "screen_manager_adapter_test.h" +#include "1.0/include/screen_manager_adapter_test.h" #define private public #include "common/include/screen_manager_adapter.h" diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter_test.h b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter_test.h new file mode 100644 index 00000000..19b4b4c6 --- /dev/null +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter_test.h @@ -0,0 +1,39 @@ +/* + * 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_DAUDIO_AV_SENDER_ENGINE_ADAPTER_TEST_H +#define OHOS_DAUDIO_AV_SENDER_ENGINE_ADAPTER_TEST_H + +#include + +#define private public +#include "dscreen_errcode.h" +#include "2.0/include/av_sender_engine_adapter.h" +#undef private + +namespace OHOS { +namespace DistributedHardware { +class AVSenderEngineAdapterTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); + + std::shared_ptr senderAdapter_ = nullptr; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DAUDIO_AV_SENDER_ENGINE_ADAPTER_TEST_H diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp new file mode 100644 index 00000000..b4f06085 --- /dev/null +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp @@ -0,0 +1,200 @@ +/* + * 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/av_sender_engine_adapter_test.h" + +#include "dscreen_errcode.h" +#include "2.0/include/dscreen.h" +#include "dscreen_log.h" +#include "dscreen_util.h" +#include "engine_test_utils.h" + +using namespace testing::ext; + +namespace OHOS { +namespace DistributedHardware { +void AVSenderEngineAdapterTest::SetUpTestCase(void) {} + +void AVSenderEngineAdapterTest::TearDownTestCase(void) {} + +void AVSenderEngineAdapterTest::SetUp(void) +{ + senderAdapter_ = std::make_shared(); +} + +void AVSenderEngineAdapterTest::TearDown(void) +{ + senderAdapter_ = nullptr; +} + +/** + * @tc.name: Initialize_001 + * @tc.desc: Verify the Initialize function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, Initialize_001, TestSize.Level1) +{ + IAVEngineProvider *providerPtr = nullptr; + std::string peerDevId = "peerDevId"; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Initialize(providerPtr, peerDevId)); + senderAdapter_->initialized_ = true; + EXPECT_EQ(DH_SUCCESS, senderAdapter_->Initialize(providerPtr, peerDevId)); +} + +/** + * @tc.name: Initialize_002 + * @tc.desc: Verify the Initialize function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, Initialize_002, TestSize.Level1) +{ + std::string peerDevId = "peerDevId"; + senderAdapter_->senderEngine_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, senderAdapter_->Start()); + EXPECT_EQ(DH_SUCCESS, senderAdapter_->Stop()); + EXPECT_EQ(DH_SUCCESS, senderAdapter_->Release()); +} + +/** + * @tc.name: Start_001 + * @tc.desc: Verify the Start and Stop function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, Start_001, TestSize.Level1) +{ + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Start()); + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Stop()); +} + +/** + * @tc.name: SetParameter_001 + * @tc.desc: Verify the SetParameter function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, SetParameter_001, TestSize.Level1) +{ + std::string param = "param"; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->SetParameter(AVTransTag::VIDEO_FRAME_RATE, param)); +} + +/** + * @tc.name: SetParameter_002 + * @tc.desc: Verify the SetParameter function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, SetParameter_002, TestSize.Level1) +{ + std::string param = "param"; + senderAdapter_->senderEngine_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, senderAdapter_->SetParameter(AVTransTag::VIDEO_FRAME_RATE, param)); +} + +/** + * @tc.name: PushData_001 + * @tc.desc: Verify the PushData function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, PushData_001, TestSize.Level1) +{ + size_t bufLen = 4096; + std::shared_ptr videoData = std::make_shared(bufLen); + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->PushData(videoData)); + senderAdapter_->senderEngine_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, senderAdapter_->PushData(videoData)); +} + +/** + * @tc.name: CreateControlChannel_001 + * @tc.desc: Verify the CreateControlChannel function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, CreateControlChannel_001, TestSize.Level1) +{ + std::string peerDevId = "peerDevId"; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->CreateControlChannel(peerDevId)); + senderAdapter_->chnCreateSuccess_ = true; + EXPECT_EQ(DH_SUCCESS, senderAdapter_->CreateControlChannel(peerDevId)); +} + +/** + * @tc.name: CreateControlChannel_002 + * @tc.desc: Verify the CreateControlChannel function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, CreateControlChannel_002, TestSize.Level1) +{ + std::string peerDevId = "peerDevId"; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->CreateControlChannel(peerDevId)); + senderAdapter_->senderEngine_ = std::make_shared(); + EXPECT_EQ(ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED, senderAdapter_->CreateControlChannel(peerDevId)); +} + +/** + * @tc.name: SendMessageToRemote_001 + * @tc.desc: Verify the SendMessageToRemote function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, SendMessageToRemote_001, TestSize.Level1) +{ + uint32_t type = 0; + std::string content = "content"; + std::string dstDevId = "dstDevId"; + auto message = std::make_shared(type, content, dstDevId); + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->SendMessageToRemote(message)); + senderAdapter_->senderEngine_ = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, senderAdapter_->SendMessageToRemote(message)); +} + +/** + * @tc.name: RegisterAdapterCallback_001 + * @tc.desc: Verify the RegisterAdapterCallback function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, RegisterAdapterCallback_001, TestSize.Level1) +{ + std::shared_ptr callback = nullptr; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->RegisterAdapterCallback(callback)); + callback = std::make_shared(); + EXPECT_EQ(DH_SUCCESS, senderAdapter_->RegisterAdapterCallback(callback)); +} + +/** + * @tc.name: OnSenderEvent_001 + * @tc.desc: Verify the OnSenderEvent function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(AVSenderEngineAdapterTest, OnSenderEvent_001, TestSize.Level1) +{ + AVTransEvent event; + EXPECT_EQ(DH_AVT_SUCCESS, senderAdapter_->OnSenderEvent(event)); + std::shared_ptr message = nullptr; + EXPECT_EQ(DH_AVT_SUCCESS, senderAdapter_->OnMessageReceived(message)); + senderAdapter_->adapterCallback_ = std::make_shared(); + EXPECT_EQ(DH_AVT_SUCCESS, senderAdapter_->OnSenderEvent(event)); + EXPECT_EQ(DH_AVT_SUCCESS, senderAdapter_->OnMessageReceived(message)); +} +} // namespace DistributedHardware +} // namespace OHOS -- Gitee From ffa0314759313c414735db38ef712d19286bb0d6 Mon Sep 17 00:00:00 2001 From: yangli Date: Tue, 18 Jul 2023 11:39:56 +0800 Subject: [PATCH 2/7] 7.18 Signed-off-by: yangli --- .../2.0/src/av_receiver_engine_adapter_test.cpp | 8 ++++---- .../unittest/sinkservice/screenregionmgr/BUILD.gn | 14 ++++++++++++-- .../engineutils/include/engine_test_utils.h | 11 +++++------ .../2.0/src/av_sender_engine_adapter_test.cpp | 11 ++++++++--- .../unittest/sourceservice/dscreenmgr/BUILD.gn | 14 +++++++++++--- 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp index 4b5aa369..38307e11 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter_test.cpp @@ -19,7 +19,7 @@ #include "dscreen_log.h" #include "dscreen_util.h" #include "engine_test_utils.h" -#include "1.0/include/dscreen.h" +#include "2.0/include/dscreen.h" using namespace testing::ext; @@ -90,7 +90,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, Start_001, TestSize.Level1) HWTEST_F(AVReceiverEngineAdapterTest, SetParameter_001, TestSize.Level1) { std::string param = "param"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->SetParameter(AVTransTag::VIDEO_FRAME_RETE, param)); + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->SetParameter(AVTransTag::VIDEO_FRAME_RATE, param)); } /** @@ -103,7 +103,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, SetParameter_002, TestSize.Level1) { std::string param = "param"; receiverAdapter_->receiverEngine_ = std::make_shared(); - EXPECT_EQ(DH_SUCCESS, receiverAdapter_->SetParameter(AVTransTag::VIDEO_FRAME_RETE, param)); + EXPECT_EQ(DH_SUCCESS, receiverAdapter_->SetParameter(AVTransTag::VIDEO_FRAME_RATE, param)); } /** @@ -132,7 +132,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, SendMessageToRemote_001, TestSize.Level1) HWTEST_F(AVReceiverEngineAdapterTest, RegisterAdapterCallback_001, TestSize.Level1) { std::shared_ptr callback = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverAdapter_->RegisterAdapterCallback(callback)); + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->RegisterAdapterCallback(callback)); callback = std::make_shared(); EXPECT_EQ(DH_SUCCESS, receiverAdapter_->RegisterAdapterCallback(callback)); } diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index e3ebddf0..aa170f40 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -23,6 +23,7 @@ config("module_private_config") { "//third_party/json/include", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", + "${distributedhardwarefwk_path}/utils/include", ] include_dirs += [ @@ -40,6 +41,11 @@ config("module_private_config") { "${services_path}/screentransport/screensinkprocessor/decoder/include", "${services_path}/screenclient/include/", "${services_path}/screenservice/sinkservice/screenregionmgr/", + "${services_path}/screenservice/sourceservice/screenmgr", + "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr", + "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include", + + ] } @@ -48,14 +54,16 @@ ohos_unittest("DscreenRegionMgrTest") { module_out_path = module_out_path sources = [ - "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregion_test.cpp", - "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/src/screenregionmgr_test.cpp", + "${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", ] configs = [ ":module_private_config" ] deps = [ "${services_path}/screenservice/sinkservice:distributed_screen_sink", + "${services_path}/screenservice/sinkservice:distributed_screen_source", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", @@ -64,8 +72,10 @@ ohos_unittest("DscreenRegionMgrTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributedhardwareutils", "graphic_2d:libgraphic_utils", "graphic_2d:surface", + "graphic_2d:libcomposer", "hisysevent:libhisysevent", "multimedia_image_framework:image_native", "window_manager:libdm", diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h index 2c79794d..2e59446c 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h @@ -27,17 +27,16 @@ class MockAVReceiverAdapterCallback : public AVReceiverAdapterCallback { public: explicit MockAVReceiverAdapterCallback() {} ~MockAVReceiverAdapterCallback() {} - void OnEngineEvent(const AVTransEvent &event) override {} - void OnEngineMessage(const std::shared_ptr &message) override {} - void OnEngineDataAvailable(const std::shared_ptr &buffer) override {} + void OnEngineEvent(DScreenEventType event, const std::string &content) override {}; + void OnEngineMessage(const std::shared_ptr &message) override {}; + void OnEngineDataDone(const std::shared_ptr &buffer) override {}; }; - class MockAVSenderAdapterCallback : public AVSenderAdapterCallback { public: explicit MockAVSenderAdapterCallback() {} ~MockAVSenderAdapterCallback() {} - void OnEngineEvent(const AVTransEvent &event) override {} - void OnEngineMessage(const std::shared_ptr &message) override {} + void OnEngineEvent(DScreenEventType event, const std::string &content) override {}; + void OnEngineMessage(const std::shared_ptr &message) override {}; }; class MockIAVReceiverEngine : public IAVReceiverEngine { diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp index b4f06085..26d9825f 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp @@ -16,6 +16,7 @@ #include "2.0/include/av_sender_engine_adapter_test.h" #include "dscreen_errcode.h" +#include "histream_ability_parser.h" #include "2.0/include/dscreen.h" #include "dscreen_log.h" #include "dscreen_util.h" @@ -63,10 +64,15 @@ HWTEST_F(AVSenderEngineAdapterTest, Initialize_001, TestSize.Level1) HWTEST_F(AVSenderEngineAdapterTest, Initialize_002, TestSize.Level1) { std::string peerDevId = "peerDevId"; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Start()); + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Stop()); + EXPECT_EQ(DH_SUCCESS, senderAdapter_->Release()); senderAdapter_->senderEngine_ = std::make_shared(); + senderAdapter_->transStartSuccess_ = true; EXPECT_EQ(DH_SUCCESS, senderAdapter_->Start()); EXPECT_EQ(DH_SUCCESS, senderAdapter_->Stop()); - EXPECT_EQ(DH_SUCCESS, senderAdapter_->Release()); + senderAdapter_->senderEngine_ = nullptr; + EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Start()); } /** @@ -114,8 +120,7 @@ HWTEST_F(AVSenderEngineAdapterTest, SetParameter_002, TestSize.Level1) */ HWTEST_F(AVSenderEngineAdapterTest, PushData_001, TestSize.Level1) { - size_t bufLen = 4096; - std::shared_ptr videoData = std::make_shared(bufLen); + struct VideoData videoData; EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->PushData(videoData)); senderAdapter_->senderEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, senderAdapter_->PushData(videoData)); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index d743bbb5..56aab6eb 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -24,6 +24,8 @@ config("module_private_config") { "${driver_path}/interfaces/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${distributedhardwarefwk_path}/common/utils/include", + "${distributedhardwarefwk_path}/utils/include", + "${fwk_common_path}/utils/include", "${mediastandard_path}/interfaces/inner_api/native", ] @@ -43,6 +45,9 @@ config("module_private_config") { "${services_path}/screentransport/screensourceprocessor/encoder/include", "${services_path}/screentransport/screensourceprocessor/include", "${services_path}/screentransport/screensourcetrans/include", + "${services_path}/screenservice/sinkservice/screenregionmgr", + "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr", + "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include", ] } @@ -51,9 +56,10 @@ ohos_unittest("DscreenMgrTest") { module_out_path = module_out_path sources = [ - "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/dscreen_manager_test.cpp", - "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/dscreen_test.cpp", - "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/screen_manager_adapter_test.cpp", + "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/1.0/dscreen_manager_test.cpp", + "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/1.0/dscreen_test.cpp", + "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/1.0/screen_manager_adapter_test.cpp", + "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/2.0/av_sender_engine_adapter_test.cpp", ] configs = [ ":module_private_config" ] @@ -69,6 +75,8 @@ ohos_unittest("DscreenMgrTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "graphic_2d:libcomposer", "graphic_2d:surface", "graphic_2d:sync_fence", -- Gitee From b4ac46eb8d0b9d8f096820eb4a3e19019fd1de0d Mon Sep 17 00:00:00 2001 From: yangli Date: Tue, 18 Jul 2023 11:50:54 +0800 Subject: [PATCH 3/7] 7.18 Signed-off-by: yangli --- .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 6 ++---- .../engineutils/include/engine_test_utils.h | 10 +++++----- .../2.0/src/av_sender_engine_adapter_test.cpp | 2 +- .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 8 ++++---- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index aa170f40..36bdc4f0 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -41,11 +41,9 @@ config("module_private_config") { "${services_path}/screentransport/screensinkprocessor/decoder/include", "${services_path}/screenclient/include/", "${services_path}/screenservice/sinkservice/screenregionmgr/", - "${services_path}/screenservice/sourceservice/screenmgr", + "${services_path}/screenservice/sourceservice/dscreenmgr", "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr", "${services_path}/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include", - - ] } @@ -63,7 +61,7 @@ ohos_unittest("DscreenRegionMgrTest") { deps = [ "${services_path}/screenservice/sinkservice:distributed_screen_sink", - "${services_path}/screenservice/sinkservice:distributed_screen_source", + "${services_path}/screenservice/sourceservice:distributed_screen_source", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h b/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h index 2e59446c..a69dd103 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/engineutils/include/engine_test_utils.h @@ -27,16 +27,16 @@ class MockAVReceiverAdapterCallback : public AVReceiverAdapterCallback { public: explicit MockAVReceiverAdapterCallback() {} ~MockAVReceiverAdapterCallback() {} - void OnEngineEvent(DScreenEventType event, const std::string &content) override {}; - void OnEngineMessage(const std::shared_ptr &message) override {}; - void OnEngineDataDone(const std::shared_ptr &buffer) override {}; + void OnEngineEvent(DScreenEventType event, const std::string &content) override {} + void OnEngineMessage(const std::shared_ptr &message) override {} + void OnEngineDataDone(const std::shared_ptr &buffer) override {} }; class MockAVSenderAdapterCallback : public AVSenderAdapterCallback { public: explicit MockAVSenderAdapterCallback() {} ~MockAVSenderAdapterCallback() {} - void OnEngineEvent(DScreenEventType event, const std::string &content) override {}; - void OnEngineMessage(const std::shared_ptr &message) override {}; + void OnEngineEvent(DScreenEventType event, const std::string &content) override {} + void OnEngineMessage(const std::shared_ptr &message) override {} }; class MockIAVReceiverEngine : public IAVReceiverEngine { diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp index 26d9825f..f63f767e 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter_test.cpp @@ -16,7 +16,7 @@ #include "2.0/include/av_sender_engine_adapter_test.h" #include "dscreen_errcode.h" -#include "histream_ability_parser.h" +#include "histreamer_ability_parser.h" #include "2.0/include/dscreen.h" #include "dscreen_log.h" #include "dscreen_util.h" diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 56aab6eb..efe2d7e3 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -56,10 +56,10 @@ ohos_unittest("DscreenMgrTest") { module_out_path = module_out_path sources = [ - "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/1.0/dscreen_manager_test.cpp", - "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/1.0/dscreen_test.cpp", - "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/1.0/screen_manager_adapter_test.cpp", - "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/src/2.0/av_sender_engine_adapter_test.cpp", + "${services_path}/screenservice/test/unittest/sourceservice/dscreenmgr/1.0/src/dscreen_manager_test.cpp", + "${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", ] configs = [ ":module_private_config" ] -- Gitee From 756470c9a653949877033fdfcc826a2832c77bfc Mon Sep 17 00:00:00 2001 From: yangli Date: Tue, 18 Jul 2023 14:42:38 +0800 Subject: [PATCH 4/7] 7.18 Signed-off-by: yangli --- .../screensourcetest/src/dscreen_source_handler_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp index 672064aa..1c134b85 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp @@ -207,7 +207,7 @@ HWTEST_F(DScreenSourceHandlerTest, UnregisterDistributedHardware_001, TestSize.L DScreenSourceHandler::GetInstance().dScreenSourceCallback_ = new (std::nothrow) DScreenSourceCallback(); } int32_t ret = DScreenSourceHandler::GetInstance().UnregisterDistributedHardware(devId, dhId, callback); - EXPECT_EQ(ERR_DH_SCREEN_SA_DISABLE_FAILED, ret); + EXPECT_EQ(DH_SUCCESS, ret); } /** -- Gitee From 12cfe3381fa717856cc1baa2b438abc9c42b3e12 Mon Sep 17 00:00:00 2001 From: yangli Date: Tue, 18 Jul 2023 14:45:37 +0800 Subject: [PATCH 5/7] 7.18 Signed-off-by: yangli --- .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 36bdc4f0..1bf5e26c 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -71,9 +71,9 @@ ohos_unittest("DscreenRegionMgrTest") { "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributedhardwareutils", + "graphic_2d:libcomposer", "graphic_2d:libgraphic_utils", "graphic_2d:surface", - "graphic_2d:libcomposer", "hisysevent:libhisysevent", "multimedia_image_framework:image_native", "window_manager:libdm", -- Gitee From e9f155da40952b983d69a7bd851e2a1b96d59684 Mon Sep 17 00:00:00 2001 From: yangli Date: Tue, 18 Jul 2023 16:31:47 +0800 Subject: [PATCH 6/7] 7.18 Signed-off-by: yangli --- .../1.0/src/screenregionmgr_test.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 a41b62ef..dfd01a93 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 @@ -135,11 +135,11 @@ HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_001, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; - const std::string eventContent = "{\"dhId\":\"SCREEN#0\",\"mapRelation\":{\"displayId\":0,\ - \"displayRect\":{\"height\":1280,\"startX\":0,\"startY\":0,\"width\":720},\"screenId\":2,\ - \"screenRect\":{\"height\":1280,\"startX\":0,\"startY\":0,\"width\":720}},\"screenId\":2,\ - \"videoParam\":{\"codecType\":2,\"colorFormat\":3,\"fps\":30,\"screenHeight\":1280,\ - \"screenWidth\":720,\"videoHeight\":1280,\"videoWidth\":720}}"; + const std::string eventContent = "{\"dhId\":\"SCREEN#0\", \"mapRelation\":{\"displayId\":0, \ + \"displayRect\":{\"height\":1280, \"startX\":0, \"startY\":0, \"width\":720}, \"screenId\":2, \ + \"screenRect\":{\"height\":1280, \"startX\":0, \"startY\":0, \"width\":720}}, \"screenId\":2, \ + \"videoParam\":{\"codecType\":2, \"colorFormat\":3, \"fps\":30, \"screenHeight\":1280, \ + \"screenWidth\":720, \"videoHeight\":1280, \"videoWidth\":720}}"; ScreenRegionManager::GetInstance().HandleNotifySetUp(remoteDevId, eventContent); EXPECT_NE(0, ScreenRegionManager::GetInstance().screenRegions_.size()); @@ -156,11 +156,11 @@ HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_002, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; - const std::string eventContent = "{\"dhIds\":\"SCREEN#0\",\"mapRelations\":{\"displayIds\":0,\ - \"displayRects\":{\"heights\":1280,\"startXs\":0,\"startYs\":0,\"widths\":720},\"screenIds\":2,\ - \"screenRects\":{\"heights\":1280,\"startXs\":0,\"startYs\":0,\"widths\":720}},\"screenIds\":2,\ - \"videoParams\":{\"codecTypes\":2,\"colorFormats\":3,\"fpss\":30,\"screenHeights\":1280,\ - \"screenWidths\":720,\"videoHeights\":1280,\"videoWidths\":720}}"; + const std::string eventContent = "{\"dhIds\":\"SCREEN#0\", \"mapRelations\":{\"displayIds\":0, \ + \"displayRects\":{\"heights\":1280, \"startXs\":0, \"startYs\":0, \"widths\":720}, \"screenIds\":2, \ + \"screenRects\":{\"heights\":1280, \"startXs\":0, \"startYs\":0, \"widths\":720}}, \"screenIds\":2, \ + \"videoParams\":{\"codecTypes\":2, \"colorFormats\":3, \"fpss\":30, \"screenHeights\":1280, \ + \"screenWidths\":720, \"videoHeights\":1280, \"videoWidths\":720}}"; ScreenRegionManager::GetInstance().HandleNotifySetUp(remoteDevId, eventContent); EXPECT_EQ(0, ScreenRegionManager::GetInstance().screenRegions_.size()); @@ -176,11 +176,11 @@ HWTEST_F(ScreenRegionManagerTest, HandleNotifySetUp_003, TestSize.Level1) { ScreenRegionManager::GetInstance().screenRegions_.clear(); const std::string remoteDevId = "sourceDevId"; - const std::string eventContent = "{\"dhIds\"\"SCREEN#0\",\"mapRelations\":{\"displayIds\":0,\ - \"displayRects\":{\"heights\":1280,\"startXs\":0,\"startYs\":0,\"widths\":720},\"screenIds\":2,\ - \"screenRects\":{\"heights\":1280,\"startXs\":0,\"startYs\":0,\"widths\":720}},\"screenIds\":2,\ - \"videoParams\":{\"codecTypes\":2,\"colorFormats\":3,\"fpss\":30,\"screenHeights\":1280,\ - \"screenWidths\":720,\"videoHeights\":1280,\"videoWidths\":720}}"; + const std::string eventContent = "{\"dhIds\"\"SCREEN#0\", \"mapRelations\":{\"displayIds\":0, \ + \"displayRects\":{\"heights\":1280, \"startXs\":0, \"startYs\":0, \"widths\":720}, \"screenIds\":2, \ + \"screenRects\":{\"heights\":1280, \"startXs\":0, \"startYs\":0, \"widths\":720}}, \"screenIds\":2, \ + \"videoParams\":{\"codecTypes\":2, \"colorFormats\":3, \"fpss\":30, \"screenHeights\":1280, \ + \"screenWidths\":720, \"videoHeights\":1280, \"videoWidths\":720}}"; ScreenRegionManager::GetInstance().HandleNotifySetUp(remoteDevId, eventContent); EXPECT_EQ(0, ScreenRegionManager::GetInstance().screenRegions_.size()); -- Gitee From f90a6a455f8a347dfc03761feb1aa9a564a0b393 Mon Sep 17 00:00:00 2001 From: yangli Date: Tue, 18 Jul 2023 16:47:17 +0800 Subject: [PATCH 7/7] 7.18 Signed-off-by: yangli --- .../dscreenmgr/1.0/src/dscreen_test.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 6fe2668e..1907cd7a 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 @@ -139,7 +139,7 @@ HWTEST_F(DScreenTest, HandleEnable_002, TestSize.Level1) dScreen_->curState_ = ENABLED; dScreen_->videoParam_ = nullptr; std::string param = "{\"codecType\":\"OMX_rk_video_encoder_avc\", \ - \"screenHeight\":1280,\"screenVersion\":\"1.0\",\"screenWidth\":720}"; + \"screenHeight\":1280, \"screenVersion\":\"1.0\", \"screenWidth\":720}"; std::string taskId = "taskId"; dScreen_->HandleEnable(param, taskId); int32_t ret = dScreen_->AddTask(task); @@ -159,7 +159,7 @@ HWTEST_F(DScreenTest, HandleEnable_003, TestSize.Level1) std::shared_ptr task = std::make_shared(TaskType::TASK_DISCONNECT, reqId, attrs); dScreen_->videoParam_ = std::make_shared(); std::string param = "{\"codecType\":\"OMX_rk_video_encoder_avc\", \ - \"screenHeight\":1280,\"screenVersion\":\"1.0\",\"screenWidth\":720}"; + \"screenHeight\":1280, \"screenVersion\":\"1.0\", \"screenWidth\":720}"; std::string taskId = "taskId"; dScreen_->HandleEnable(param, taskId); int32_t ret = dScreen_->AddTask(task); @@ -178,8 +178,8 @@ HWTEST_F(DScreenTest, HandleEnable_004, TestSize.Level1) std::string attrs = "attrs"; std::shared_ptr task = std::make_shared(TaskType::TASK_DISCONNECT, reqId, attrs); dScreen_->videoParam_ = std::make_shared(); - std::string param = "{\"codecType\":\"[\"OMX_rk_video_encoder_avc\",\"OMX_rk_video_encoder_hevc\", \ - \"avenc_mpeg4\"]\",\"screenHeight\":1280,\"screenVersion\":\"1.0\",\"screenWidth\":720}"; + std::string param = "{\"codecType\":\"[\"OMX_rk_video_encoder_avc\", \"OMX_rk_video_encoder_hevc\", \ + \"avenc_mpeg4\"]\", \"screenHeight\":1280, \"screenVersion\":\"1.0\", \"screenWidth\":720}"; std::string taskId = "taskId"; dScreen_->HandleEnable(param, taskId); int32_t ret = dScreen_->AddTask(task); @@ -198,8 +198,8 @@ HWTEST_F(DScreenTest, HandleEnable_005, TestSize.Level1) std::string attrs = "attrs"; std::shared_ptr task = std::make_shared(TaskType::TASK_DISCONNECT, reqId, attrs); dScreen_->videoParam_ = std::make_shared(); - std::string param = "{\"codecType\":\"[\"OMX_rk_video_encoder_avc\",\"OMX_rk_video_encoder_hevc\", \ - \"avenc_mpeg4\"]\",\"screenHeight\":1280,\"screenVersion\":\"1.0\",\"screenWidth\":720}"; + std::string param = "{\"codecType\":\"[\"OMX_rk_video_encoder_avc\", \"OMX_rk_video_encoder_hevc\", \ + \"avenc_mpeg4\"]\", \"screenHeight\":1280, \"screenVersion\":\"1.0\", \"screenWidth\":720}"; std::string screenName = DSCREEN_PREFIX + SEPERATOR + GetInterruptString(dScreen_->devId_) + SEPERATOR + GetInterruptString(dScreen_->dhId_); @@ -307,7 +307,7 @@ HWTEST_F(DScreenTest, NegotiateCodecType_001, TestSize.Level1) */ HWTEST_F(DScreenTest, NegotiateCodecType_002, TestSize.Level1) { - std::string remoteCodecInfoStr = "{\"codecType\":\"[\"OMX_rk_video_encoder_avc\",\"OMX_rk_video_encoder_hevc\", \ + std::string remoteCodecInfoStr = "{\"codecType\":\"[\"OMX_rk_video_encoder_avc\", \"OMX_rk_video_encoder_hevc\", \ \"avenc_mpeg4\"]\"}"; int32_t ret = dScreen_->NegotiateCodecType(remoteCodecInfoStr); EXPECT_EQ(ERR_DH_SCREEN_SA_DSCREEN_NEGOTIATE_CODEC_FAIL, ret); -- Gitee