diff --git a/test/uvw/async.cpp b/test/uvw/async.cpp index 4d132feb..7994a15b 100644 --- a/test/uvw/async.cpp +++ b/test/uvw/async.cpp @@ -8,7 +8,7 @@ TEST(Async, Send) { bool checkAsyncEvent = false; - handle->on([](const auto &, auto &) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->on([&checkAsyncEvent](const auto &, auto &hndl) { ASSERT_FALSE(checkAsyncEvent); @@ -32,9 +32,8 @@ TEST(Async, Fake) { auto loop = uvw::Loop::getDefault(); auto handle = loop->resource(); - auto l = [](const auto &, auto &) { FAIL(); }; - handle->on(l); - handle->on(l); + handle->on([](auto &&...) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->send(); handle->close(); diff --git a/test/uvw/check.cpp b/test/uvw/check.cpp index 7dea9bea..e612f15f 100644 --- a/test/uvw/check.cpp +++ b/test/uvw/check.cpp @@ -8,7 +8,7 @@ TEST(Check, StartAndStop) { bool checkCheckEvent = false; - handle->on([](const auto &, auto &) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->on([&checkCheckEvent](const auto &, auto &hndl) { ASSERT_FALSE(checkCheckEvent); @@ -33,9 +33,8 @@ TEST(Check, Fake) { auto loop = uvw::Loop::getDefault(); auto handle = loop->resource(); - auto l = [](const auto &, auto &) { FAIL(); }; - handle->on(l); - handle->on(l); + handle->on([](auto &&...) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->start(); handle->close(); diff --git a/test/uvw/idle.cpp b/test/uvw/idle.cpp index 19626f64..d8db93a1 100644 --- a/test/uvw/idle.cpp +++ b/test/uvw/idle.cpp @@ -8,7 +8,7 @@ TEST(Idle, StartAndStop) { bool checkIdleEvent = false; - handle->on([](const auto &, auto &) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->on([&checkIdleEvent](const auto &, auto &hndl) { ASSERT_FALSE(checkIdleEvent); @@ -33,9 +33,8 @@ TEST(Idle, Fake) { auto loop = uvw::Loop::getDefault(); auto handle = loop->resource(); - auto l = [](const auto &, auto &) { FAIL(); }; - handle->on(l); - handle->on(l); + handle->on([](auto &&...) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->start(); handle->close(); diff --git a/test/uvw/loop.cpp b/test/uvw/loop.cpp index 49592e5c..ecb2758b 100644 --- a/test/uvw/loop.cpp +++ b/test/uvw/loop.cpp @@ -21,11 +21,9 @@ TEST(Loop, Functionalities) { auto handle = loop->resource(); auto req = loop->resource([]{}); - auto err = [](const auto &, auto &) { FAIL(); }; - - loop->on(err); - req->on(err); - handle->on(err); + loop->on([](auto &&...) { FAIL(); }); + req->on([](auto &&...) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); ASSERT_TRUE(static_cast(handle)); ASSERT_TRUE(static_cast(req)); diff --git a/test/uvw/prepare.cpp b/test/uvw/prepare.cpp index 477a072e..8f622a77 100644 --- a/test/uvw/prepare.cpp +++ b/test/uvw/prepare.cpp @@ -8,7 +8,7 @@ TEST(Prepare, StartAndStop) { bool checkPrepareEvent = false; - handle->on([](const auto &, auto &) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->on([&checkPrepareEvent](const auto &, auto &hndl) { ASSERT_FALSE(checkPrepareEvent); @@ -33,9 +33,8 @@ TEST(Prepare, Fake) { auto loop = uvw::Loop::getDefault(); auto handle = loop->resource(); - auto l = [](const auto &, auto &) { FAIL(); }; - handle->on(l); - handle->on(l); + handle->on([](auto &&...) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->start(); handle->close(); diff --git a/test/uvw/signal.cpp b/test/uvw/signal.cpp index ada640e5..df032e78 100644 --- a/test/uvw/signal.cpp +++ b/test/uvw/signal.cpp @@ -6,9 +6,8 @@ TEST(Signal, Start) { auto loop = uvw::Loop::getDefault(); auto handle = loop->resource(); - auto l = [](const auto &, auto &) { FAIL(); }; - handle->on(l); - handle->on(l); + handle->on([](auto &&...) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->start(2); @@ -27,9 +26,8 @@ TEST(Signal, OneShot) { auto loop = uvw::Loop::getDefault(); auto handle = loop->resource(); - auto l = [](const auto &, auto &) { FAIL(); }; - handle->on(l); - handle->on(l); + handle->on([](auto &&...) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->oneShot(2); diff --git a/test/uvw/timer.cpp b/test/uvw/timer.cpp index 1d47a0ec..f07add7a 100644 --- a/test/uvw/timer.cpp +++ b/test/uvw/timer.cpp @@ -10,8 +10,8 @@ TEST(Timer, StartAndStop) { bool checkTimerNoRepeatEvent = false; bool checkTimerRepeatEvent = false; - handleNoRepeat->on([](const auto &, auto &) { FAIL(); }); - handleRepeat->on([](const auto &, auto &) { FAIL(); }); + handleNoRepeat->on([](auto &&...) { FAIL(); }); + handleRepeat->on([](auto &&...) { FAIL(); }); handleNoRepeat->on([&checkTimerNoRepeatEvent](const auto &, auto &handle) { ASSERT_FALSE(checkTimerNoRepeatEvent); @@ -111,9 +111,8 @@ TEST(Timer, Fake) { auto loop = uvw::Loop::getDefault(); auto handle = loop->resource(); - auto l = [](const auto &, auto &) { FAIL(); }; - handle->on(l); - handle->on(l); + handle->on([](auto &&...) { FAIL(); }); + handle->on([](auto &&...) { FAIL(); }); handle->start(uvw::TimerHandle::Time{0}, uvw::TimerHandle::Time{0}); handle->close();