From 97b2b6c5b8531970444ddf00d127ff334a0c1731 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Tue, 30 Jan 2024 11:12:47 +0100 Subject: [PATCH] test: drop a bunch of NOLINT --- test/entt/graph/adjacency_matrix.cpp | 41 ++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/test/entt/graph/adjacency_matrix.cpp b/test/entt/graph/adjacency_matrix.cpp index fe24fb0564..9160d7fa57 100644 --- a/test/entt/graph/adjacency_matrix.cpp +++ b/test/entt/graph/adjacency_matrix.cpp @@ -3,6 +3,7 @@ #include #include #include +#include "../common/linter.hpp" #include "../common/throwing_allocator.hpp" TEST(AdjacencyMatrix, Resize) { @@ -26,17 +27,22 @@ TEST(AdjacencyMatrix, Constructors) { adjacency_matrix = entt::adjacency_matrix{std::allocator{}}; adjacency_matrix = entt::adjacency_matrix{3u, std::allocator{}}; + ASSERT_TRUE(adjacency_matrix.empty()); ASSERT_EQ(adjacency_matrix.size(), 3u); adjacency_matrix.insert(0u, 1u); + ASSERT_FALSE(adjacency_matrix.empty()); + const entt::adjacency_matrix temp{adjacency_matrix, adjacency_matrix.get_allocator()}; const entt::adjacency_matrix other{std::move(adjacency_matrix), adjacency_matrix.get_allocator()}; - ASSERT_EQ(adjacency_matrix.size(), 0u); // NOLINT - ASSERT_EQ(other.size(), 3u); + test::is_initialized(adjacency_matrix); - ASSERT_FALSE(adjacency_matrix.contains(0u, 1u)); + ASSERT_TRUE(adjacency_matrix.empty()); + + ASSERT_FALSE(other.empty()); + ASSERT_EQ(other.size(), 3u); ASSERT_TRUE(other.contains(0u, 1u)); } @@ -46,10 +52,10 @@ TEST(AdjacencyMatrix, Copy) { entt::adjacency_matrix other{adjacency_matrix}; - ASSERT_EQ(adjacency_matrix.size(), 3u); - ASSERT_EQ(other.size(), 3u); - + ASSERT_FALSE(adjacency_matrix.empty()); ASSERT_TRUE(adjacency_matrix.contains(0u, 1u)); + + ASSERT_EQ(other.size(), 3u); ASSERT_TRUE(other.contains(0u, 1u)); adjacency_matrix.resize(4u); @@ -58,9 +64,10 @@ TEST(AdjacencyMatrix, Copy) { other = adjacency_matrix; - ASSERT_EQ(other.size(), 4u); + ASSERT_FALSE(adjacency_matrix.empty()); ASSERT_EQ(adjacency_matrix.size(), 4u); + ASSERT_EQ(other.size(), 4u); ASSERT_TRUE(other.contains(0u, 1u)); ASSERT_FALSE(other.contains(1u, 2u)); ASSERT_TRUE(other.contains(0u, 2u)); @@ -72,10 +79,11 @@ TEST(AdjacencyMatrix, Move) { entt::adjacency_matrix other{std::move(adjacency_matrix)}; - ASSERT_EQ(adjacency_matrix.size(), 0u); // NOLINT - ASSERT_EQ(other.size(), 3u); + test::is_initialized(adjacency_matrix); - ASSERT_FALSE(adjacency_matrix.contains(0u, 1u)); // NOLINT + ASSERT_TRUE(adjacency_matrix.empty()); + + ASSERT_EQ(other.size(), 3u); ASSERT_TRUE(other.contains(0u, 1u)); adjacency_matrix = {}; @@ -84,10 +92,11 @@ TEST(AdjacencyMatrix, Move) { other.insert(1u, 2u); other = std::move(adjacency_matrix); + test::is_initialized(adjacency_matrix); - ASSERT_EQ(other.size(), 4u); - ASSERT_EQ(adjacency_matrix.size(), 0u); // NOLINT + ASSERT_TRUE(adjacency_matrix.empty()); + ASSERT_EQ(other.size(), 4u); ASSERT_FALSE(other.contains(0u, 1u)); ASSERT_FALSE(other.contains(1u, 2u)); ASSERT_TRUE(other.contains(0u, 2u)); @@ -104,8 +113,14 @@ TEST(AdjacencyMatrix, Swap) { ASSERT_TRUE(adjacency_matrix.contains(0u, 1u)); ASSERT_FALSE(other.contains(0u, 1u)); + ASSERT_FALSE(adjacency_matrix.empty()); + ASSERT_TRUE(other.empty()); + adjacency_matrix.swap(other); + ASSERT_TRUE(adjacency_matrix.empty()); + ASSERT_FALSE(other.empty()); + ASSERT_EQ(other.size(), 3u); ASSERT_EQ(adjacency_matrix.size(), 0u); ASSERT_FALSE(adjacency_matrix.contains(0u, 1u)); @@ -190,12 +205,14 @@ TEST(AdjacencyMatrix, Clear) { adjacency_matrix.insert(0u, 1u); adjacency_matrix.insert(0u, 2u); + ASSERT_FALSE(adjacency_matrix.empty()); ASSERT_TRUE(adjacency_matrix.contains(0u, 1u)); ASSERT_TRUE(adjacency_matrix.contains(0u, 2u)); ASSERT_EQ(adjacency_matrix.size(), 3u); adjacency_matrix.clear(); + ASSERT_TRUE(adjacency_matrix.empty()); ASSERT_FALSE(adjacency_matrix.contains(0u, 1u)); ASSERT_FALSE(adjacency_matrix.contains(0u, 2u)); ASSERT_EQ(adjacency_matrix.size(), 0u);