Moving utility/test helper files into subfolder include/util and src/util

aentinger · aentinger · commit c9d7d2722518 · 2020-06-04T06:34:51.000+02:00
diff --git a/extras/test/CMakeLists.txt b/extras/test/CMakeLists.txt
@@ -43,8 +43,8 @@ set(TEST_SRCS
   src/test_readOnly.cpp
   src/test_writeOnly.cpp
 
-  src/OTATestData.cpp
-  src/TestUtil.cpp
+  src/util/OTATestData.cpp
+  src/util/TestUtil.cpp
 
   ../../src/utility/ota/crc.cpp
   ../../src/utility/ota/OTALogic.cpp
diff --git a/extras/test/include/util/OTATestData.h b/extras/test/include/util/OTATestData.h
diff --git a/extras/test/include/util/TestUtil.h b/extras/test/include/util/TestUtil.h
diff --git a/extras/test/src/test_CloudColor.cpp b/extras/test/src/test_CloudColor.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 
 /**************************************************************************************
diff --git a/extras/test/src/test_OTALogic.cpp b/extras/test/src/test_OTALogic.cpp
@@ -12,7 +12,7 @@
 #include <catch.hpp>
 #include <fakeit.hpp>
 
-#include <OTATestData.h>
+#include <util/OTATestData.h>
 
 #include <OTALogic.h>
 #include <OTAStorage.h>
diff --git a/extras/test/src/test_callback.cpp b/extras/test/src/test_callback.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 #include "types/CloudWrapperBool.h"
 
diff --git a/extras/test/src/test_decode.cpp b/extras/test/src/test_decode.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 #include "types/CloudWrapperBool.h"
 #include "types/CloudWrapperFloat.h"
diff --git a/extras/test/src/test_encode.cpp b/extras/test/src/test_encode.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 #include "types/CloudWrapperBool.h"
 #include "types/CloudWrapperFloat.h"
diff --git a/extras/test/src/test_publishEvery.cpp b/extras/test/src/test_publishEvery.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 
 /**************************************************************************************
diff --git a/extras/test/src/test_publishOnChange.cpp b/extras/test/src/test_publishOnChange.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 
 /**************************************************************************************
diff --git a/extras/test/src/test_publishOnChangeRateLimit.cpp b/extras/test/src/test_publishOnChangeRateLimit.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 
 /**************************************************************************************
diff --git a/extras/test/src/test_readOnly.cpp b/extras/test/src/test_readOnly.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 
 /**************************************************************************************
diff --git a/extras/test/src/test_writeOnly.cpp b/extras/test/src/test_writeOnly.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 #include <ArduinoCloudThing.h>
 
 /**************************************************************************************
diff --git a/extras/test/src/util/OTATestData.cpp b/extras/test/src/util/OTATestData.cpp
@@ -6,7 +6,7 @@
    INCLUDE
  **************************************************************************************/
 
-#include <OTATestData.h>
+#include <util/OTATestData.h>
 
 #include <algorithm>
 
diff --git a/extras/test/src/util/TestUtil.cpp b/extras/test/src/util/TestUtil.cpp
@@ -6,7 +6,7 @@
    INCLUDE
  **************************************************************************************/
 
-#include <TestUtil.h>
+#include <util/TestUtil.h>
 
 #include <iomanip>
 #include <iostream>
