Skip to content

Commit 628261b

Browse files
committed
test: avoid invoking static members on instance
1 parent 2bb7b07 commit 628261b

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

test/entt/entity/observer.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
TEST(Observer, Functionalities) {
77
entt::registry registry;
8+
// NOLINTNEXTLINE(readability-static-accessed-through-instance)
89
entt::observer observer{registry, entt::collector.group<int>()};
910

1011
ASSERT_EQ(observer.size(), 0u);
@@ -132,7 +133,7 @@ TEST(Observer, AllOfFiltered) {
132133

133134
TEST(Observer, Observe) {
134135
entt::registry registry;
135-
entt::observer observer{registry, entt::collector.update<int>().update<char>()};
136+
entt::observer observer{registry, entt::basic_collector<>::update<int>().update<char>()};
136137
const auto entity = registry.create();
137138

138139
ASSERT_TRUE(observer.empty());
@@ -214,7 +215,7 @@ TEST(Observer, AllOfObserve) {
214215
entt::observer observer{};
215216
const auto entity = registry.create();
216217

217-
observer.connect(registry, entt::collector.group<int>().update<char>());
218+
observer.connect(registry, entt::basic_collector<>::group<int>().update<char>());
218219

219220
ASSERT_TRUE(observer.empty());
220221

@@ -246,7 +247,7 @@ TEST(Observer, AllOfObserve) {
246247

247248
TEST(Observer, CrossRulesCornerCase) {
248249
entt::registry registry;
249-
entt::observer observer{registry, entt::collector.group<int>().group<char>()};
250+
entt::observer observer{registry, entt::basic_collector<>::group<int>().group<char>()};
250251
const auto entity = registry.create();
251252

252253
registry.emplace<int>(entity);
@@ -262,7 +263,7 @@ TEST(Observer, CrossRulesCornerCase) {
262263

263264
TEST(Observer, Each) {
264265
entt::registry registry;
265-
entt::observer observer{registry, entt::collector.group<int>()};
266+
entt::observer observer{registry, entt::basic_collector<>::group<int>()};
266267
const auto entity = registry.create();
267268
registry.emplace<int>(entity);
268269

@@ -344,8 +345,8 @@ TEST(Observer, MultipleFilters) {
344345
}
345346

346347
TEST(Observer, GroupCornerCase) {
347-
constexpr auto add_collector = entt::collector.group<int>(entt::exclude<char>);
348-
constexpr auto remove_collector = entt::collector.group<int, char>();
348+
constexpr auto add_collector = entt::basic_collector<>::group<int>(entt::exclude<char>);
349+
constexpr auto remove_collector = entt::basic_collector<>::group<int, char>();
349350

350351
entt::registry registry;
351352
entt::observer add_observer{registry, add_collector};

0 commit comments

Comments
 (0)