From a314f7b42e0037a5268f71304a540efa01508c86 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Sat, 19 Feb 2022 10:41:35 +0100 Subject: [PATCH] test: minor changes (code coverage) --- test/entt/common/tracked_memory_resource.hpp | 8 ++++++-- test/entt/container/dense_set.cpp | 2 ++ test/entt/core/memory.cpp | 5 ++++- test/entt/entity/storage.cpp | 2 ++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/test/entt/common/tracked_memory_resource.hpp b/test/entt/common/tracked_memory_resource.hpp index 42d5fef9f..73fa08672 100644 --- a/test/entt/common/tracked_memory_resource.hpp +++ b/test/entt/common/tracked_memory_resource.hpp @@ -35,6 +35,10 @@ public: static constexpr const char *default_value = "a string long enough to force an allocation (hopefully)"; + tracked_memory_resource() + : alloc_counter{}, + dealloc_counter{} {} + size_type do_allocate_counter() const ENTT_NOEXCEPT { return alloc_counter; } @@ -49,8 +53,8 @@ public: } private: - size_type alloc_counter{}; - size_type dealloc_counter{}; + size_type alloc_counter; + size_type dealloc_counter; }; } // namespace test diff --git a/test/entt/container/dense_set.cpp b/test/entt/container/dense_set.cpp index fc2fb0fd2..ead0527d6 100644 --- a/test/entt/container/dense_set.cpp +++ b/test/entt/container/dense_set.cpp @@ -846,6 +846,7 @@ TEST(DenseSet, NoUsesAllocatorConstruction) { memory_resource.reset(); set.emplace(0); + ASSERT_TRUE(memory_resource.is_equal(memory_resource)); ASSERT_EQ(memory_resource.do_allocate_counter(), 0u); ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u); } @@ -861,6 +862,7 @@ TEST(DenseSet, UsesAllocatorConstruction) { memory_resource.reset(); set.emplace(test::tracked_memory_resource::default_value); + ASSERT_TRUE(memory_resource.is_equal(memory_resource)); ASSERT_GT(memory_resource.do_allocate_counter(), 0u); ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u); } diff --git a/test/entt/core/memory.cpp b/test/entt/core/memory.cpp index 4fe5fe4a2..aa750c026 100644 --- a/test/entt/core/memory.cpp +++ b/test/entt/core/memory.cpp @@ -8,6 +8,7 @@ #include #include "../common/basic_test_allocator.hpp" #include "../common/throwing_allocator.hpp" +#include "../common/throwing_type.hpp" #include "../common/tracked_memory_resource.hpp" TEST(Memory, ToAddress) { @@ -68,7 +69,7 @@ TEST(Memory, FastMod) { } TEST(Memory, AllocateUnique) { - test::throwing_allocator allocator{}; + test::throwing_allocator allocator{}; test::throwing_allocator::trigger_on_allocate = true; ASSERT_THROW((entt::allocate_unique(allocator, 0)), test::throwing_allocator::exception_type); @@ -92,6 +93,7 @@ TEST(Memory, NoUsesAllocatorConstruction) { using type = std::unique_ptr>>; type ptr = entt::allocate_unique(allocator, 0); + ASSERT_TRUE(memory_resource.is_equal(memory_resource)); ASSERT_EQ(memory_resource.do_allocate_counter(), 1u); ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u); } @@ -105,6 +107,7 @@ TEST(Memory, UsesAllocatorConstruction) { using type = std::unique_ptr>>; type ptr = entt::allocate_unique(allocator, test::tracked_memory_resource::default_value); + ASSERT_TRUE(memory_resource.is_equal(memory_resource)); ASSERT_GT(memory_resource.do_allocate_counter(), 1u); ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u); } diff --git a/test/entt/entity/storage.cpp b/test/entt/entity/storage.cpp index 2337c0363..2e6f08148 100644 --- a/test/entt/entity/storage.cpp +++ b/test/entt/entity/storage.cpp @@ -1770,6 +1770,7 @@ TEST(Storage, NoUsesAllocatorConstruction) { memory_resource.reset(); pool.emplace(entity, 0); + ASSERT_TRUE(memory_resource.is_equal(memory_resource)); ASSERT_EQ(memory_resource.do_allocate_counter(), 0u); ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u); } @@ -1786,6 +1787,7 @@ TEST(Storage, UsesAllocatorConstruction) { memory_resource.reset(); pool.emplace(entity, test::tracked_memory_resource::default_value); + ASSERT_TRUE(memory_resource.is_equal(memory_resource)); ASSERT_GT(memory_resource.do_allocate_counter(), 0u); ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u); }