tests: review (skypjack#91)

tests: review

Author: skypjack

test/uvw/fs_poll.cpp

@@ -27,7 +27,7 @@ TEST(FsPoll, Functionalities) {
     });
 
     request->openSync(filename, O_CREAT | O_RDWR | O_TRUNC, 0755);
-    handle->start(filename, uvw::FsPollHandle::Time{5});
+    handle->start(filename, uvw::FsPollHandle::Time{1000});
     request->write(std::unique_ptr<char[]>{new char[1]{ 42 }}, 1, 0);
 
     ASSERT_EQ(handle->path(), filename);

test/uvw/work.cpp

@@ -38,38 +38,27 @@ TEST(Work, RunTask) {
 
 TEST(Work, Cancellation) {
     auto loop = uvw::Loop::getDefault();
-    auto handle = loop->resource<uvw::CheckHandle>();
+    auto handle = loop->resource<uvw::TimerHandle>();
 
     bool checkErrorEvent = false;
-    bool checkWorkEvent = false;
-    bool checkTask = false;
 
-    handle->on<uvw::CheckEvent>([](const auto &, auto &hndl) {
+    handle->on<uvw::TimerEvent>([](const auto &, auto &hndl) {
         hndl.stop();
         hndl.close();
     });
 
-    auto req = loop->resource<uvw::WorkReq>([&checkTask]() {
-        ASSERT_FALSE(checkTask);
-        checkTask = true;
-    });
+    for(auto i = 0; i < 5 /* default uv thread pool size + 1 */; ++i) {
+        auto req = loop->resource<uvw::WorkReq>([]() {});
 
-    req->on<uvw::ErrorEvent>([&checkErrorEvent](const auto &, auto &) {
-        ASSERT_FALSE(checkErrorEvent);
-        checkErrorEvent = true;
-    });
+        req->on<uvw::WorkEvent>([](const auto &, auto &) {});
+        req->on<uvw::ErrorEvent>([&checkErrorEvent](const auto &, auto &) { checkErrorEvent = true; });
 
-    req->on<uvw::WorkEvent>([&checkWorkEvent](const auto &, auto &) {
-        ASSERT_FALSE(checkWorkEvent);
-        checkWorkEvent = true;
-    });
+        req->queue();
+        req->cancel();
+    }
 
-    handle->start();
-    req->queue();
-    req->cancel();
+    handle->start(uvw::TimerHandle::Time{500}, uvw::TimerHandle::Time{500});
     loop->run();
 
     ASSERT_TRUE(checkErrorEvent);
-    ASSERT_FALSE(checkWorkEvent);
-    ASSERT_FALSE(checkTask);
 }