simplify ContextFixture for uv

This commit is contained in:
falsycat 2023-09-03 11:45:27 +09:00
parent 397984b3a7
commit 8ae5d36629
4 changed files with 32 additions and 26 deletions

View File

@ -17,7 +17,7 @@ using UV_Concurrency = nf7::core::uv::test::ContextFixture;
TEST_F(UV_Concurrency, Push) {
auto sut = std::make_shared<nf7::core::uv::Concurrency>(*env_);
auto sut = std::make_shared<nf7::core::uv::Concurrency>(env());
auto called = uint64_t {0};
sut->Exec([&](auto&) { ++called; });
@ -27,7 +27,7 @@ TEST_F(UV_Concurrency, Push) {
}
TEST_F(UV_Concurrency, PushFromTask) {
auto sut = std::make_shared<nf7::core::uv::Concurrency>(*env_);
auto sut = std::make_shared<nf7::core::uv::Concurrency>(env());
auto called = uint64_t {0};
sut->Exec([&](auto&) { sut->Exec([&](auto&) { ++called; }); });
@ -37,7 +37,7 @@ TEST_F(UV_Concurrency, PushFromTask) {
}
TEST_F(UV_Concurrency, ExecOrderly) {
auto sut = std::make_shared<nf7::core::uv::Concurrency>(*env_);
auto sut = std::make_shared<nf7::core::uv::Concurrency>(env());
auto called = uint64_t {0};
sut->Exec([&](auto&) { ++called; EXPECT_EQ(called, 1); });
@ -48,8 +48,8 @@ TEST_F(UV_Concurrency, ExecOrderly) {
}
TEST_F(UV_Concurrency, PushWithDelay) {
auto clock = env_->Get<nf7::subsys::Clock>();
auto sut = std::make_shared<nf7::core::uv::Concurrency>(*env_);
auto clock = env().Get<nf7::subsys::Clock>();
auto sut = std::make_shared<nf7::core::uv::Concurrency>(env());
auto called = uint64_t {0};
sut->Push({clock->now() + 100ms, [&](auto&) { ++called; }});

View File

@ -13,26 +13,32 @@
#include "core/uv/clock.hh"
#include "iface/env_test.hh"
namespace nf7::core::uv::test {
class ContextFixture : public ::testing::Test {
class ContextFixture : public nf7::test::EnvFixture {
public:
ContextFixture() noexcept
: nf7::test::EnvFixture({
SimpleEnv::MakePair<Context, MainContext>(),
SimpleEnv::MakePair<subsys::Clock, Clock>(),
}) {
}
protected:
void SetUp() override {
env_.emplace(SimpleEnv::FactoryMap {
SimpleEnv::MakePair<Context, MainContext>(),
SimpleEnv::MakePair<subsys::Clock, Clock>(),
});
ctx_ = std::dynamic_pointer_cast<MainContext>(env_->Get<Context>());
nf7::test::EnvFixture::SetUp();
ctx_ = std::dynamic_pointer_cast<MainContext>(env().Get<Context>());
}
void TearDown() override {
ctx_->RunAndClose();
env_ = std::nullopt;
nf7::test::EnvFixture::TearDown();
ctx_ = nullptr;
}
protected:
std::optional<SimpleEnv> env_;
std::shared_ptr<MainContext> ctx_;
};

View File

@ -35,7 +35,7 @@ class UV_File :
TEST_P(UV_File, Open) {
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::RDWR
| uvw::file_req::file_open_flags::CREAT);
@ -54,7 +54,7 @@ TEST_P(UV_File, FetchSize) {
PrepareFile("helloworld");
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::RDONLY);
auto result = sut->FetchSize();
@ -70,7 +70,7 @@ TEST_P(UV_File, FetchSize) {
TEST_P(UV_File, FetchSizeFail) {
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::RDONLY);
auto result = sut->FetchSize();
@ -82,7 +82,7 @@ TEST_P(UV_File, FetchSizeFail) {
TEST_P(UV_File, Truncate) {
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::RDWR
| uvw::file_req::file_open_flags::CREAT);
@ -98,7 +98,7 @@ TEST_P(UV_File, Truncate) {
TEST_P(UV_File, TruncateFail) {
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::RDONLY);
auto result = sut->Truncate(256);
@ -112,7 +112,7 @@ TEST_P(UV_File, Read) {
PrepareFile("helloworld");
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::RDONLY);
auto result = sut->Read(1, 3);
@ -133,7 +133,7 @@ TEST_P(UV_File, ReadFail) {
PrepareFile("helloworld");
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::WRONLY);
auto result = sut->Read(1, 3);
@ -147,7 +147,7 @@ TEST_P(UV_File, Write) {
PrepareFile("helloworld");
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::WRONLY);
auto result = sut->Write(5, reinterpret_cast<const uint8_t*>("universe"), 8);
@ -171,7 +171,7 @@ TEST_P(UV_File, WriteFail) {
PrepareFile("helloworld");
auto sut = nf7::core::uv::File::Make(
*env_, kTempFile,
env(), kTempFile,
uvw::file_req::file_open_flags::RDONLY);
auto result = sut->Write(5, reinterpret_cast<const uint8_t*>("universe"), 8);

View File

@ -17,7 +17,7 @@ using UV_Parallelism = nf7::core::uv::test::ContextFixture;
TEST_F(UV_Parallelism, Push) {
auto sut = std::make_shared<nf7::core::uv::Parallelism>(*env_);
auto sut = std::make_shared<nf7::core::uv::Parallelism>(env());
auto called = uint64_t {0};
sut->Exec([&](auto&) { ++called; });
@ -27,7 +27,7 @@ TEST_F(UV_Parallelism, Push) {
}
TEST_F(UV_Parallelism, PushFromTask) {
auto sut = std::make_shared<nf7::core::uv::Parallelism>(*env_);
auto sut = std::make_shared<nf7::core::uv::Parallelism>(env());
auto called = uint64_t {0};
sut->Exec([&](auto&) { sut->Exec([&](auto&) { ++called; }); });
@ -37,8 +37,8 @@ TEST_F(UV_Parallelism, PushFromTask) {
}
TEST_F(UV_Parallelism, PushWithDelay) {
auto clock = env_->Get<nf7::subsys::Clock>();
auto sut = std::make_shared<nf7::core::uv::Parallelism>(*env_);
auto clock = env().Get<nf7::subsys::Clock>();
auto sut = std::make_shared<nf7::core::uv::Parallelism>(env());
auto called = uint64_t {0};
sut->Push({clock->now() + 100ms, [&](auto&) { ++called; }});