Minor UT fixes

nasa · Feb 5, 2024 · eb623fb · eb623fb
1 parent bcdcbdd
commit eb623fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Os/Models/Models.hpp b/Os/Models/Models.hpp
@@ -10,8 +10,9 @@
 #define OS_MODELS_MODELS_HPP
 
 // Check consistency of every constant in the Os::File::Status enum
-static_assert(Os::File::Status::MAX_STATUS == Os::FileStatus::NUM_CONSTANTS,
-        "File status and FPP shadow enum have inconsistent number of values");
+static_assert(static_cast<FwIndexType>(Os::File::Status::MAX_STATUS) ==
+              static_cast<FwIndexType>(Os::FileStatus::NUM_CONSTANTS),
+              "File status and FPP shadow enum have inconsistent number of values");
 static_assert(static_cast<Os::FileStatus::T>(Os::File::Status::OP_OK) == Os::FileStatus::T::OP_OK,
               "File status and FPP shadow enum do not match");
 static_assert(static_cast<Os::FileStatus::T>(Os::File::Status::DOESNT_EXIST) == Os::FileStatus::T::DOESNT_EXIST,
@@ -36,7 +37,8 @@ static_assert(static_cast<Os::FileStatus::T>(Os::File::Status::OTHER_ERROR) == O
               "File status and FPP shadow enum do not match");
 
 // Check consistency of every constant in the Os::File::Mode enum
-static_assert(Os::File::Mode::MAX_OPEN_MODE == Os::FileMode::NUM_CONSTANTS,
+static_assert(static_cast<FwIndexType>(Os::File::Mode::MAX_OPEN_MODE) ==
+              static_cast<FwIndexType>(Os::FileMode::NUM_CONSTANTS),
               "File mode and FPP shadow enum have inconsistent number of values");
 static_assert(static_cast<Os::FileMode::T>(Os::File::Mode::OPEN_NO_MODE) == Os::FileMode::T::OPEN_NO_MODE,
               "File mode and FPP shadow enum do not match");

diff --git a/Os/test/ut/file/RulesHeaders.hpp b/Os/test/ut/file/RulesHeaders.hpp
@@ -166,7 +166,7 @@ struct Tester {
     //! Independent tracking of mode
     Os::File::Mode m_mode = Os::File::Mode::OPEN_NO_MODE;
 
-    U32 m_independent_crc = 0;
+    U32 m_independent_crc = Os::File::INITIAL_CRC;
 
 // Do NOT alter, adds rules to Tester as inner classes
 #include "MyRules.hpp"