diff --git a/frameworks/js/napi/file_access_module/napi_observer_callback.cpp b/frameworks/js/napi/file_access_module/napi_observer_callback.cpp index 682ab9c4c6e21bb6a93764451b9a9eeaeaa4a338..748d7e6b558a494a835cb2dc314ee4b79c19b4da 100644 --- a/frameworks/js/napi/file_access_module/napi_observer_callback.cpp +++ b/frameworks/js/napi/file_access_module/napi_observer_callback.cpp @@ -137,15 +137,18 @@ void NapiObserver::OnChange(NotifyMessage ¬ifyMessage) } std::unique_ptr callbackParam = std::make_unique(this, notifyMessage); work_->data = callbackParam.get(); - int ret = uv_queue_work(loop, work_.get(), - [](uv_work_t *work) {}, - [](uv_work_t *work, int status) { - NapiWorkScope(work, status); - }); - if (ret == 0) { - callbackParam.release(); - work_.release(); + + auto task = [work {work_.get()}]() { + NapiWorkScope(work, 0); + }; + auto ret = napi_send_event(env_, task, napi_eprio_high); + if (ret != napi_ok) { + HILOG_ERROR("failed to napi_send_event, ret:%{public}d.", ret); + return; } + + callbackParam.release(); + work_.release(); } } // namespace FileAccessFwk } // namespace OHOS \ No newline at end of file diff --git a/interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp b/interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp index 59fd196f9d8315af9aa35e3ee770d13ed684a795..65cf40eba1da2d7e85b68d02257e4d4abeb1a777 100644 --- a/interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp +++ b/interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp @@ -234,36 +234,29 @@ int JsFileAccessExtAbility::CallJsMethod(const std::string &funcName, JsRuntime HILOG_ERROR("failed to new param."); return EINVAL; } - auto work = std::make_shared(); - if (work == nullptr) { - HILOG_ERROR("failed to new uv_work_t."); - return EINVAL; - } - work->data = reinterpret_cast(param.get()); - int ret = uv_queue_work( - loop, work.get(), [](uv_work_t *work) {}, - [](uv_work_t *work, int status) { - CallJsParam *param = reinterpret_cast(work->data); - if (param == nullptr || param->jsRuntime == nullptr) { - HILOG_ERROR("failed to get CallJsParam."); - return; - } - napi_handle_scope scope = nullptr; - napi_env env = reinterpret_cast(&(param->jsRuntime->GetNativeEngine())); - napi_open_handle_scope(env, &scope); + auto task = [param {param.get()}]() { + if (param == nullptr || param->jsRuntime == nullptr) { + HILOG_ERROR("failed to get CallJsParam."); + return; + } + + napi_handle_scope scope = nullptr; + napi_env env = reinterpret_cast(&(param->jsRuntime->GetNativeEngine())); + napi_open_handle_scope(env, &scope); - if (DoCallJsMethod(param) != ERR_OK) { - HILOG_ERROR("failed to call DoCallJsMethod."); - } + if (DoCallJsMethod(param) != ERR_OK) { + HILOG_ERROR("failed to call DoCallJsMethod."); + } - std::unique_lock lock(param->fileOperateMutex); - param->isReady = true; - param->fileOperateCondition.notify_one(); - napi_close_handle_scope(env, scope); - }); - if (ret != 0) { - HILOG_ERROR("failed to exec uv_queue_work."); + std::unique_lock lock(param->fileOperateMutex); + param->isReady = true; + param->fileOperateCondition.notify_one(); + napi_close_handle_scope(env, scope); + }; + auto ret = napi_send_event(jsRuntime.GetNapiEnv(), task, napi_eprio_high); + if (ret != napi_ok) { + HILOG_ERROR("failed to napi_send_event, ret:%{public}d.", ret); return EINVAL; } std::unique_lock lock(param->fileOperateMutex); diff --git a/test/unittest/js_file_access_ext_ability_ex_test.cpp b/test/unittest/js_file_access_ext_ability_ex_test.cpp index d0fe9eae1cfa0fbe80a8b71c700788571c21118b..0e272c67b3e8f4fb7333bf04914b4ca8e6c1eafe 100644 --- a/test/unittest/js_file_access_ext_ability_ex_test.cpp +++ b/test/unittest/js_file_access_ext_ability_ex_test.cpp @@ -36,14 +36,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0000, t // 模拟获取uri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); auto result = ability->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, ERR_OK); // 模拟获取nativeOffset为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)).WillOnce(Return(napi_ok)); @@ -52,7 +52,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0000, t // 模拟获取nativeMaxCount为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -90,7 +90,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0001, t // 模拟获取nativeFilter为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -102,7 +102,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0001, t // 模拟获取nativeFilter成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -145,7 +145,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0002, t // 模拟创建nativeFilter失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -157,7 +157,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0002, t // 模拟设置fileFilter.suffixArray失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -179,7 +179,7 @@ static void CallListFileHeadSucceed(shared_ptr insMoc) { napi_value rslt = nullptr; EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -260,7 +260,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0004, t // 模拟获取fileFilter.nativeFileSizeOver失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -278,7 +278,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0004, t // 模拟获取fileFilter.nativeLastModifiedAfter失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -306,7 +306,7 @@ static void CallCreateNativeValueSucceed(shared_ptr insMoc) // 模拟调用CreateNativeValue成功 napi_value rslt = nullptr; EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -350,7 +350,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ListFile_0005, t // 模拟获取fileFilter.nativeExcludeMedia失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -667,14 +667,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0000, t // 模拟获取uri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); auto result = ability->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, ERR_OK); // 模拟获取nativeOffset为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)).WillOnce(Return(napi_ok)); @@ -683,7 +683,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0000, t // 模拟获取nativeMaxCount为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -721,7 +721,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0001, t // 模拟获取nativeFilter为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -733,7 +733,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0001, t // 模拟获取nativeFilter成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -776,7 +776,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0002, t // 模拟创建nativeFilter失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -788,7 +788,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0002, t // 模拟设置fileFilter.suffixArray失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -877,7 +877,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0004, t // 模拟获取fileFilter.nativeFileSizeOver失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -895,7 +895,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0004, t // 模拟获取fileFilter.nativeLastModifiedAfter失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -943,7 +943,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_ScanFile_0005, t // 模拟获取fileFilter.nativeExcludeMedia失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int64(_, _, _)) @@ -1257,14 +1257,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取nativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); auto result = ability->GetFileInfoFromUri(selectFile, fileInfo); EXPECT_EQ(result, ERR_OK); // 模拟获取code失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1305,7 +1305,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取fileInfo失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1323,7 +1323,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取fileInfo.uri失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1368,7 +1368,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取fileInfo.relativePath失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1387,7 +1387,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取fileInfo.fileName失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1432,7 +1432,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取fileInfo.mode失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1478,7 +1478,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取fileInfo.size失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1524,7 +1524,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取fileInfo.size失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1571,7 +1571,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取fileInfo.mimeType失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1625,7 +1625,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromU // 模拟获取value->code失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1675,14 +1675,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取nativePath为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); auto result = ability->GetFileInfoFromRelativePath(selectFileRealtivePath, fileInfo); EXPECT_EQ(result, ERR_OK); // 模拟获取code失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1725,7 +1725,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取fileInfo失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1743,7 +1743,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取fileInfo.uri失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1789,7 +1789,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取fileInfo.relativePath失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1808,7 +1808,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取fileInfo.fileName失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1854,7 +1854,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取fileInfo.mode失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1901,7 +1901,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取fileInfo.size失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1948,7 +1948,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取fileInfo.size失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1996,7 +1996,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取fileInfo.mimeType失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -2052,7 +2052,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetFileInfoFromR // 模拟获取value->code失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) diff --git a/test/unittest/js_file_access_ext_ability_other_test.cpp b/test/unittest/js_file_access_ext_ability_other_test.cpp index 8c39956a3948b75741e02d18e283f5c0ac0bafed..b7c0e1abdbf681c7ce3d680d7e391ac8b6c5a9fb 100644 --- a/test/unittest/js_file_access_ext_ability_other_test.cpp +++ b/test/unittest/js_file_access_ext_ability_other_test.cpp @@ -66,7 +66,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_MoveFile_0001, t // 模拟获取srcUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); auto result = ability->MoveFile(sourceFile, targetParent, fileName, newFile); @@ -74,7 +74,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_MoveFile_0001, t // 模拟获取dstUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); @@ -83,7 +83,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_MoveFile_0001, t // 模拟获取name为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) @@ -170,7 +170,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_MoveFile_0003, t // 模拟MoveFile调用成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -251,7 +251,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_MoveItem_0001, t // 模拟获取srcNativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_boolean(_, _, _)).WillOnce(Return(napi_ok)); auto result = ability->MoveItem(sourceFile, targetParent, moveResult, force); @@ -259,7 +259,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_MoveItem_0001, t // 模拟获取dstNativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(Return(napi_ok)); @@ -269,7 +269,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_MoveItem_0001, t // 模拟获取forceMove为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); @@ -307,7 +307,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_MoveItem_0002, t // 模拟MoveItem调用成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -528,14 +528,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_StartWatcher_000 // 模拟获取nativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); auto result = ability->StartWatcher(uri); EXPECT_EQ(result, false); // 模拟创建FuncCallback失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_function(_, _, _, _, _, _)).WillOnce(Return(napi_ok)); @@ -568,7 +568,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_StartWatcher_000 // 模拟获取ret失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_function(_, _, _, _, _, _)) @@ -613,7 +613,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_StartWatcher_000 // 模拟StartWatcher调用成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_function(_, _, _, _, _, _)) @@ -683,7 +683,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_StopWatcher_0001 // 模拟获取nativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); auto result = ability->StopWatcher(uri); EXPECT_EQ(result, false); @@ -714,7 +714,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_StopWatcher_0002 // 模拟获取ret失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -757,7 +757,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_StopWatcher_0003 // 模拟StopWatcher调用成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1135,7 +1135,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetRoots_0002, t // 模拟获取value->code失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -1182,7 +1182,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_GetRoots_0003, t // 模拟GetRoots调用成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -1256,7 +1256,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Access_0001, tes ability->jsObj_ = make_shared(); EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); @@ -1272,7 +1272,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Access_0001, tes EXPECT_EQ(result, ERR_OK); EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); @@ -1314,7 +1314,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Access_0002, tes ability->jsObj_ = make_shared(); EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); @@ -1332,7 +1332,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Access_0002, tes // 模拟获取value->code失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); @@ -1376,7 +1376,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Access_0003, tes // 模拟Access调用成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); diff --git a/test/unittest/js_file_access_ext_ability_test.cpp b/test/unittest/js_file_access_ext_ability_test.cpp index b0550b9b438280859b9df5ad30fb09a8eea446ac..eceedb8eb0b592d2a16f6df2d76ad15ab08d441d 100644 --- a/test/unittest/js_file_access_ext_ability_test.cpp +++ b/test/unittest/js_file_access_ext_ability_test.cpp @@ -203,12 +203,12 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CallJsMethod_000 EXPECT_EQ(result, EINVAL); EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(-1)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); result = ability->CallJsMethod(funcNameIn, *jsRuntime, jsObj, argParser, retParser); EXPECT_EQ(result, EINVAL); EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); result = ability->CallJsMethod(funcNameIn, *jsRuntime, jsObj, argParser, retParser); EXPECT_EQ(result, ERR_OK); } catch (...) { @@ -240,19 +240,19 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_DoCallJsMethod_0 }; ResultValueParser retParser = nullptr; EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(-1)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); auto result = ability->CallJsMethod(funcNameIn, *jsRuntime, jsObj, argParser, retParser); EXPECT_EQ(result, EINVAL); argParser = nullptr; EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(-1)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)).WillOnce(Return(napi_ok)); result = ability->CallJsMethod(funcNameIn, *jsRuntime, jsObj, argParser, retParser); EXPECT_EQ(result, EINVAL); EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(-1)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)).WillOnce(Return(napi_ok)); @@ -260,7 +260,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_DoCallJsMethod_0 EXPECT_EQ(result, EINVAL); EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(-1)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -296,7 +296,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_DoCallJsMethod_0 return false; }; EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(-1)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -306,7 +306,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_DoCallJsMethod_0 EXPECT_EQ(result, EINVAL); EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(-1)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -372,7 +372,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_OpenFile_0001, t // 模拟获取nativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_int32(_, _, _)).WillOnce(Return(napi_ok)); auto result = ability->OpenFile(uri, 0, fd); @@ -380,7 +380,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_OpenFile_0001, t // 模拟获取nativeFlags为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int32(_, _, _)).WillOnce(Return(napi_ok)); @@ -396,7 +396,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_OpenFile_0001, t static void MockNapiCalls(shared_ptr insMoc, napi_value rslt) { EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -411,7 +411,7 @@ static void MockNapiCalls(shared_ptr insMoc, napi_value rslt) static void MockNapiFunctionCalls(shared_ptr insMoc, const string& path, napi_value rslt) { EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) @@ -434,7 +434,7 @@ static void MockNapiFunctionCalls(shared_ptr insMoc, const string static void MockNapiFunctionCallsForCopy(shared_ptr insMoc, napi_value rslt) { EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); @@ -447,7 +447,7 @@ static void MockNapiFunctionCallsForCopy(shared_ptr insMoc, napi_ static void MockNapiFunctionCallsForCopyFile(shared_ptr insMoc, const string& path, napi_value rslt) { EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) @@ -597,14 +597,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CreateFile_0001, // 模拟获取nativeParent为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); auto result = ability->CreateFile(parent, displayName, newFile); EXPECT_EQ(result, E_GETRESULT); // 模拟获取nativeDisplayName为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(Return(napi_ok)); @@ -748,14 +748,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Mkdir_0001, test // 模拟获取nativeParent为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); auto result = ability->Mkdir(parent, displayName, newFile); EXPECT_EQ(result, E_GETRESULT); // 模拟获取nativeDisplayName为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(Return(napi_ok)); @@ -894,14 +894,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Delete_0001, tes // 模拟获取nativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)); auto result = ability->Delete(sourceFile); EXPECT_EQ(result, ERR_OK); // 模拟获取nativeDisplayName为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -943,7 +943,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Delete_0002, tes // 模拟Delete调用成功 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) @@ -1016,14 +1016,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Move_0001, testi // 模拟获取srcUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); auto result = ability->Move(sourceFile, targetParent, newFile); EXPECT_EQ(result, E_GETRESULT); // 模拟获取dstUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(Return(napi_ok)); @@ -1169,7 +1169,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0001, testi // 模拟获取srcNativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_boolean(_, _, _)).WillOnce(Return(napi_ok)); auto result = ability->Copy(sourceUri, destUri, copyResult, force); @@ -1177,7 +1177,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0001, testi // 模拟获取dstNativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(Return(napi_ok)); @@ -1187,7 +1187,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0001, testi // 模拟获取forceCopy为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); @@ -1509,7 +1509,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CopyFile_0001, t // 模拟获取srcNativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); auto result = ability->CopyFile(sourceUri, destUri, fileName, newFileUri); @@ -1517,7 +1517,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CopyFile_0001, t // 模拟获取dstNativeUri为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); @@ -1526,7 +1526,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CopyFile_0001, t // 模拟获取fileNativeName为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) @@ -1563,7 +1563,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CopyFile_0002, t // 模拟为reserve获取的size失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) @@ -1611,7 +1611,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CopyFile_0003, t // 模拟为resize获取的size失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) @@ -1661,7 +1661,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CopyFile_0004, t // 模拟获取uri成功但value->code失败 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) @@ -1862,14 +1862,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Rename_0001, tes // 模拟获取nativeSourceFile为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)).WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); auto result = ability->Rename(sourceFile, displayName, newFile); EXPECT_EQ(result, E_GETRESULT); // 模拟获取nativeDisplayName为空 EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_send_event(_, _, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) .WillOnce(Return(napi_ok)); diff --git a/test/unittest/mock/assistant.h b/test/unittest/mock/assistant.h index 616d1673f69dee07c92abf5d0a1d67b94c581768..19652f348694beb65b595bafae1e6be4eb5586bf 100644 --- a/test/unittest/mock/assistant.h +++ b/test/unittest/mock/assistant.h @@ -39,7 +39,7 @@ public: = 0; virtual napi_status napi_get_reference_value(napi_env, napi_ref, napi_value*) = 0; virtual napi_status napi_get_named_property(napi_env, napi_value, const char*, napi_value*) = 0; - virtual int uv_queue_work(uv_loop_t*, uv_work_t*, uv_work_cb, uv_after_work_cb) = 0; + virtual napi_status napi_send_event(napi_env, const std::function, napi_event_priority) = 0; virtual napi_status napi_get_value_int32(napi_env, napi_value, int32_t*) = 0; virtual napi_status napi_get_value_int64(napi_env, napi_value, int64_t*) = 0; virtual napi_status napi_create_string_utf8(napi_env, const char*, size_t, napi_value*) = 0; @@ -74,7 +74,7 @@ public: napi_value*)); MOCK_METHOD3(napi_get_reference_value, napi_status(napi_env, napi_ref, napi_value*)); MOCK_METHOD4(napi_get_named_property, napi_status(napi_env, napi_value, const char*, napi_value*)); - MOCK_METHOD4(uv_queue_work, int(uv_loop_t*, uv_work_t*, uv_work_cb, uv_after_work_cb)); + MOCK_METHOD3(napi_send_event, napi_status(napi_env, const std::function, napi_event_priority)); MOCK_METHOD3(napi_get_value_int32, napi_status(napi_env, napi_value, int32_t*)); MOCK_METHOD3(napi_get_value_int64, napi_status(napi_env, napi_value, int64_t*)); MOCK_METHOD3(napi_create_int64, napi_status(napi_env, int64_t, napi_value*)); diff --git a/test/unittest/mock/js_native_api_mock.cpp b/test/unittest/mock/js_native_api_mock.cpp index 8f36dfdae97ce16741177b4acbba1eeadd76a59f..855dbc4dbf4fcbcd488f51067c4d3dc39b579c34 100644 --- a/test/unittest/mock/js_native_api_mock.cpp +++ b/test/unittest/mock/js_native_api_mock.cpp @@ -16,17 +16,6 @@ #include "assistant.h" #include "uv.h" -int uv_queue_work(uv_loop_t* loop, uv_work_t* req, uv_work_cb work_cb, uv_after_work_cb after_work_cb) -{ - if (work_cb) { - work_cb(req); - } - if (after_work_cb) { - after_work_cb(req, 0); - } - return OHOS::FileAccessFwk::Assistant::ins_->uv_queue_work(loop, req, work_cb, after_work_cb); -} - napi_status napi_get_uv_event_loop(napi_env env, struct uv_loop_s** loop) { return OHOS::FileAccessFwk::Assistant::ins_->napi_get_uv_event_loop(env, loop); @@ -148,4 +137,12 @@ napi_status napi_get_undefined(napi_env env, napi_value* result) napi_status napi_get_value_bool(napi_env env, napi_value value, bool* result) { return OHOS::FileAccessFwk::Assistant::ins_->napi_get_value_bool(env, value, result); +} + +napi_status napi_send_event(napi_env env, const std::function cb, napi_event_priority priority) +{ + if (cb) { + cb(); + } + return OHOS::FileAccessFwk::Assistant::ins_->napi_send_event(env, cb, priority); } \ No newline at end of file