From 6b20a3d3ea030c7bebc700e36679bec45b550f90 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Fri, 11 Oct 2024 19:06:52 +0200 Subject: [PATCH] test: linter directives on deprecated type (no waste of time here) --- test/entt/entity/observer.cpp | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/test/entt/entity/observer.cpp b/test/entt/entity/observer.cpp index 36774e59f..e4e7ff16f 100644 --- a/test/entt/entity/observer.cpp +++ b/test/entt/entity/observer.cpp @@ -36,7 +36,8 @@ TEST(Observer, Functionalities) { } TEST(Observer, AllOf) { - constexpr auto collector = entt::basic_collector<>::group(entt::exclude).group(); + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + constexpr auto collector = entt::collector.group(entt::exclude).group(); entt::registry registry; entt::observer observer{registry, collector}; @@ -82,7 +83,8 @@ TEST(Observer, AllOf) { } TEST(Observer, AllOfFiltered) { - constexpr auto collector = entt::basic_collector<>::group().where(entt::exclude); + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + constexpr auto collector = entt::collector.group().where(entt::exclude); entt::registry registry; entt::observer observer{registry, collector}; @@ -127,7 +129,8 @@ TEST(Observer, AllOfFiltered) { TEST(Observer, Observe) { entt::registry registry; - entt::observer observer{registry, entt::basic_collector<>::update().update()}; + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + entt::observer observer{registry, entt::collector.update().update()}; const auto entity = registry.create(); ASSERT_TRUE(observer.empty()); @@ -160,7 +163,8 @@ TEST(Observer, Observe) { } TEST(Observer, ObserveFiltered) { - constexpr auto collector = entt::basic_collector<>::update().where(entt::exclude); + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + constexpr auto collector = entt::collector.update().where(entt::exclude); entt::registry registry; entt::observer observer{registry, collector}; @@ -206,7 +210,8 @@ TEST(Observer, AllOfObserve) { entt::observer observer{}; const auto entity = registry.create(); - observer.connect(registry, entt::basic_collector<>::group().update()); + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + observer.connect(registry, entt::collector.group().update()); ASSERT_TRUE(observer.empty()); @@ -238,7 +243,8 @@ TEST(Observer, AllOfObserve) { TEST(Observer, CrossRulesCornerCase) { entt::registry registry; - entt::observer observer{registry, entt::basic_collector<>::group().group()}; + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + entt::observer observer{registry, entt::collector.group().group()}; const auto entity = registry.create(); registry.emplace(entity); @@ -254,7 +260,8 @@ TEST(Observer, CrossRulesCornerCase) { TEST(Observer, Each) { entt::registry registry; - entt::observer observer{registry, entt::basic_collector<>::group()}; + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + entt::observer observer{registry, entt::collector.group()}; const auto entity = registry.create(); registry.emplace(entity); @@ -277,7 +284,8 @@ TEST(Observer, Each) { } TEST(Observer, MultipleFilters) { - constexpr auto collector = entt::basic_collector<>::update().where().update().where(); + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + constexpr auto collector = entt::collector.update().where().update().where(); entt::registry registry; entt::observer observer{registry, collector}; @@ -331,8 +339,10 @@ TEST(Observer, MultipleFilters) { } TEST(Observer, GroupCornerCase) { - constexpr auto add_collector = entt::basic_collector<>::group(entt::exclude); - constexpr auto remove_collector = entt::basic_collector<>::group(); + // NOLINTBEGIN(readability-static-accessed-through-instance) + constexpr auto add_collector = entt::collector.group(entt::exclude); + constexpr auto remove_collector = entt::collector.group(); + // NOLINTEND(readability-static-accessed-through-instance) entt::registry registry; entt::observer add_observer{registry, add_collector};