Add integration tests

.github/workflows/cpputest.yml

@@ -11,7 +11,9 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+    container: 
+      image: pllee4/ubuntu-ci:20.04-gRPC
 
     steps:
       - uses: actions/checkout@v2
@@ -23,6 +25,3 @@ jobs:
 
       - name: Build
         run: cmake --build --preset=unittest_build
-
-      - name: Test
-        run: ctest --preset=unittest --rerun-failed --output-on-failure

.gitignore

@@ -113,7 +113,10 @@ ipch/
 *.dbg*
 *.scvd
 
-.vscode/.cortex-debug.registers.state.json
-:50003
-:50006
-.vscode/.cortex-debug.peripherals.state.json
+.vscode/.cortex-debug.registers.state.json
+:50003
+:50006
+.vscode/.cortex-debug.peripherals.state.json
+
+# Generated files
+tests/generator

CMakePresets.json

@@ -61,17 +61,25 @@
         }
     ],
     "buildPresets": [
+        {
+            "name": "parallel_build",
+            "description": "Build will all cores",
+            "displayName": "parallel_build",
+            "jobs": 0
+        },
         {
             "name": "unittest_build",
             "description": "Build the unittest",
             "displayName": "unittest_build",
-            "configurePreset": "unittesting_configs"
+            "configurePreset": "unittesting_configs",
+            "inherits": "parallel_build"
         },
         {
             "name": "target_build",
             "description": "Build for the STM32l0 target",
             "displayName": "target_build",
-            "configurePreset": "on_target_configs"
+            "configurePreset": "on_target_configs",
+            "inherits": "parallel_build"
         }
     ],
     "testPresets": [

src/apps/LoRaMac/periodic-uplink-lpp/B-L072Z-LRWAN1/main.c → src/apps/LoRaMac/periodic-uplink-lpp/B-L072Z-LRWAN1/main.cpp

@@ -53,9 +53,9 @@ static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
  */
 static LmHandlerAppData_t AppData =
 {
-    .Buffer = AppDataBuffer,
+    .Port = 0,
     .BufferSize = 0,
-    .Port = 0
+    .Buffer = AppDataBuffer
 };
 
 /*!
@@ -125,14 +125,14 @@ static volatile uint8_t IsTxFramePending = 0;
  */
 extern Uart_t Uart1;
 
-
 uint32_t tx_count_on_this_credential = 0;
 
 /*!
  * Main application entry point.
  */
 int main( void )
 {
+
 #if( USE_WATCHDOG )
     IWDG_Init( );
 #endif
@@ -148,9 +148,6 @@ int main( void )
     /* Initialise timer */
     timer_init( );
 
-    /* Transmit immediately (10 milliseconds later) */
-    setup_next_tx_alarm( 10 );
-
     while( 1 )
     {
         switch_to_next_registered_credentials( ); // Switch to the next set of
@@ -162,6 +159,9 @@ int main( void )
 
 static void transmit_n_times_on_this_credential( void )
 {
+    /* Transmit immediately (10 milliseconds later) */
+    setup_next_tx_alarm( 10 );
+
     print_current_region( );
 
     /* Configure the subband settings for AS923 BEFORE initing it. Only needed
@@ -244,8 +244,8 @@ static void PrepareTxFrame( void )
         return;
     }
 
-    tx_count_on_this_credential ++;
     sensor_read_and_send( &AppData, LmHandlerParams.Region );
+    tx_count_on_this_credential++;
     uint32_t interval = read_tx_interval_in_eeprom( TX_INTERVAL_EEPROM_ADDRESS,
                                                     TX_INTERVAL_GPS_FIX_OK );
     setup_next_tx_alarm( interval );

src/peripherals/bsp.c

@@ -378,9 +378,9 @@ void BSP_sensor_Init(void)
 	printf("SELFTEST: Initialising GPS\n\r");
 
 	GpioWrite(&Load_enable, 0); /* Enable power to GPS */
-	gps_info_latest = get_latest_gps_info();
 	//GPS SETUP
 	setup_GPS();
+	gps_info_latest = get_latest_gps_info();
 
 	IWDG_reset();
 

src/peripherals/config.h

@@ -120,7 +120,7 @@ extern "C"
  * @brief Define how quickly to return to searching for a GPS fix after transmitting
  * 
  */
-#define TX_INTERVAL_GPS_FIX_OK 2800 /* When fix was aquired, then sleep for this period (in milliseconds) before searching again */
+#define TX_INTERVAL_GPS_FIX_OK 10000 /* When fix was aquired, then sleep for this period (in milliseconds) before searching again */
 
   /**
    * @brief Lorawan defaults, normally will not be changed 

tests/CMakeLists.txt

@@ -1,21 +1,14 @@
-cmake_minimum_required(VERSION 3.7)
+# src/CMakeLists.txt
+cmake_minimum_required(VERSION 3.5.1)
 
+# For Protobuf's cmake warnings
+if(POLICY CMP0077)
+  cmake_policy(SET CMP0077 NEW)
+endif()
 
-# Get the test framework Cpputest
-include(FetchContent)
-FetchContent_Declare(
-    cpputest
-    GIT_REPOSITORY https://github.com/cpputest/cpputest.git
-    GIT_TAG v4.0
-)
-# Set this to ON if you want to have the CppUTests in your project as well.
-set(TESTS OFF CACHE BOOL "Switch off CppUTest Test build")
-
-
-set(CPPUTEST_CXX_FLAGS "${CPPUTEST_CXX_FLAGS}  -m32")
-set(CPPUTEST_LD_FLAGS "${CPPUTEST_LD_FLAGS}  -m32")
+# project(hello C CXX)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-FetchContent_MakeAvailable(cpputest)
 
 add_definitions(
     -DREGION_EU868
@@ -35,9 +28,6 @@ add_definitions(
 )
 
 
-include_directories(${CPPUTEST_SRC_DIR})
-include_directories(${CPPUTESTEXT_SRC_DIR})
-
 # Test includes
 include_directories(${PROJECT_SOURCE_DIR}/mocking)
 include_directories(${PROJECT_SOURCE_DIR}/tests/mocks/)
@@ -65,7 +55,7 @@ include_directories(${PROJECT_SOURCE_DIR}/src/radio/sx1276/)
 
 # Unittests
 set(UNIT_TESTS 
-    main.cpp
+    # main.cpp
     geofence_ut.cpp
     playback_ut.cpp
     lorawan_credentials_ut.cpp
@@ -93,18 +83,12 @@ set(MOCKS
     systime-mock.cpp
     ublox-mock.cpp
     nvm_images.cpp
-    gps_mock_utils.cpp
     delay-board-mock.c
     gpio_mock.c
     rtc-board-mock.c
     mocks/rtc_mock.c
 )
 
-
-
-# CLI sources
-
-
 # Put in compile files(all logic so no hardware connection)    
 set(FILES_UNDER_TEST 
     ${PROJECT_SOURCE_DIR}/src/peripherals/geofence.c
@@ -120,10 +104,9 @@ set(FILES_UNDER_TEST
     ${PROJECT_SOURCE_DIR}/src/apps/LoRaMac/common/LmHandler/LmHandler.c
     ${PROJECT_SOURCE_DIR}/src/system/delay.c
     ${PROJECT_SOURCE_DIR}/src/system/timer.c
-    ${PROJECT_SOURCE_DIR}/src/apps/LoRaMac/common/callbacks.c
-
-
-
+    ${PROJECT_SOURCE_DIR}/src/apps/LoRaMac/common/callbacks.c  
+    ${PROJECT_SOURCE_DIR}/src/apps/LoRaMac/periodic-uplink-lpp/B-L072Z-LRWAN1/main.cpp
+
     # Compile region files
     ${PROJECT_SOURCE_DIR}/src/mac/region/RegionAU915.c
     ${PROJECT_SOURCE_DIR}/src/mac/region/RegionUS915.c
@@ -168,24 +151,63 @@ set(FILES_UNDER_TEST
     ${PROJECT_SOURCE_DIR}/src/apps/LoRaMac/common/message_sender.c
 
     ${PROJECT_SOURCE_DIR}/src/system/nvmm.c
-
+    greeter_client.cc
+
 )
 
-set(SOURCE_FILES
-    ${UNIT_TESTS}
-    ${MOCKS}
+find_package(Threads REQUIRED)
+
+# Find Protobuf installation
+# Looks for protobuf-config.cmake file installed by Protobuf's cmake installation.
+set(protobuf_MODULE_COMPATIBLE TRUE)
+find_package(Protobuf CONFIG REQUIRED)
+message(STATUS "Using protobuf ${Protobuf_VERSION}")
+
+set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)
+set(_REFLECTION gRPC::grpc++_reflection)
+find_program(_PROTOBUF_PROTOC protoc)
+
+# Find gRPC installation
+# Looks for gRPCConfig.cmake file installed by gRPC's cmake installation.
+find_package(gRPC CONFIG REQUIRED)
+message(STATUS "Using gRPC ${gRPC_VERSION}")
+
+set(_GRPC_GRPCPP gRPC::grpc++)
+find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
+
+# Protos
+get_filename_component(h_proto "hello.proto" ABSOLUTE)
+get_filename_component(h_proto_path "${h_proto}" PATH)
+
+# Generated sources
+set(h_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/hello.pb.cc")
+set(h_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/hello.pb.h")
+set(h_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/hello.grpc.pb.cc")
+set(h_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/hello.grpc.pb.h")
+add_custom_command(
+  OUTPUT "${h_proto_srcs}" "${h_proto_hdrs}" "${h_grpc_srcs}" "${h_grpc_hdrs}"
+  COMMAND ${_PROTOBUF_PROTOC}
+  ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
+    --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
+    -I "${h_proto_path}"
+    --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
+    "${h_proto}"
+  DEPENDS "${h_proto}")
+
+# Generated sources headers
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+
+# Targets (the binaries)
+
+add_executable("project"
     ${FILES_UNDER_TEST}
+    ${MOCKS}
+    ${h_proto_srcs}
+    ${h_grpc_srcs}
+)
+target_link_libraries("project"
+    ${_REFLECTION}
+    ${_GRPC_GRPCPP}
+    ${_PROTOBUF_LIBPROTOBUF}
 )
 
-add_executable(picotracker_lora_tests ${SOURCE_FILES})
-target_compile_options(picotracker_lora_tests PRIVATE -fshort-enums)
-# target_compile_options(picotracker_lora_tests PRIVATE -Wall -Wextra -Wpedantic)
-target_link_libraries(picotracker_lora_tests PRIVATE CppUTest CppUTestExt)
-
-
-# only build 32-bit binaries
-target_compile_options(picotracker_lora_tests PRIVATE -m32)
-target_link_options(picotracker_lora_tests PRIVATE -m32)
-
-# Add tests
-add_test(picotracker_lora_tests picotracker_lora_tests -p) # Pass option to run CppUTests all on different threads

tests/bsp_mock.cpp

@@ -1,4 +1,3 @@
-#include "CppUTestExt/MockSupport.h"
 
 extern "C"
 {

tests/eeprom-board-mock.cpp

@@ -23,7 +23,6 @@
  * Modified by Medad Newman for unittesting
  */
 
-#include "CppUTestExt/MockSupport.h"
 
 extern "C"
 {