Sfoglia il codice sorgente

test: minor changes (code coverage)

Michele Caini 4 anni fa
parent
commit
a314f7b42e

+ 6 - 2
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)";
     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 {
     size_type do_allocate_counter() const ENTT_NOEXCEPT {
         return alloc_counter;
         return alloc_counter;
     }
     }
@@ -49,8 +53,8 @@ public:
     }
     }
 
 
 private:
 private:
-    size_type alloc_counter{};
-    size_type dealloc_counter{};
+    size_type alloc_counter;
+    size_type dealloc_counter;
 };
 };
 
 
 } // namespace test
 } // namespace test

+ 2 - 0
test/entt/container/dense_set.cpp

@@ -846,6 +846,7 @@ TEST(DenseSet, NoUsesAllocatorConstruction) {
     memory_resource.reset();
     memory_resource.reset();
     set.emplace(0);
     set.emplace(0);
 
 
+    ASSERT_TRUE(memory_resource.is_equal(memory_resource));
     ASSERT_EQ(memory_resource.do_allocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_allocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
 }
 }
@@ -861,6 +862,7 @@ TEST(DenseSet, UsesAllocatorConstruction) {
     memory_resource.reset();
     memory_resource.reset();
     set.emplace(test::tracked_memory_resource::default_value);
     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_GT(memory_resource.do_allocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
 }
 }

+ 4 - 1
test/entt/core/memory.cpp

@@ -8,6 +8,7 @@
 #include <entt/core/memory.hpp>
 #include <entt/core/memory.hpp>
 #include "../common/basic_test_allocator.hpp"
 #include "../common/basic_test_allocator.hpp"
 #include "../common/throwing_allocator.hpp"
 #include "../common/throwing_allocator.hpp"
+#include "../common/throwing_type.hpp"
 #include "../common/tracked_memory_resource.hpp"
 #include "../common/tracked_memory_resource.hpp"
 
 
 TEST(Memory, ToAddress) {
 TEST(Memory, ToAddress) {
@@ -68,7 +69,7 @@ TEST(Memory, FastMod) {
 }
 }
 
 
 TEST(Memory, AllocateUnique) {
 TEST(Memory, AllocateUnique) {
-    test::throwing_allocator<double> allocator{};
+    test::throwing_allocator<int> allocator{};
     test::throwing_allocator<int>::trigger_on_allocate = true;
     test::throwing_allocator<int>::trigger_on_allocate = true;
 
 
     ASSERT_THROW((entt::allocate_unique<int>(allocator, 0)), test::throwing_allocator<int>::exception_type);
     ASSERT_THROW((entt::allocate_unique<int>(allocator, 0)), test::throwing_allocator<int>::exception_type);
@@ -92,6 +93,7 @@ TEST(Memory, NoUsesAllocatorConstruction) {
     using type = std::unique_ptr<int, entt::allocation_deleter<std::pmr::polymorphic_allocator<int>>>;
     using type = std::unique_ptr<int, entt::allocation_deleter<std::pmr::polymorphic_allocator<int>>>;
     type ptr = entt::allocate_unique<int>(allocator, 0);
     type ptr = entt::allocate_unique<int>(allocator, 0);
 
 
+    ASSERT_TRUE(memory_resource.is_equal(memory_resource));
     ASSERT_EQ(memory_resource.do_allocate_counter(), 1u);
     ASSERT_EQ(memory_resource.do_allocate_counter(), 1u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
 }
 }
@@ -105,6 +107,7 @@ TEST(Memory, UsesAllocatorConstruction) {
     using type = std::unique_ptr<string_type, entt::allocation_deleter<std::pmr::polymorphic_allocator<string_type>>>;
     using type = std::unique_ptr<string_type, entt::allocation_deleter<std::pmr::polymorphic_allocator<string_type>>>;
     type ptr = entt::allocate_unique<string_type>(allocator, test::tracked_memory_resource::default_value);
     type ptr = entt::allocate_unique<string_type>(allocator, test::tracked_memory_resource::default_value);
 
 
+    ASSERT_TRUE(memory_resource.is_equal(memory_resource));
     ASSERT_GT(memory_resource.do_allocate_counter(), 1u);
     ASSERT_GT(memory_resource.do_allocate_counter(), 1u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
 }
 }

+ 2 - 0
test/entt/entity/storage.cpp

@@ -1770,6 +1770,7 @@ TEST(Storage, NoUsesAllocatorConstruction) {
     memory_resource.reset();
     memory_resource.reset();
     pool.emplace(entity, 0);
     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_allocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
 }
 }
@@ -1786,6 +1787,7 @@ TEST(Storage, UsesAllocatorConstruction) {
     memory_resource.reset();
     memory_resource.reset();
     pool.emplace(entity, test::tracked_memory_resource::default_value);
     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_GT(memory_resource.do_allocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
     ASSERT_EQ(memory_resource.do_deallocate_counter(), 0u);
 }
 }