openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-27 09:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!5418 析构函数书写错误修改

Browse Source 
Merge pull request !5418 from chenyuyan/master0509
This commit is contained in:
openharmony_ci 2023-05-17 01:39:31 +00:00 committed by Gitee
commit c5bd77e6d8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js_environment/interfaces/inner_api/uncaught_exception_callback.h
View File

@ -49,7 +49,7 @@ public:
: uncaughtTask_(uncaughtTask), sourceMapOperator_(sourceMapOperator)
{}
UncaughtExceptionCallback() = default;
~UncaughtExceptionCallback() = default;
void operator()(NativeValue* value);

22
js_environment/test/unittest/uncaught_exception_callback_test/uncaught_exception_callback_test.cpp
View File

@ -60,7 +60,10 @@ HWTEST_F(UncaughtExceptionCallbackTest, UncaughtExceptionCallbackTest_0100, Test
ASSERT_NE(jsRuntime, nullptr);
// Test with null object
UncaughtExceptionCallback callback;
auto task = [](std::string summary, const JsEnv::ErrorObject errorObj) {
summary += "test";
};
UncaughtExceptionCallback callback(task, nullptr);
ASSERT_EQ(callback.GetNativeStrFromJsTaggedObj(nullptr, "key"), "");
// Test with invalid object
@ -68,7 +71,7 @@ HWTEST_F(UncaughtExceptionCallbackTest, UncaughtExceptionCallbackTest_0100, Test
EXPECT_NE(engine, nullptr);
NativeValue* objValue = engine->CreateObject();
NativeObject* object = ConvertNativeValueTo<NativeObject>(objValue);
UncaughtExceptionCallback callback2;
UncaughtExceptionCallback callback2(task, nullptr);
ASSERT_EQ(callback2.GetNativeStrFromJsTaggedObj(ConvertNativeValueTo<NativeObject>(objValue), "key"), "");
// Test with valid object
@ -82,7 +85,7 @@ HWTEST_F(UncaughtExceptionCallbackTest, UncaughtExceptionCallbackTest_0100, Test
object->SetProperty("message", nativeErrorMsg);
object->SetProperty("name", nativeErrorName);
object->SetProperty("stack", nativeErrorStack);
UncaughtExceptionCallback callback3;
UncaughtExceptionCallback callback3(task, nullptr);
ASSERT_EQ(callback3.GetNativeStrFromJsTaggedObj(object, "message"), errorMsg);
ASSERT_EQ(callback3.GetNativeStrFromJsTaggedObj(object, "name"), errorName);
ASSERT_EQ(callback3.GetNativeStrFromJsTaggedObj(object, "stack"), errorStack);
@ -103,8 +106,11 @@ HWTEST_F(UncaughtExceptionCallbackTest, UncaughtExceptionCallbackTest_0200, Test
ASSERT_NE(jsRuntime, nullptr);
// Test with null object
auto task = [](std::string summary, const JsEnv::ErrorObject errorObj) {
summary += "test";
};
NativeValue* nullValue = engine->CreateUndefined();
UncaughtExceptionCallback callback;
UncaughtExceptionCallback callback(task, nullptr);
callback(nullValue);
// Test with valid code, and errorStack is empty
@ -116,7 +122,7 @@ HWTEST_F(UncaughtExceptionCallbackTest, UncaughtExceptionCallbackTest_0200, Test
NativeValue* nativeErrorCode = engine->CreateString(errorCode.c_str(), errorCode.length());
object->SetProperty("code", nativeErrorCode);
UncaughtExceptionCallback callback1;
UncaughtExceptionCallback callback1(task, nullptr);
callback1(objValue);
}
@ -146,8 +152,10 @@ HWTEST_F(UncaughtExceptionCallbackTest, UncaughtExceptionCallbackTest_0300, Test
NativeValue* nativeErrorStack = engine->CreateString(errorStack.c_str(), errorStack.length());
object->SetProperty("code", nativeErrorCode);
object->SetProperty("stack", nativeErrorStack);
UncaughtExceptionCallback callback;
auto task = [](std::string summary, const JsEnv::ErrorObject errorObj) {
summary += "test";
};
UncaughtExceptionCallback callback(task, nullptr);
callback(objValue);
}