From a6721b379a2c7f4c83384a1cbc8e2b4ef39502d7 Mon Sep 17 00:00:00 2001 From: sandee Date: Tue, 12 Aug 2025 14:56:48 +0800 Subject: [PATCH] Sync code with master branch Issue: https://gitee.com/openharmony/commonlibrary_ets_utils/issues/ICSAWB Signed-off-by: sandee Change-Id: Ia2f9c591932385209c5bea77cf797c043fa23f33 --- native_engine/impl/ark/ark_native_engine.cpp | 21 -- test/unittest/test_sendable_napi.cpp | 192 ------------------- 2 files changed, 213 deletions(-) diff --git a/native_engine/impl/ark/ark_native_engine.cpp b/native_engine/impl/ark/ark_native_engine.cpp index 58b29d268..e559f08bd 100644 --- a/native_engine/impl/ark/ark_native_engine.cpp +++ b/native_engine/impl/ark/ark_native_engine.cpp @@ -1732,15 +1732,6 @@ bool ArkNativeEngine::NapiNewSendableTypedArray(NativeTypedArrayType typedArrayT case NATIVE_UINT8_CLAMPED_ARRAY: typedArray = panda::SharedUint8ClampedArrayRef::New(vm_, arrayBuf, byte_offset, length); break; - case NATIVE_FLOAT64_ARRAY: - typedArray = panda::SharedFloat64ArrayRef::New(vm_, arrayBuf, byte_offset, length); - break; - case NATIVE_BIGINT64_ARRAY: - typedArray = panda::SharedBigInt64ArrayRef::New(vm_, arrayBuf, byte_offset, length); - break; - case NATIVE_BIGUINT64_ARRAY: - typedArray = panda::SharedBigUint64ArrayRef::New(vm_, arrayBuf, byte_offset, length); - break; default: *result = nullptr; return false; @@ -1768,12 +1759,6 @@ NativeTypedArrayType ArkNativeEngine::GetTypedArrayType(panda::LocalIsFloat32Array(vm_)) { thisType = NATIVE_FLOAT32_ARRAY; - } else if (typedArray->IsFloat64Array(vm_)) { - thisType = NATIVE_FLOAT64_ARRAY; - } else if (typedArray->IsBigInt64Array(vm_)) { - thisType = NATIVE_BIGINT64_ARRAY; - } else if (typedArray->IsBigUint64Array(vm_)) { - thisType = NATIVE_BIGUINT64_ARRAY; } return thisType; @@ -1798,12 +1783,6 @@ NativeTypedArrayType ArkNativeEngine::GetSendableTypedArrayType(panda::LocalIsJSSharedUint8ClampedArray(vm_)) { thisType = NATIVE_UINT8_CLAMPED_ARRAY; - } else if (typedArray->IsJSSharedFloat64Array(vm_)) { - thisType = NATIVE_FLOAT64_ARRAY; - } else if (typedArray->IsJSSharedBigInt64Array(vm_)) { - thisType = NATIVE_BIGINT64_ARRAY; - } else if (typedArray->IsJSSharedBigUint64Array(vm_)) { - thisType = NATIVE_BIGUINT64_ARRAY; } return thisType; diff --git a/test/unittest/test_sendable_napi.cpp b/test/unittest/test_sendable_napi.cpp index 51d531ba5..085471fc5 100644 --- a/test/unittest/test_sendable_napi.cpp +++ b/test/unittest/test_sendable_napi.cpp @@ -1788,198 +1788,6 @@ HWTEST_F(NapiSendableTest, CreateSendableTypedArray018, testing::ext::TestSize.L } } -/** - * @tc.name: CreateSendableTypedArray019 - * @tc.desc: Test napi_create_sendable_arraybuffer. - * @tc.type: FUNC - */ -HWTEST_F(NapiSendableTest, CreateSendableTypedArray019, testing::ext::TestSize.Level1) -{ - ASSERT_NE(engine_, nullptr); - napi_env env = reinterpret_cast(engine_); - napi_status res = napi_ok; - - void *data; - napi_value arraybuffer = nullptr; - res = napi_create_sendable_arraybuffer(env, 57, &data, &arraybuffer); - ASSERT_EQ(res, napi_ok); - - napi_value result = nullptr; - res = napi_create_sendable_typedarray(env, napi_float64_array, 6, arraybuffer, 8, &result); - ASSERT_EQ(res, napi_ok); - - bool isShared = false; - res = napi_is_sendable(env, result, &isShared); - ASSERT_EQ(res, napi_ok); - ASSERT_EQ(isShared, true); - - bool isTypedArray = false; - res = napi_is_typedarray(env, result, &isTypedArray); - ASSERT_EQ(res, napi_ok); - ASSERT_EQ(isTypedArray, true); - - napi_typedarray_type type = napi_uint8_array; - size_t length = 0; - void *getData = nullptr; - napi_value getArrayBuffer = nullptr; - size_t byteOffset = 0; - res = napi_get_typedarray_info(env, result, &type, &length, &getData, &getArrayBuffer, &byteOffset); - ASSERT_EQ(res, napi_ok); - - bool isEqual = false; - res = napi_strict_equals(env, arraybuffer, getArrayBuffer, &isEqual); - ASSERT_EQ(res, napi_ok); - - ASSERT_EQ(type, napi_float64_array); - ASSERT_EQ(length, 48); - ASSERT_EQ(reinterpret_cast(getData), reinterpret_cast(data) + 8); - ASSERT_EQ(isEqual, true); - ASSERT_EQ(byteOffset, 8); -} - -/** - * @tc.name: CreateSendableTypedArray020 - * @tc.desc: Test napi_create_sendable_arraybuffer. - * @tc.type: FUNC - */ -HWTEST_F(NapiSendableTest, CreateSendableTypedArray020, testing::ext::TestSize.Level1) -{ - ASSERT_NE(engine_, nullptr); - napi_env env = reinterpret_cast(engine_); - napi_status res = napi_ok; - - void *data; - napi_value arraybuffer = nullptr; - res = napi_create_sendable_arraybuffer(env, 57, &data, &arraybuffer); - ASSERT_EQ(res, napi_ok); - - napi_value result = nullptr; - res = napi_create_sendable_typedarray(env, napi_bigint64_array, 6, arraybuffer, 8, &result); - ASSERT_EQ(res, napi_ok); - - bool isShared = false; - res = napi_is_sendable(env, result, &isShared); - ASSERT_EQ(res, napi_ok); - ASSERT_EQ(isShared, true); - - bool isTypedArray = false; - res = napi_is_typedarray(env, result, &isTypedArray); - ASSERT_EQ(res, napi_ok); - ASSERT_EQ(isTypedArray, true); - - napi_typedarray_type type = napi_uint8_array; - size_t length = 0; - void *getData = nullptr; - napi_value getArrayBuffer = nullptr; - size_t byteOffset = 0; - res = napi_get_typedarray_info(env, result, &type, &length, &getData, &getArrayBuffer, &byteOffset); - ASSERT_EQ(res, napi_ok); - - bool isEqual = false; - res = napi_strict_equals(env, arraybuffer, getArrayBuffer, &isEqual); - ASSERT_EQ(res, napi_ok); - - ASSERT_EQ(type, napi_bigint64_array); - ASSERT_EQ(length, 48); - ASSERT_EQ(reinterpret_cast(getData), reinterpret_cast(data) + 8); - ASSERT_EQ(isEqual, true); - ASSERT_EQ(byteOffset, 8); -} - -/** - * @tc.name: CreateSendableTypedArray021 - * @tc.desc: Test napi_create_sendable_arraybuffer. - * @tc.type: FUNC - */ -HWTEST_F(NapiSendableTest, CreateSendableTypedArray021, testing::ext::TestSize.Level1) -{ - ASSERT_NE(engine_, nullptr); - napi_env env = reinterpret_cast(engine_); - napi_status res = napi_ok; - - void *data; - napi_value arraybuffer = nullptr; - res = napi_create_sendable_arraybuffer(env, 57, &data, &arraybuffer); - ASSERT_EQ(res, napi_ok); - - napi_value result = nullptr; - res = napi_create_sendable_typedarray(env, napi_biguint64_array, 6, arraybuffer, 8, &result); - ASSERT_EQ(res, napi_ok); - - bool isShared = false; - res = napi_is_sendable(env, result, &isShared); - ASSERT_EQ(res, napi_ok); - ASSERT_EQ(isShared, true); - - bool isTypedArray = false; - res = napi_is_typedarray(env, result, &isTypedArray); - ASSERT_EQ(res, napi_ok); - ASSERT_EQ(isTypedArray, true); - - napi_typedarray_type type = napi_uint8_array; - size_t length = 0; - void *getData = nullptr; - napi_value getArrayBuffer = nullptr; - size_t byteOffset = 0; - res = napi_get_typedarray_info(env, result, &type, &length, &getData, &getArrayBuffer, &byteOffset); - ASSERT_EQ(res, napi_ok); - - bool isEqual = false; - res = napi_strict_equals(env, arraybuffer, getArrayBuffer, &isEqual); - ASSERT_EQ(res, napi_ok); - - ASSERT_EQ(type, napi_biguint64_array); - ASSERT_EQ(length, 48); - ASSERT_EQ(reinterpret_cast(getData), reinterpret_cast(data) + 8); - ASSERT_EQ(isEqual, true); - ASSERT_EQ(byteOffset, 8); -} - -/** - * @tc.name: CreateSendableTypedArray022 - * @tc.desc: Test napi_create_sendable_arraybuffer. - * @tc.type: FUNC - */ -HWTEST_F(NapiSendableTest, CreateSendableTypedArray022, testing::ext::TestSize.Level1) -{ - static size_t LENGTH = 1024; - ASSERT_NE(engine_, nullptr); - napi_env env = reinterpret_cast(engine_); - napi_status res = napi_ok; - - void *data; - napi_value arraybuffer = nullptr; - napi_value result = nullptr; - res = napi_create_sendable_arraybuffer(env, LENGTH, &data, &arraybuffer); - ASSERT_EQ(res, napi_ok); - - bool isShared = false; - res = napi_is_sendable(env, arraybuffer, &isShared); - ASSERT_EQ(res, napi_ok); - ASSERT_EQ(isShared, true); - - res = napi_create_sendable_typedarray(env, napi_uint8_clamped_array, LENGTH / 2, arraybuffer, 1, &result); - ASSERT_EQ(res, napi_ok); - - res = napi_create_sendable_typedarray(env, napi_float64_array, LENGTH / 2, nullptr, 1, &result); - ASSERT_EQ(res, napi_invalid_arg); - - res = napi_create_sendable_typedarray(env, napi_float64_array, LENGTH / 2, nullptr, 1, &result); - ASSERT_EQ(res, napi_invalid_arg); - - res = napi_create_sendable_typedarray(env, napi_bigint64_array, LENGTH / 2, nullptr, 1, &result); - ASSERT_EQ(res, napi_invalid_arg); - - res = napi_create_sendable_typedarray(env, napi_bigint64_array, LENGTH / 2, nullptr, 1, &result); - ASSERT_EQ(res, napi_invalid_arg); - - res = napi_create_sendable_typedarray(env, napi_biguint64_array, LENGTH / 2, nullptr, 1, &result); - ASSERT_EQ(res, napi_invalid_arg); - - res = napi_create_sendable_typedarray(env, napi_biguint64_array, LENGTH / 2, nullptr, 1, &result); - ASSERT_EQ(res, napi_invalid_arg); -} - /** * @tc.name: IsDetachedSendableArrayBufferTest001 * @tc.desc: Test is DetachedSendableArrayBuffer. -- Gitee