Renaming OTATestDataGenerator.h/.cpp into OTATestUtil.h/.cpp and encapsulating its methods into namespace OTA

Author: aentinger

extras/test/CMakeLists.txt

@@ -44,7 +44,7 @@ set(TEST_SRCS
   src/test_writeOnly.cpp
 
   src/util/CBORTestUtil.cpp
-  src/util/OTATestDataGenerator.cpp
+  src/util/OTATestUtil.cpp
 
   ../../src/utility/ota/crc.cpp
   ../../src/utility/ota/OTALogic.cpp

…test/include/util/OTATestDataGenerator.h extras/test/include/util/OTATestUtil.hextras/test/include/util/OTATestDataGenerator.h renamed to extras/test/include/util/OTATestUtil.h extras/test/include/util/OTATestDataGenerator.h renamed to extras/test/include/util/OTATestUtil.h

@@ -11,6 +11,13 @@
 
 #include <stdint.h>
 
+/**************************************************************************************
+   NAMESPACE
+ **************************************************************************************/
+
+namespace ota
+{
+
 /**************************************************************************************
    TYPEDEF
  **************************************************************************************/
@@ -33,5 +40,10 @@ union OTAData
 void generate_valid_ota_data(OTAData & ota_data);
 void generate_invalid_ota_data_crc_wrong(OTAData & ota_data);
 
+/**************************************************************************************
+   NAMESPACE
+ **************************************************************************************/
+
+} /* ota */
 
 #endif /* OTA_TEST_DATA_GENERATOR_H_ */

extras/test/src/test_OTALogic.cpp

@@ -12,7 +12,7 @@
 #include <catch.hpp>
 #include <fakeit.hpp>
 
-#include <util/OTATestDataGenerator.h>
+#include <util/OTATestUtil.h>
 
 #include <OTALogic.h>
 #include <OTAStorage.h>
@@ -27,7 +27,7 @@ using namespace fakeit;
    TEST HELPER
  **************************************************************************************/
 
-void simulateOTABinaryReception(OTALogic & ota_logic, OTAData const & ota_test_data)
+void simulateOTABinaryReception(OTALogic & ota_logic, ota::OTAData const & ota_test_data)
 {
   uint32_t bytes_written = 0;
   uint32_t const bytes_to_write = sizeof(uint32_t) + sizeof(uint32_t) + ota_test_data.data.len;
@@ -212,8 +212,8 @@ TEST_CASE("Valid OTA data is received ", "[OTALogic]")
 
 
   /* Generate test data */
-  OTAData valid_ota_test_data;
-  generate_valid_ota_data(valid_ota_test_data);
+  ota::OTAData valid_ota_test_data;
+  ota::generate_valid_ota_data(valid_ota_test_data);
 
 
   /* Perform test */
@@ -259,8 +259,8 @@ TEST_CASE("Invalid OTA data is received ", "[OTALogic - CRC wrong]")
 
 
   /* Generate test data */
-  OTAData invalid_valid_ota_test_data_crc_wrong;
-  generate_invalid_ota_data_crc_wrong(invalid_valid_ota_test_data_crc_wrong);
+  ota::OTAData invalid_valid_ota_test_data_crc_wrong;
+  ota::generate_invalid_ota_data_crc_wrong(invalid_valid_ota_test_data_crc_wrong);
 
 
   /* Perform test */

…s/test/src/util/OTATestDataGenerator.cpp extras/test/src/util/OTATestUtil.cppextras/test/src/util/OTATestDataGenerator.cpp renamed to extras/test/src/util/OTATestUtil.cpp extras/test/src/util/OTATestDataGenerator.cpp renamed to extras/test/src/util/OTATestUtil.cpp

@@ -6,12 +6,19 @@
    INCLUDE
  **************************************************************************************/
 
-#include <util/OTATestDataGenerator.h>
+#include <util/OTATestUtil.h>
 
 #include <algorithm>
 
 #include <crc.h>
 
+/**************************************************************************************
+   NAMESPACE
+ **************************************************************************************/
+
+namespace ota
+{
+
 /**************************************************************************************
    FUNCTION DEFINITION
  **************************************************************************************/
@@ -58,3 +65,9 @@ void generate_invalid_ota_data_crc_wrong(OTAData & ota_data)
   /* Generate CRC */
   ota_data.data.crc32 = 0xDEADBEEF;
 }
+
+/**************************************************************************************
+   NAMESPACE
+ **************************************************************************************/
+
+} /* ota */