SlotMaps

Bigfoot/Tests/Engine/Asset/Asset.cpp

@@ -8,8 +8,7 @@
 
 #include <Engine/EngineLogger_generated.hpp>
 
-#include <System/Log/Log.hpp>
-
+#include <Utils/Log/Log.hpp>
 #include <Utils/Singleton.hpp>
 #include <Utils/TargetMacros.h>
 

Bigfoot/Tests/Engine/BigFile/BigFile.cpp

@@ -8,10 +8,10 @@
 
 #include <Engine/EngineLogger_generated.hpp>
 
-#include <System/Log/Log.hpp>
 #include <System/Time/Time.hpp>
 #include <System/UUID/UUID.hpp>
 
+#include <Utils/Log/Log.hpp>
 #include <Utils/Singleton.hpp>
 #include <Utils/TargetMacros.h>
 

Bigfoot/Tests/System/CMakeLists.txt

@@ -7,6 +7,4 @@ set(BigfootDependencies
 
 bigfoot_create_package_tests(
     ""
-    "${BigfootDependencies}")
-
-bigfoot_create_logger()
+    "${BigfootDependencies}")

Bigfoot/Tests/Utils/CMakeLists.txt

@@ -6,4 +6,6 @@ set(BigfootDependencies
 
 bigfoot_create_package_tests(
     ""
-    "${BigfootDependencies}")
+    "${BigfootDependencies}")
+
+bigfoot_create_logger()

Bigfoot/Tests/Utils/Containers/SlotMap.cpp

@@ -13,7 +13,26 @@ namespace Bigfoot
 class SlotMapFixture: public ::testing::Test
 {
   protected:
+    SlotMap<std::uint32_t> m_slotMap;
 };
 
+TEST_F(SlotMapFixture, Insert)
+{
+    const SlotMap<std::uint32_t>::SlotKey firstKey = m_slotMap.Insert(64);
+    const SlotMap<std::uint32_t>::SlotKey secondKey = m_slotMap.Insert(2);
+    const SlotMap<std::uint32_t>::SlotKey thirdKey = m_slotMap.Insert(42);
 
+    m_slotMap.Remove(secondKey);
+    m_slotMap.Remove(firstKey);
+
+    const SlotMap<std::uint32_t>::SlotKey fourthKey = m_slotMap.Insert(3);
+    const SlotMap<std::uint32_t>::SlotKey fifthKey = m_slotMap.Insert(65);
+
+    EXPECT_EQ(m_slotMap.Get(firstKey), nullptr);
+    EXPECT_EQ(m_slotMap.Get(secondKey), nullptr);
+    EXPECT_EQ(*m_slotMap.Get(thirdKey), 42);
+    EXPECT_EQ(*m_slotMap.Get(fourthKey), 3);
+    EXPECT_EQ(*m_slotMap.Get(fifthKey), 65);
+    EXPECT_EQ(m_slotMap.Get(SlotMap<std::uint32_t>::SlotKey {}), nullptr);
+}
 }   // namespace Bigfoot

Bigfoot/Tests/Utils/Include/UtilsTests/UtilsTestsLogger_generated.hpp

@@ -1,12 +1,12 @@
 // AUTO-GENERATED DO NOT TOUCH
 
 /*********************************************************************
- * \file   SystemTestsLogger.generated.hpp
+ * \file   UtilsTestsLogger.generated.hpp
  *
  *********************************************************************/
-#ifndef BIGFOOT_SYSTEMTESTSLOGGER_GENERATED_HPP
-#define BIGFOOT_SYSTEMTESTSLOGGER_GENERATED_HPP
-#include <System/Log/Log.hpp>
+#ifndef BIGFOOT_UTILSTESTSLOGGER_GENERATED_HPP
+#define BIGFOOT_UTILSTESTSLOGGER_GENERATED_HPP
+#include <Utils/Log/Log.hpp>
 
 #if defined BIGFOOT_NOT_OPTIMIZED
 
@@ -15,7 +15,7 @@ namespace Bigfoot
 /*
  * Logger
  */
-inline Log::LoggerInfo SYSTEMTESTS_LOGGER {"SYSTEMTESTS_LOGGER", Flat::LogLevel::Trace};
+inline Log::LoggerInfo UTILSTESTS_LOGGER {"UTILSTESTS_LOGGER", Flat::LogLevel::Trace};
 }  // namespace Bigfoot
 #endif
 #endif

Bigfoot/Tests/Utils/Log/Log.cpp

@@ -4,11 +4,11 @@
  * \author Romain BOULLARD
  * \date   December 2022
  *********************************************************************/
-#include <System/Log/Log.hpp>
+#include <Utils/Log/Log.hpp>
 
 #include <Utils/Singleton.hpp>
 
-#include <SystemTests/SystemTestsLogger_generated.hpp>
+#include <UtilsTests/UtilsTestsLogger_generated.hpp>
 
 #if defined BIGFOOT_NOT_OPTIMIZED
 
@@ -21,7 +21,7 @@ class LogFixture: public ::testing::Test
   protected:
     void SetUp() override
     {
-        SYSTEMTESTS_LOGGER = {"UTILSTESTS_LOGGER", Flat::LogLevel::Trace};
+        UTILSTESTS_LOGGER = {"UTILSTESTS_LOGGER", Flat::LogLevel::Trace};
     }
 
     static constexpr Flat::LogLevel QuillLogLevelToLogLevel(const quill::LogLevel p_level)
@@ -54,18 +54,18 @@ class LogFixture: public ::testing::Test
 
 TEST_F(LogFixture, RegisterLogger_ShouldRegisterTheLogger)
 {
-    const quill::Logger* logger = m_log.RegisterLogger(SYSTEMTESTS_LOGGER);
+    const quill::Logger* logger = m_log.RegisterLogger(UTILSTESTS_LOGGER);
     EXPECT_TRUE(logger);
-    EXPECT_EQ(logger, m_log.GetLogger(SYSTEMTESTS_LOGGER));
-    EXPECT_EQ(logger->get_logger_name(), SYSTEMTESTS_LOGGER.m_name);
-    EXPECT_EQ(QuillLogLevelToLogLevel(logger->get_log_level()), SYSTEMTESTS_LOGGER.m_level);
+    EXPECT_EQ(logger, m_log.GetLogger(UTILSTESTS_LOGGER));
+    EXPECT_EQ(logger->get_logger_name(), UTILSTESTS_LOGGER.m_name);
+    EXPECT_EQ(QuillLogLevelToLogLevel(logger->get_log_level()), UTILSTESTS_LOGGER.m_level);
 }
 
 /****************************************************************************************/
 
 TEST_F(LogFixture, GetLogger_ShouldReturnNullptrIfTheLoggerDoesNotExist)
 {
-    EXPECT_FALSE(m_log.GetLogger(SYSTEMTESTS_LOGGER));
+    EXPECT_FALSE(m_log.GetLogger(UTILSTESTS_LOGGER));
 }
 
 /****************************************************************************************/
@@ -73,17 +73,17 @@ TEST_F(LogFixture, GetLogger_ShouldReturnNullptrIfTheLoggerDoesNotExist)
 TEST_F(LogFixture, GetLogger_ShouldReturnTheLoggerIfItExists)
 {
     [[maybe_unused]]
-    const quill::Logger* logger = m_log.RegisterLogger(SYSTEMTESTS_LOGGER);
-    EXPECT_TRUE(m_log.GetLogger(SYSTEMTESTS_LOGGER));
+    const quill::Logger* logger = m_log.RegisterLogger(UTILSTESTS_LOGGER);
+    EXPECT_TRUE(m_log.GetLogger(UTILSTESTS_LOGGER));
 }
 
 /****************************************************************************************/
 
 TEST_F(LogFixture, ChangeLoggerLogLevel_ShouldChangeTheLoggerLogLevel)
 {
-    const quill::Logger* logger = m_log.RegisterLogger(SYSTEMTESTS_LOGGER);
+    const quill::Logger* logger = m_log.RegisterLogger(UTILSTESTS_LOGGER);
 
-    m_log.ChangeLoggerLogLevel(SYSTEMTESTS_LOGGER, Flat::LogLevel::Critical);
+    m_log.ChangeLoggerLogLevel(UTILSTESTS_LOGGER, Flat::LogLevel::Critical);
     EXPECT_EQ(QuillLogLevelToLogLevel(logger->get_log_level()), Flat::LogLevel::Critical);
 }
 
@@ -92,7 +92,7 @@ TEST_F(LogFixture, ChangeLoggerLogLevel_ShouldChangeTheLoggerLogLevel)
 TEST_F(LogFixture, LogDebug)
 {
     Singleton<Log>::Lifetime singletonLifetime;
-    BIGFOOT_LOG_DEBUG(SYSTEMTESTS_LOGGER, "Hello");
+    BIGFOOT_LOG_DEBUG(UTILSTESTS_LOGGER, "Hello");
 }
 
 /****************************************************************************************/
@@ -100,7 +100,7 @@ TEST_F(LogFixture, LogDebug)
 TEST_F(LogFixture, LogTrace)
 {
     Singleton<Log>::Lifetime singletonLifetime;
-    BIGFOOT_LOG_TRACE(SYSTEMTESTS_LOGGER, "Hello");
+    BIGFOOT_LOG_TRACE(UTILSTESTS_LOGGER, "Hello");
 }
 
 /****************************************************************************************/
@@ -108,7 +108,7 @@ TEST_F(LogFixture, LogTrace)
 TEST_F(LogFixture, LogInfo)
 {
     Singleton<Log>::Lifetime singletonLifetime;
-    BIGFOOT_LOG_INFO(SYSTEMTESTS_LOGGER, "Hello");
+    BIGFOOT_LOG_INFO(UTILSTESTS_LOGGER, "Hello");
 }
 
 /****************************************************************************************/
@@ -116,7 +116,7 @@ TEST_F(LogFixture, LogInfo)
 TEST_F(LogFixture, LogWarn)
 {
     Singleton<Log>::Lifetime singletonLifetime;
-    BIGFOOT_LOG_WARN(SYSTEMTESTS_LOGGER, "Hello");
+    BIGFOOT_LOG_WARN(UTILSTESTS_LOGGER, "Hello");
 }
 
 /****************************************************************************************/
@@ -124,7 +124,7 @@ TEST_F(LogFixture, LogWarn)
 TEST_F(LogFixture, LogError)
 {
     Singleton<Log>::Lifetime singletonLifetime;
-    BIGFOOT_LOG_ERROR(SYSTEMTESTS_LOGGER, "Hello");
+    BIGFOOT_LOG_ERROR(UTILSTESTS_LOGGER, "Hello");
 }
 
 /****************************************************************************************/
@@ -132,7 +132,7 @@ TEST_F(LogFixture, LogError)
 TEST_F(LogFixture, LogFatal)
 {
     Singleton<Log>::Lifetime singletonLifetime;
-    BIGFOOT_LOG_FATAL(SYSTEMTESTS_LOGGER, "Hello");
+    BIGFOOT_LOG_FATAL(UTILSTESTS_LOGGER, "Hello");
 }
 }   // namespace Bigfoot
 #endif