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 61c6b23778161b267ad7d0b91fc5a8e0a0719259..0f339cc8280d99ec0ec4519e2bcc3f8e304de7ec 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 @@ -21,6 +21,7 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" #include "dscreen_log.h" +#include "iconsumer_surface.h" using namespace testing::ext; @@ -282,9 +283,11 @@ HWTEST_F(ImageSinkDecoderTest, set_decoder_format_test_007, TestSize.Level1) */ HWTEST_F(ImageSinkDecoderTest, set_output_surface_test_001, TestSize.Level1) { - sptr surface = Surface::CreateSurfaceAsConsumer("test"); + sptr surface = IConsumerSurface::Create("test"); + sptr bp = surface->GetProducer(); + sptr pSurface = Surface::CreateSurfaceAsProducer(bp); imageDecoder_->videoDecoder_ = nullptr; - EXPECT_EQ(ERR_DH_SCREEN_TRANS_NULL_VALUE, imageDecoder_->SetOutputSurface(surface)); + EXPECT_EQ(ERR_DH_SCREEN_TRANS_NULL_VALUE, imageDecoder_->SetOutputSurface(pSurface)); } /** 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 1f61e554ec02f5f5543b959f447881d14839c0f7..30d0a6548dfd1a8ce671446bd799f347f366b4a0 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 @@ -20,6 +20,7 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" +#include "iconsumer_surface.h" using namespace testing::ext; @@ -148,8 +149,10 @@ HWTEST_F(ImageSinkProcessorTest, stop_image_processor_test_002, TestSize.Level1) */ HWTEST_F(ImageSinkProcessorTest, set_image_surface_test_001, TestSize.Level1) { - sptr surface = Surface::CreateSurfaceAsConsumer("test"); - EXPECT_EQ(ERR_DH_SCREEN_CODEC_SURFACE_ERROR, processor_->SetImageSurface(surface)); + sptr surface = IConsumerSurface::Create("test"); + sptr bp = surface->GetProducer(); + sptr pSurface = Surface::CreateSurfaceAsProducer(bp); + EXPECT_EQ(ERR_DH_SCREEN_CODEC_SURFACE_ERROR, processor_->SetImageSurface(pSurface)); } /** @@ -161,8 +164,10 @@ HWTEST_F(ImageSinkProcessorTest, set_image_surface_test_001, TestSize.Level1) HWTEST_F(ImageSinkProcessorTest, set_image_surface_test_002, TestSize.Level1) { processor_->imageDecoder_ = nullptr; - sptr surface = Surface::CreateSurfaceAsConsumer("test"); - EXPECT_EQ(ERR_DH_SCREEN_TRANS_NULL_VALUE, processor_->SetImageSurface(surface)); + sptr surface = IConsumerSurface::Create("test"); + sptr bp = surface->GetProducer(); + sptr pSurface = Surface::CreateSurfaceAsProducer(bp); + EXPECT_EQ(ERR_DH_SCREEN_TRANS_NULL_VALUE, processor_->SetImageSurface(pSurface)); } /** 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 9a175a2b41e9da4dfb66be9c6763944f6eeb3532..cf08994a90e70eba09e9e2d9d6f8c7e5a66ed517 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 @@ -18,6 +18,7 @@ #include #include "dscreen_errcode.h" +#include "iconsumer_surface.h" #include "image_sink_processor.h" #include "screen_data_channel_impl.h" @@ -32,10 +33,13 @@ void ScreenSinkTransTest::TearDownTestCase(void) {} void ScreenSinkTransTest::SetUp(void) { peerDevId_ = "test"; + sptr cSurface = IConsumerSurface::Create("test"); + sptr bp = cSurface->GetProducer(); + sptr pSurface = Surface::CreateSurfaceAsProducer(bp); trans_ = std::make_shared(); trans_->imageProcessor_ = std::make_shared(); trans_->screenChannel_ = std::make_shared(peerDevId_); - trans_->decoderSurface_ = Surface::CreateSurfaceAsConsumer("test"); + trans_->decoderSurface_ = pSurface; trans_->transCallback_ = std::make_shared(); param_.screenWidth_ = DSCREEN_MAX_SCREEN_DATA_WIDTH; @@ -168,8 +172,10 @@ HWTEST_F(ScreenSinkTransTest, register_state_callback_test_002, TestSize.Level1) */ HWTEST_F(ScreenSinkTransTest, set_image_surface_test_001, TestSize.Level1) { - sptr surface = Surface::CreateSurfaceAsConsumer("test"); - EXPECT_EQ(DH_SUCCESS, trans_->SetImageSurface(surface)); + sptr surface = IConsumerSurface::Create("test"); + sptr bufferProducer = surface->GetProducer(); + sptr producerSurface = Surface::CreateSurfaceAsProducer(bufferProducer); + EXPECT_EQ(DH_SUCCESS, trans_->SetImageSurface(producerSurface)); } /**