From 375703743cbb8e81d04721795a66a4bccd8f2876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=93=92?= Date: Wed, 9 Jul 2025 09:12:06 +0000 Subject: [PATCH] =?UTF-8?q?alloc=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘瓒 Change-Id: I52312480ed84c70a3890fac380196332ba35e986 --- .../av_thumbnail_generator_unittest.cpp | 2 +- .../av_thumbnail_generator_unittest.h | 3 ++- .../avmetadatahelper_impl_unittest/mock/mock_avbuffer.h | 3 ++- .../include/avmetadata_unittest.h | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/unittest/avmetadata_helper_unittest/av_thumbnail_generator_unittest.cpp b/test/unittest/avmetadata_helper_unittest/av_thumbnail_generator_unittest.cpp index 8de6b6a50..af9d50889 100644 --- a/test/unittest/avmetadata_helper_unittest/av_thumbnail_generator_unittest.cpp +++ b/test/unittest/avmetadata_helper_unittest/av_thumbnail_generator_unittest.cpp @@ -310,7 +310,7 @@ HWTEST_F(AVThumbnailGeneratorUnitTest, GenerateAlignmentAvBuffer, TestSize.Level ASSERT_NE(avThumbnailGenerator_, nullptr); auto mockSurfaceBuffer = new MockSurfaceBuffer(); EXPECT_CALL(*(mockSurfaceBuffer), GetWidth()).WillRepeatedly(Return(NUM_TEST)); - EXPECT_CALL(*(mockSurfaceBuffer), Alloc(_)).WillRepeatedly(Return(GSError::GSERROR_OK)); + EXPECT_CALL(*(mockSurfaceBuffer), Alloc(_, _)).WillRepeatedly(Return(GSError::GSERROR_OK)); EXPECT_CALL(*(mockSurfaceBuffer), GetHeight()).WillRepeatedly(Return(NUM_TEST)); EXPECT_CALL(*(mockSurfaceBuffer), GetFormat()). WillRepeatedly(Return(static_cast(GraphicPixelFormat::GRAPHIC_PIXEL_FMT_YCBCR_P010))); diff --git a/test/unittest/avmetadata_helper_unittest/av_thumbnail_generator_unittest.h b/test/unittest/avmetadata_helper_unittest/av_thumbnail_generator_unittest.h index 8eb96002e..1a85ec480 100644 --- a/test/unittest/avmetadata_helper_unittest/av_thumbnail_generator_unittest.h +++ b/test/unittest/avmetadata_helper_unittest/av_thumbnail_generator_unittest.h @@ -84,7 +84,8 @@ public: MOCK_METHOD(void, SetBufferHandle, (BufferHandle *handle), (override)); MOCK_METHOD(BufferHandle*, GetBufferHandle, (), (const, override)); MOCK_METHOD(void*, GetVirAddr, (), (override)); - MOCK_METHOD(GSError, Alloc, (const BufferRequestConfig &config), (override)); + MOCK_METHOD(GSError, Alloc, (const BufferRequestConfig &config, const sptr& previousBuffer), + (override)); MOCK_METHOD(GSError, Map, (), (override)); MOCK_METHOD(GSError, Unmap, (), (override)); MOCK_METHOD(GSError, FlushCache, (), (override)); diff --git a/test/unittest/avmetadatahelper_impl_unittest/mock/mock_avbuffer.h b/test/unittest/avmetadatahelper_impl_unittest/mock/mock_avbuffer.h index a425eb999..e4c43c0b3 100644 --- a/test/unittest/avmetadatahelper_impl_unittest/mock/mock_avbuffer.h +++ b/test/unittest/avmetadatahelper_impl_unittest/mock/mock_avbuffer.h @@ -128,7 +128,8 @@ public: MOCK_METHOD(void, SetBufferHandle, (BufferHandle *handle), (override)); MOCK_METHOD(BufferHandle*, GetBufferHandle, (), (const, override)); MOCK_METHOD(void*, GetVirAddr, (), (override)); - MOCK_METHOD(GSError, Alloc, (const BufferRequestConfig &config), (override)); + MOCK_METHOD(GSError, Alloc, (const BufferRequestConfig &config, const sptr& previousBuffer), + (override)); MOCK_METHOD(GSError, Map, (), (override)); MOCK_METHOD(GSError, Unmap, (), (override)); MOCK_METHOD(GSError, FlushCache, (), (override)); diff --git a/test/unittest/native_avmetadatahelper_unittest/include/avmetadata_unittest.h b/test/unittest/native_avmetadatahelper_unittest/include/avmetadata_unittest.h index d346eb596..69adf2319 100644 --- a/test/unittest/native_avmetadatahelper_unittest/include/avmetadata_unittest.h +++ b/test/unittest/native_avmetadatahelper_unittest/include/avmetadata_unittest.h @@ -82,7 +82,8 @@ public: MOCK_METHOD(void, SetBufferHandle, (BufferHandle *handle), (override)); MOCK_METHOD(BufferHandle*, GetBufferHandle, (), (const, override)); MOCK_METHOD(void*, GetVirAddr, (), (override)); - MOCK_METHOD(GSError, Alloc, (const BufferRequestConfig &config), (override)); + MOCK_METHOD(GSError, Alloc, (const BufferRequestConfig &config, const sptr& previousBuffer), + (override)); MOCK_METHOD(GSError, Map, (), (override)); MOCK_METHOD(GSError, Unmap, (), (override)); MOCK_METHOD(GSError, FlushCache, (), (override)); -- Gitee