From 4997293c873c943c9af6ff6c3dc8e2fa5abfa3ab Mon Sep 17 00:00:00 2001
From: mingzhu_pearl <limingzhu10@huawei.com>
Date: Thu, 9 Feb 2023 01:47:17 +0000
Subject: [PATCH] separate IConsumerSurface from Surface -- Surface Refactoring
 step 1

Signed-off-by: mingzhu_pearl <limingzhu10@huawei.com>
Change-Id: I151a04cfc8b9ebb312cb6440d64ef2a6ab2f3f75
---
 .../src/image_sink_decoder_test.cpp                 |  7 +++++--
 .../src/image_sink_processor_test.cpp               | 13 +++++++++----
 .../screensinktrans/src/screen_sink_trans_test.cpp  | 12 +++++++++---
 3 files changed, 23 insertions(+), 9 deletions(-)

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 61c6b237..0f339cc8 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 = Surface::CreateSurfaceAsConsumer("test");
+    sptr<IConsumerSurface> surface = IConsumerSurface::Create("test");
+    sptr<IBufferProducer> bp = surface->GetProducer();
+    sptr<Surface> 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 1f61e554..30d0a654 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 = Surface::CreateSurfaceAsConsumer("test");
-    EXPECT_EQ(ERR_DH_SCREEN_CODEC_SURFACE_ERROR, processor_->SetImageSurface(surface));
+    sptr<IConsumerSurface> surface = IConsumerSurface::Create("test");
+    sptr<IBufferProducer> bp = surface->GetProducer();
+    sptr<Surface> 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 = Surface::CreateSurfaceAsConsumer("test");
-    EXPECT_EQ(ERR_DH_SCREEN_TRANS_NULL_VALUE, processor_->SetImageSurface(surface));
+    sptr<IConsumerSurface> surface = IConsumerSurface::Create("test");
+    sptr<IBufferProducer> bp = surface->GetProducer();
+    sptr<Surface> 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 9a175a2b..cf08994a 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 <chrono>
 
 #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<IConsumerSurface> cSurface = IConsumerSurface::Create("test");
+    sptr<IBufferProducer> bp = cSurface->GetProducer();
+    sptr<Surface> pSurface = Surface::CreateSurfaceAsProducer(bp);
     trans_ = std::make_shared<ScreenSinkTrans>();
     trans_->imageProcessor_ = std::make_shared<ImageSinkProcessor>();
     trans_->screenChannel_ = std::make_shared<ScreenDataChannelImpl>(peerDevId_);
-    trans_->decoderSurface_ = Surface::CreateSurfaceAsConsumer("test");
+    trans_->decoderSurface_ = pSurface;
     trans_->transCallback_ = std::make_shared<MockIScreenSinkTransCallback>();
 
     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 = Surface::CreateSurfaceAsConsumer("test");
-    EXPECT_EQ(DH_SUCCESS, trans_->SetImageSurface(surface));
+    sptr<IConsumerSurface> surface = IConsumerSurface::Create("test");
+    sptr<IBufferProducer> bufferProducer = surface->GetProducer();
+    sptr<Surface> producerSurface = Surface::CreateSurfaceAsProducer(bufferProducer);
+    EXPECT_EQ(DH_SUCCESS, trans_->SetImageSurface(producerSurface));
 }
 
 /**
-- 
Gitee