Fix UNITTESTS build failure

Author: rajkan01

UNITTESTS/CMakeLists.txt

@@ -151,7 +151,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack"
   "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/mac"
   "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/phy"
-  "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/system"
+  "${PROJECT_SOURCE_DIR}/../connectivity/lorawan"
   "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls"
   "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls/include"
 )

UNITTESTS/stubs/LoRaMac_stub.h

@@ -20,7 +20,7 @@
 #include <cstddef>
 
 #include "lorawan_types.h"
-#include "lorawan_data_structures.h"
+#include "system/lorawan_data_structures.h"
 
 namespace LoRaMac_stub {
 extern bool bool_value;

UNITTESTS/stubs/LoRaWANTimer_stub.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "mbed_assert.h"
-#include "LoRaWANTimer.h"
+#include "system/LoRaWANTimer.h"
 
 #include "LoRaWANTimer_stub.h"
 

UNITTESTS/stubs/LoRaWANTimer_stub.h

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "LoRaWANTimer.h"
+#include "system/LoRaWANTimer.h"
 
 namespace LoRaWANTimer_stub {
 extern lorawan_time_t time_value;

connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake

@@ -20,7 +20,7 @@ set(TEST_SUITE_NAME "lorawan_LoRaWANInterface")
 
 # Source files
 set(unittest-sources
-  ../connectivity/lorawan/LoRaWANInterface.cpp
+  ../connectivity/lorawan/source/LoRaWANInterface.cpp
 )
 
 # Add test specific include paths

connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp

@@ -22,7 +22,7 @@
 #include "LoRaPHY_stub.h"
 #include "LoRaMac_stub.h"
 #include "equeue_stub.h"
-#include "lorawan_data_structures.h"
+#include "system/lorawan_data_structures.h"
 
 static uint8_t batt_level = 0;
 

connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake

@@ -20,7 +20,7 @@ set(TEST_SUITE_NAME "lorawan_LoRaWANStack")
 
 # Source files
 set(unittest-sources
-  ../connectivity/lorawan/LoRaWANStack.cpp
+  ../connectivity/lorawan/source/LoRaWANStack.cpp
 )
 
 # Add test specific include paths