diff --git a/js_concurrent_module/taskpool/test/test.cpp b/js_concurrent_module/taskpool/test/test.cpp index f5d946daa5771e13c6e1fb44b642f55da23a41b6..31e29e1a273dcf9de0586597b5823298f2f20e95 100755 --- a/js_concurrent_module/taskpool/test/test.cpp +++ b/js_concurrent_module/taskpool/test/test.cpp @@ -1001,45 +1001,22 @@ void NativeEngineTest::PerformTask(napi_env env, void* data) id = taskManager.taskQueues_[i]->DequeueTaskId(); } } + taskManager.workers_.clear(); + taskManager.idleWorkers_.clear(); Worker* worker = reinterpret_cast(WorkerConstructor(env)); napi_env workerEnv = nullptr; napi_create_runtime(env, &workerEnv); worker->workerEnv_ = workerEnv; + taskManager.workers_.insert(worker); + taskManager.idleWorkers_.insert(worker); Task* task = reinterpret_cast(data); taskManager.StoreTask(task); taskManager.SetIsPerformIdle(false); taskManager.taskQueues_[task->asyncTaskPriority_]->EnqueueTaskId(task->taskId_); + uv_async_t* req = new uv_async_t; req->data = worker; Worker::PerformTask(req); usleep(100000); // 100000: is sleep 100ms } - -void NativeEngineTest::GetIdleTaskByPriority(napi_env env) -{ - TaskManager& taskManager = TaskManager::GetInstance(); - uint32_t id = 0; - for (size_t i = 0; i < taskManager.taskQueues_.size(); i++) { - id = taskManager.taskQueues_[i]->DequeueTaskId(); - while (id != 0) { - id = taskManager.taskQueues_[i]->DequeueTaskId(); - } - } - Task* task = new Task(); - taskManager.StoreTask(task); - auto& taskQueue = taskManager.taskQueues_[Priority::IDLE]; - taskQueue->EnqueueTaskId(task->taskId_); - taskManager.GetTaskByPriority(taskQueue, Priority::IDLE); - taskManager.SetIsPerformIdle(false); - taskManager.tasks_.clear(); - delete task; -} - -void NativeEngineTest::WorkerRunningScope(napi_env env) -{ - Worker* worker = reinterpret_cast(WorkerConstructor(env)); - worker->priority_ = Priority::IDLE; - worker->workerEnv_ = env; - Worker::RunningScope runningScope(worker); -} } // namespace Commonlibrary::Concurrent::TaskPoolModule \ No newline at end of file diff --git a/js_concurrent_module/taskpool/test/test.h b/js_concurrent_module/taskpool/test/test.h index 8025513213342b08d5c6b962e0fbdfe1da8e7cd8..d4a1313570dda87310b4aebccb69c52985dc649b 100644 --- a/js_concurrent_module/taskpool/test/test.h +++ b/js_concurrent_module/taskpool/test/test.h @@ -92,8 +92,6 @@ public: static void StoreTaskId(Worker* worker, uint32_t taskId); static void RemoveTaskId(Worker* worker, uint32_t taskId); static bool FindTaskId(Worker* worker, uint32_t taskId); - static void GetIdleTaskByPriority(napi_env env); - static void WorkerRunningScope(napi_env env); class ExceptionScope { public: diff --git a/js_concurrent_module/taskpool/test/test_taskpool.cpp b/js_concurrent_module/taskpool/test/test_taskpool.cpp index 3bd68d8814de2bc9d962223d4e538ae14ec53403..e6edd99e49a19ce21dcacee2f7288a5c8cca351d 100644 --- a/js_concurrent_module/taskpool/test/test_taskpool.cpp +++ b/js_concurrent_module/taskpool/test/test_taskpool.cpp @@ -6388,30 +6388,10 @@ HWTEST_F(NativeEngineTest, TaskpoolTest314, testing::ext::TestSize.Level0) uint32_t taskId = taskManager.CalculateTaskId(reinterpret_cast(task)); task->taskId_ = taskId; task->isValid_ = false; - task->asyncTaskPriority_ = Priority::MEDIUM; + task->asyncTaskPriority_ = Priority::IDLE; void* data = reinterpret_cast(task); NativeEngineTest::PerformTask(env, data); napi_value exception = nullptr; napi_get_and_clear_last_exception(env, &exception); ASSERT_TRUE(exception == nullptr); -} - -HWTEST_F(NativeEngineTest, TaskpoolTest315, testing::ext::TestSize.Level0) -{ - napi_env env = (napi_env)engine_; - ExceptionScope scope(env); - NativeEngineTest::GetIdleTaskByPriority(env); - napi_value exception = nullptr; - napi_get_and_clear_last_exception(env, &exception); - ASSERT_TRUE(exception == nullptr); -} - -HWTEST_F(NativeEngineTest, TaskpoolTest316, testing::ext::TestSize.Level0) -{ - napi_env env = (napi_env)engine_; - ExceptionScope scope(env); - NativeEngineTest::WorkerRunningScope(env); - napi_value exception = nullptr; - napi_get_and_clear_last_exception(env, &exception); - ASSERT_TRUE(exception == nullptr); } \ No newline at end of file