openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-23 10:09:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!7671 Bugfix JSON.stringify when value type is JSNativePointer

Browse Source 
Merge pull request !7671 from chenjingxiang/stringify_native_pointer_br
This commit is contained in:
openharmony_ci 2024-06-05 02:09:38 +00:00 committed by Gitee
commit b4d624d93b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecmascript/base/json_stringifier.cpp
View File

@ -326,6 +326,10 @@ JSTaggedValue JsonStringifier::SerializeJSONProperty(const JSHandle<JSTaggedValu
case JSType::BIGINT: {
THROW_TYPE_ERROR_AND_RETURN(thread_, "cannot serialize a BigInt", JSTaggedValue::Exception());
}
case JSType::JS_NATIVE_POINTER: {
result_ += "{}";
return tagValue;
}
default: {
if (!tagValue.IsCallable()) {
JSHClass *jsHclass = tagValue.GetTaggedObject()->GetClass();

58
ecmascript/base/tests/json_stringifier_test.cpp
View File

@ -321,4 +321,62 @@ HWTEST_F_L0(JsonStringifierTest, Stringify_008)
JSHandle<EcmaString> handleEcmaStr(resultString);
EXPECT_STREQ("\"\\\"\\\\\\b\\f\\n\\r\\t\"", EcmaStringAccessor(handleEcmaStr).ToCString().c_str());
}
static void* Detach(void *param1, void *param2, void *hint, void *detachData)
{
GTEST_LOG_(INFO) << "detach is running";
if (param1 == nullptr && param2 == nullptr) {
GTEST_LOG_(INFO) << "detach: two params is nullptr";
}
if (hint == nullptr && detachData) {
GTEST_LOG_(INFO) << "detach: hint is nullptr";
}
return nullptr;
}
static void* Attach([[maybe_unused]] void *enginePointer, [[maybe_unused]] void *buffer, [[maybe_unused]] void *hint,
[[maybe_unused]] void *attachData)
{
GTEST_LOG_(INFO) << "attach is running";
return nullptr;
}
static panda::JSNApi::NativeBindingInfo* CreateNativeBindingInfo(void* attach, void* detach)
{
GTEST_LOG_(INFO) << "CreateNativeBindingInfo";
auto info = panda::JSNApi::NativeBindingInfo::CreateNewInstance();
info->attachFunc = attach;
info->detachFunc = detach;
return info;
}
HWTEST_F_L0(JsonStringifierTest, Stringify_009)
{
ObjectFactory *factory = thread->GetEcmaVM()->GetFactory();
JsonStringifier stringifier(thread);
EcmaVM *ecmaVM = thread->GetEcmaVM();
JSHandle<GlobalEnv> globalEnv = ecmaVM->GetGlobalEnv();
JSHandle<JSTaggedValue> objectFunc(globalEnv->GetObjectFunction());
JSHandle<JSObject> jsObject(factory->NewJSObjectByConstructor(JSHandle<JSFunction>(objectFunc), objectFunc));
EXPECT_TRUE(*jsObject != nullptr);
JSHandle<JSTaggedValue> key1(factory->NewFromASCII("key1"));
auto info = CreateNativeBindingInfo(reinterpret_cast<void*>(Attach), reinterpret_cast<void*>(Detach));
JSHandle<JSTaggedValue> value1(factory->NewJSNativePointer(reinterpret_cast<void*>(info)));
JSObject::SetProperty(thread, JSHandle<JSTaggedValue>(jsObject), key1, value1);
JSHandle<JSTaggedValue> key2(factory->NewFromASCII("key2"));
JSHandle<JSTaggedValue> value2(factory->NewFromASCII("abc"));
JSObject::SetProperty(thread, JSHandle<JSTaggedValue>(jsObject), key2, value2);
JSHandle<JSTaggedValue> handleValue(thread, jsObject.GetTaggedValue());
JSHandle<JSTaggedValue> handleReplacer(thread, JSTaggedValue::Undefined());
JSHandle<JSTaggedValue> handleGap(thread, JSTaggedValue::Undefined());
JSHandle<JSTaggedValue> resultString = stringifier.Stringify(handleValue, handleReplacer, handleGap);
EXPECT_TRUE(resultString->IsString());
JSHandle<EcmaString> handleEcmaStr(resultString);
EXPECT_STREQ("{\"key1\":{},\"key2\":\"abc\"}", EcmaStringAccessor(handleEcmaStr).ToCString().c_str());
}
} // namespace panda::test