From 4b4c038dc71ccfd248d4d2ec704b9a9890e64aa8 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Fri, 26 Jan 2024 16:55:56 +0100 Subject: [PATCH] test: drop a bunch of NOLINT --- test/entt/process/scheduler.cpp | 51 ++++++++++++--------------------- 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/test/entt/process/scheduler.cpp b/test/entt/process/scheduler.cpp index 65e3d1048..a42facd7a 100644 --- a/test/entt/process/scheduler.cpp +++ b/test/entt/process/scheduler.cpp @@ -22,31 +22,20 @@ struct foo_process: entt::process { }; struct succeeded_process: entt::process { - void update(delta_type, void *) { - ++invoked; + void update(delta_type, void *data) { + ++static_cast *>(data)->first; succeed(); } - - inline static unsigned int invoked; // NOLINT }; struct failed_process: entt::process { - void update(delta_type, void *) { - ++invoked; + void update(delta_type, void *data) { + ++static_cast *>(data)->second; fail(); } - - inline static unsigned int invoked; // NOLINT }; -struct Scheduler: ::testing::Test { - void SetUp() override { - succeeded_process::invoked = 0u; - failed_process::invoked = 0u; - } -}; - -TEST_F(Scheduler, Functionalities) { +TEST(Scheduler, Functionalities) { entt::scheduler scheduler{}; entt::scheduler other{std::move(scheduler)}; @@ -80,7 +69,7 @@ TEST_F(Scheduler, Functionalities) { ASSERT_TRUE(scheduler.empty()); } -TEST_F(Scheduler, Swap) { +TEST(Scheduler, Swap) { entt::scheduler scheduler{}; entt::scheduler other{}; int counter{}; @@ -107,8 +96,9 @@ TEST_F(Scheduler, Swap) { ASSERT_EQ(counter, 2); } -TEST_F(Scheduler, Then) { +TEST(Scheduler, Then) { entt::scheduler scheduler{}; + std::pair counter{}; scheduler // failing process with successor @@ -124,18 +114,15 @@ TEST_F(Scheduler, Then) { .attach() .then(); - ASSERT_EQ(succeeded_process::invoked, 0u); - ASSERT_EQ(failed_process::invoked, 0u); - while(!scheduler.empty()) { - scheduler.update(0); + scheduler.update(0, &counter); } - ASSERT_EQ(succeeded_process::invoked, 6u); - ASSERT_EQ(failed_process::invoked, 2u); + ASSERT_EQ(counter.first, 6u); + ASSERT_EQ(counter.second, 2u); } -TEST_F(Scheduler, Functor) { +TEST(Scheduler, Functor) { entt::scheduler scheduler{}; bool first_functor = false; @@ -164,26 +151,24 @@ TEST_F(Scheduler, Functor) { ASSERT_TRUE(scheduler.empty()); } -TEST_F(Scheduler, SpawningProcess) { +TEST(Scheduler, SpawningProcess) { entt::scheduler scheduler{}; + std::pair counter{}; scheduler.attach([&scheduler](auto, void *, auto resolve, auto) { scheduler.attach().then(); resolve(); }); - ASSERT_EQ(succeeded_process::invoked, 0u); - ASSERT_EQ(failed_process::invoked, 0u); - while(!scheduler.empty()) { - scheduler.update(0); + scheduler.update(0, &counter); } - ASSERT_EQ(succeeded_process::invoked, 1u); - ASSERT_EQ(failed_process::invoked, 1u); + ASSERT_EQ(counter.first, 1u); + ASSERT_EQ(counter.second, 1u); } -TEST_F(Scheduler, CustomAllocator) { +TEST(Scheduler, CustomAllocator) { const std::allocator allocator{}; entt::scheduler scheduler{allocator};