From 4b59b9dea9efb1f89cf4d4be3912e657b001a5f5 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Thu, 7 Apr 2022 18:44:00 +0200 Subject: [PATCH] cleanup tests --- test/uvw/file_req_sendfile.cpp | 17 +++-------------- test/uvw/fs_event.cpp | 10 ++-------- test/uvw/fs_poll.cpp | 7 +------ 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/test/uvw/file_req_sendfile.cpp b/test/uvw/file_req_sendfile.cpp index 301325fc..dae160da 100644 --- a/test/uvw/file_req_sendfile.cpp +++ b/test/uvw/file_req_sendfile.cpp @@ -21,30 +21,19 @@ TEST(FileReq, SendFile) { srcReq->on([](const auto &, auto &) { FAIL(); }); dstReq->on([&](const auto &event, auto &req) { - switch(event.type) { - case uvw::fs_req::fs_type::OPEN: + if(event.type == uvw::fs_req::fs_type::OPEN) { srcReq->sendfile(static_cast(req), 0, 0); - break; - default: - // nothing to do here - break; } }); srcReq->on([&](const auto &event, auto &req) { - switch(event.type) { - case uvw::fs_req::fs_type::SENDFILE: + if(event.type == uvw::fs_req::fs_type::SENDFILE) { ASSERT_FALSE(checkFileSendFileEvent); checkFileSendFileEvent = true; dstReq->close(); req.close(); - break; - case uvw::fs_req::fs_type::OPEN: + } else if(event.type == uvw::fs_req::fs_type::OPEN) { dstReq->open(dstFilename, uvw::file_req::file_open_flags::CREAT | uvw::file_req::file_open_flags::WRONLY | uvw::file_req::file_open_flags::TRUNC, 0644); - break; - default: - // nothing to do here - break; } }); diff --git a/test/uvw/fs_event.cpp b/test/uvw/fs_event.cpp index 1d9e36f0..3f297e43 100644 --- a/test/uvw/fs_event.cpp +++ b/test/uvw/fs_event.cpp @@ -29,16 +29,10 @@ TEST(FsEvent, Functionalities) { request->on([](const auto &, auto &) { FAIL(); }); request->on([&](const auto &event, auto &req) { - switch(event.type) { - case uvw::fs_req::fs_type::WRITE: + if(event.type == uvw::fs_req::fs_type::WRITE) { req.close(); - break; - case uvw::fs_req::fs_type::OPEN: + } else if(event.type == uvw::fs_req::fs_type::OPEN) { req.write(std::unique_ptr{new char[1]{42}}, 1, 0); - break; - default: - // nothing to do here - break; } }); diff --git a/test/uvw/fs_poll.cpp b/test/uvw/fs_poll.cpp index 31f5bad3..dcf78672 100644 --- a/test/uvw/fs_poll.cpp +++ b/test/uvw/fs_poll.cpp @@ -24,13 +24,8 @@ TEST(FsPoll, Functionalities) { }); request->on([&](const auto &event, auto &req) { - switch(event.type) { - case uvw::fs_req::fs_type::WRITE: + if(event.type == uvw::fs_req::fs_type::WRITE) { req.close(); - break; - default: - // nothing to do here - break; }; });