From 2920e4eb4aac44cfcb78bf5444953f98a735f832 Mon Sep 17 00:00:00 2001 From: huyx Date: Sat, 13 Apr 2024 17:33:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?native=5Fbuffer=E5=A2=9E=E5=8A=A0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn | 1 + .../test/buffer_handle/native_buffer_test.cpp | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn b/adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn index 324a6c4cc..c54269363 100644 --- a/adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn +++ b/adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn @@ -43,6 +43,7 @@ ohos_unittest("native_buffer_test") { external_deps = [ "c_utils:utils", "ipc:ipc_single", + "hilog:libhilog", ] } diff --git a/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp b/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp index ee20685a0..a525c5304 100644 --- a/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp +++ b/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp @@ -21,6 +21,7 @@ #include "base/buffer_util.h" #include "base/native_buffer.h" #include "osal_mem.h" +#include "hdf_log.h" using namespace testing::ext; using OHOS::MessageParcel; @@ -362,4 +363,34 @@ HWTEST_F(NativeBufferTest, NativeBufferTest016, TestSize.Level1) sptr destBuffer = NativeBuffer::Unmarshalling(parcel); ASSERT_EQ(destBuffer, nullptr); close(fd); +} + +// test native buffer +HWTEST_F(NativeBufferTest, NativeBufferTest017, TestSize.Level1) +{ + MessageParcel data; + sptr srcBuffer = new NativeBuffer(nullptr); + std::string sbuffer = srcBuffer->Dump(); + HDF_LOGI("srcBuffer : %{public}s", sbuffer.c_str()); + + BufferHandle *srcHandle = srcBuffer->Clone(); + ASSERT_EQ(srcHandle, nullptr); + + bool ret = data.WriteStrongParcelable(srcBuffer); + ASSERT_TRUE(ret); + + sptr destBuffer = data.ReadStrongParcelable(); + ASSERT_NE(destBuffer, nullptr); + + BufferHandle *destHandle = destBuffer->Clone(); + ASSERT_EQ(destHandle, nullptr); + + std::string dbuffer = destBuffer->Dump(); + HDF_LOGI("destBuffer : %{public}s", dbuffer.c_str()); + + NativeBuffer native; + NativeBuffer buffer1(native); + NativeBuffer buffer2; + buffer2 = buffer1; + ASSERT_EQ(buffer2.GetBufferHandle(), nullptr); } \ No newline at end of file -- Gitee From ca40257be9a6a3c7a9adb88b29d3b819cc91b8f8 Mon Sep 17 00:00:00 2001 From: huyx Date: Sat, 13 Apr 2024 18:38:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?native=5Fbuffer=E5=A2=9E=E5=8A=A0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn | 2 +- adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn b/adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn index c54269363..3fd8b23ba 100644 --- a/adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn +++ b/adapter/uhdf2/hdi/test/buffer_handle/BUILD.gn @@ -42,8 +42,8 @@ ohos_unittest("native_buffer_test") { external_deps = [ "c_utils:utils", - "ipc:ipc_single", "hilog:libhilog", + "ipc:ipc_single", ] } diff --git a/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp b/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp index a525c5304..6c61b0e79 100644 --- a/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp +++ b/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp @@ -371,7 +371,7 @@ HWTEST_F(NativeBufferTest, NativeBufferTest017, TestSize.Level1) MessageParcel data; sptr srcBuffer = new NativeBuffer(nullptr); std::string sbuffer = srcBuffer->Dump(); - HDF_LOGI("srcBuffer : %{public}s", sbuffer.c_str()); + HDF_LOGI("srcBuffer : %{public}s", sbuffer.c_str()); BufferHandle *srcHandle = srcBuffer->Clone(); ASSERT_EQ(srcHandle, nullptr); -- Gitee