Merge pull request #424 from Luos-io/feat/secure_tests_default_scenario

Secure unit test default scenario and cleanup build and stuff

Author: JeromeGalan

test/_resources/Mock/luos_hal.c engine/HAL/STUB/luos_hal.c

@@ -26,6 +26,7 @@ build_flags =
     -O1
     -include ./test/_resources/node_config.h
     -DUNIT_TEST
+    -D LUOSHAL=STUB
 
 build_type = debug
 test_build_src = true

test/_resources/Mock/luos_hal.h engine/HAL/STUB/luos_hal.h

@@ -101,18 +101,15 @@
             "\t* Telemetry disabled, please consider enabling it by removing the 'NOTELEMETRY' flag to help Luos_engine improve.", fg="red")
     click.secho("")
 
-# Native only
+# Native only => we should put this on a specific script on engine/HAL/STUB
 for item in env.ParseFlags(env['BUILD_FLAGS'])["CPPDEFINES"]:
     if (item == 'UNIT_TEST'):
         click.secho("Native unit testing:", underline=True)
         current_os = pf.system()
         click.secho("\t* Native Mock HAL for %s is selected for Luos and Robus." %
                     current_os, fg="green")
-        find_HAL = True
-        env.Replace(SRC_FILTER=sources)
-        env.Append(SRC_FILTER=["-<test/>"])
-        env.Append(SRC_FILTER=["+<../../../test/_resources/*>"])
 
+        env.Append(SRC_FILTER=["+<../../../test/_resources/*>"])
         for resources in scandir(getcwd() + "/test/_resources"):
             if resources.is_dir():
                 env.Append(CPPPATH=[(resources.path)])

test/_resources/Mock/luos_hal_config.h engine/HAL/STUB/luos_hal_config.h

@@ -5,37 +5,16 @@
  * @version 1.0.0
  ******************************************************************************/
 #include <stdio.h>
-#include "context.h"
 #include "default_scenario.h"
-#include "unit_test.h"
-
-/*******************************************************************************
- * Definitions
- ******************************************************************************/
-#define LUOS_TASK_NUMBER 3
-#define TX_TASK_NUMBER   3
 
 /*******************************************************************************
  * Variables
  ******************************************************************************/
-
 default_scenario_t default_sc;
-extern volatile uint8_t msg_buffer[MSG_BUFFER_SIZE];
-
-volatile uint8_t *transmit_msg;
-msg_t receive_msg[DUMMY_SERVICE_NUMBER];
-uint8_t stream_Buffer1[STREAM_BUFFER_SIZE] = {0};
-uint8_t stream_Buffer2[STREAM_BUFFER_SIZE] = {0};
-streaming_channel_t Default_StreamChannel1;
-streaming_channel_t Default_StreamChannel2;
 
 /*******************************************************************************
  * Function
  ******************************************************************************/
-extern void MsgAlloc_LuosTaskAlloc(ll_service_t *service_concerned_by_current_msg, msg_t *concerned_msg);
-
-static void Reset_Streaming(void);
-static void Init_Messages(void);
 static void Detection(service_t *service);
 static void App_1_MsgHandler(service_t *service, msg_t *msg);
 static void App_2_MsgHandler(service_t *service, msg_t *msg);
@@ -48,6 +27,18 @@ static void App_3_MsgHandler(service_t *service, msg_t *msg);
  ******************************************************************************/
 void Init_Context(void)
 {
+    // Reset context
+    RESET_ASSERT();
+    Luos_ServicesClear();
+    RoutingTB_Erase(); // Delete RTB
+    Luos_Init();
+    if (IS_ASSERT())
+    {
+        printf("[FATAL] Can't reset scenario context\n");
+        TEST_ASSERT_TRUE(IS_ASSERT());
+    }
+    Luos_Loop();
+
     RESET_ASSERT();
     Luos_Init();
 
@@ -57,49 +48,17 @@ void Init_Context(void)
     default_sc.App_2.app = Luos_CreateService(App_2_MsgHandler, VOID_TYPE, "Dummy_App_2", revision);
     default_sc.App_3.app = Luos_CreateService(App_3_MsgHandler, VOID_TYPE, "Dummy_App_3", revision);
 
-    Reset_Streaming();
-    // Create stream channels
-    Default_StreamChannel1 = Stream_CreateStreamingChannel(stream_Buffer1, STREAM_BUFFER_SIZE, 1);
-    Default_StreamChannel2 = Stream_CreateStreamingChannel(stream_Buffer2, STREAM_BUFFER_SIZE, 1);
-
     // Detection
     Detection(default_sc.App_1.app);
     Luos_Loop();
 
-    // Init messages pointers
-    transmit_msg = msg_buffer;
-
-    // Fill basic messages
-    Init_Messages();
-
     if (IS_ASSERT())
     {
         printf("[FATAL] Can't initialize scenario context\n");
         TEST_ASSERT_TRUE(IS_ASSERT());
     }
 }
 
-/******************************************************************************
- * @brief Reset context to init state
- * @param None
- * @return None
- ******************************************************************************/
-void Reset_Context(void)
-{
-    RESET_ASSERT();
-    Luos_ServicesClear();
-    RoutingTB_Erase(); // Delete RTB
-    Luos_Init();
-    transmit_msg = msg_buffer;
-    Init_Messages();
-    Reset_Streaming();
-    if (IS_ASSERT())
-    {
-        printf("[FATAL] Can't reset scenario context\n");
-        TEST_ASSERT_TRUE(IS_ASSERT());
-    }
-}
-
 /******************************************************************************
  * @brief Launch a detection
  * @param Service who launches the detection
@@ -110,123 +69,14 @@ static void Detection(service_t *service)
     search_result_t result;
 
     Luos_Detect(service);
-    Luos_Loop();
+    do
+    {
+        Luos_Loop();
+    } while (!Luos_IsNodeDetected());
 
     RTFilter_Reset(&result);
     printf("[INFO] %d services are active\n", result.result_nbr);
-    TEST_ASSERT_EQUAL(DUMMY_SERVICE_NUMBER, result.result_nbr);
-}
-
-/******************************************************************************
- * @brief Messages are reseted to default values
- * @param None
- * @return None
- ******************************************************************************/
-void Init_Messages(void)
-{
-    // Init tx messages pointers
-    default_sc.App_1.tx_msg = (msg_t *)(&msg_buffer[0]);
-    default_sc.App_2.tx_msg = (msg_t *)(&msg_buffer[sizeof(msg_t)]);
-    default_sc.App_3.tx_msg = (msg_t *)(&msg_buffer[0]);
-
-    // Init rx messages pointers
-    default_sc.App_1.last_rx_msg = &receive_msg[0];
-    default_sc.App_2.last_rx_msg = &receive_msg[1];
-    default_sc.App_3.last_rx_msg = &receive_msg[2];
-
-    // App 1 : Send message to App 2
-    // -------------------------------
-    default_sc.App_1.tx_msg->header.config      = PROTOCOL_REVISION;
-    default_sc.App_1.tx_msg->header.source      = 1;
-    default_sc.App_1.tx_msg->header.target      = 2;
-    default_sc.App_1.tx_msg->header.target_mode = SERVICEIDACK;
-    default_sc.App_1.tx_msg->header.cmd         = DEFAULT_CMD;
-    default_sc.App_1.tx_msg->header.size        = MAX_DATA_MSG_SIZE;
-
-    // App 2 : Send message to App 1
-    // -------------------------------
-    default_sc.App_2.tx_msg->header.config      = PROTOCOL_REVISION;
-    default_sc.App_2.tx_msg->header.source      = 2;
-    default_sc.App_2.tx_msg->header.target      = 1;
-    default_sc.App_2.tx_msg->header.target_mode = SERVICEIDACK;
-    default_sc.App_2.tx_msg->header.cmd         = DEFAULT_CMD;
-    default_sc.App_2.tx_msg->header.size        = MAX_DATA_MSG_SIZE; // data = half of max size
-
-    // App 3 : Send message to App 2
-    // -------------------------------
-    default_sc.App_3.tx_msg->header.config      = PROTOCOL_REVISION;
-    default_sc.App_3.tx_msg->header.source      = 3;
-    default_sc.App_3.tx_msg->header.target      = 2;
-    default_sc.App_3.tx_msg->header.target_mode = SERVICEIDACK;
-    default_sc.App_3.tx_msg->header.cmd         = DEFAULT_CMD;
-    default_sc.App_3.tx_msg->header.size        = MAX_DATA_MSG_SIZE; // data = half of max size
-
-    // TX message : Only fill half of datas with a counter
-    for (uint16_t i = 0; i < MAX_DATA_MSG_SIZE / 2; i++)
-    {
-        default_sc.App_1.tx_msg->data[i] = (uint8_t)i;
-        default_sc.App_2.tx_msg->data[i] = (uint8_t)i;
-        default_sc.App_3.tx_msg->data[i] = (uint8_t)i;
-    }
-    // TX message : Last half of datas is set to 0
-    for (uint16_t i = MAX_DATA_MSG_SIZE / 2; i < MAX_DATA_MSG_SIZE; i++)
-    {
-        default_sc.App_1.tx_msg->data[i] = 0;
-        default_sc.App_2.tx_msg->data[i] = 0;
-        default_sc.App_3.tx_msg->data[i] = 0;
-    }
-    // RX message : datas are set to 0
-    for (uint16_t i = 0; i < MAX_DATA_MSG_SIZE; i++)
-    {
-        default_sc.App_1.last_rx_msg->data[i] = 0;
-        default_sc.App_2.last_rx_msg->data[i] = 0;
-        default_sc.App_3.last_rx_msg->data[i] = 0;
-    }
-}
-
-/******************************************************************************
- * @brief Create a streaming channel
- * @param None
- * @return None
- ******************************************************************************/
-static void Reset_Streaming(void)
-{
-    // Stream Channel reset
-    Stream_ResetStreamingChannel(&Default_StreamChannel1);
-    Stream_ResetStreamingChannel(&Default_StreamChannel2);
-    default_sc.streamChannel1 = &Default_StreamChannel1;
-    default_sc.streamChannel2 = &Default_StreamChannel2;
-    for (uint16_t i = 0; i < STREAM_BUFFER_SIZE; i++)
-    {
-        stream_Buffer1[i] = (uint8_t)(i);
-        stream_Buffer2[i] = (uint8_t)(i);
-    }
-}
-/******************************************************************************
- * @brief Loop Service App_1
- * @param None
- * @return None
- ******************************************************************************/
-void App_1_Loop(void)
-{
-}
-
-/******************************************************************************
- * @brief Loop Service App_2
- * @param None
- * @return None
- ******************************************************************************/
-void App_2_Loop(void)
-{
-}
-
-/******************************************************************************
- * @brief Loop Service App_3
- * @param None
- * @return None
- ******************************************************************************/
-void App_3_Loop(void)
-{
+    TEST_ASSERT_EQUAL(3, result.result_nbr);
 }
 
 /******************************************************************************
@@ -237,23 +87,7 @@ void App_3_Loop(void)
  ******************************************************************************/
 static void App_1_MsgHandler(service_t *service, msg_t *msg)
 {
-    default_sc.App_1.last_rx_msg->header.config      = msg->header.config;
-    default_sc.App_1.last_rx_msg->header.source      = msg->header.source;
-    default_sc.App_1.last_rx_msg->header.target      = msg->header.target;
-    default_sc.App_1.last_rx_msg->header.target_mode = msg->header.target_mode;
-    default_sc.App_1.last_rx_msg->header.cmd         = msg->header.cmd;
-    default_sc.App_1.last_rx_msg->header.size        = msg->header.size;
-    for (uint16_t i = 0; i < msg->header.size; i++)
-    {
-        default_sc.App_1.last_rx_msg->data[i] = msg->data[i];
-    }
-    if (msg->header.config == TIMESTAMP_PROTOCOL)
-    {
-        for (uint16_t i = 0; i < sizeof(time_luos_t); i++)
-        {
-            default_sc.App_1.last_rx_msg->data[msg->header.size + i] = msg->data[msg->header.size + i];
-        }
-    }
+    memcpy(&default_sc.App_1.last_rx_msg, msg, sizeof(msg_t));
 }
 
 /******************************************************************************
@@ -264,23 +98,7 @@ static void App_1_MsgHandler(service_t *service, msg_t *msg)
  ******************************************************************************/
 static void App_2_MsgHandler(service_t *service, msg_t *msg)
 {
-    default_sc.App_2.last_rx_msg->header.config      = msg->header.config;
-    default_sc.App_2.last_rx_msg->header.source      = msg->header.source;
-    default_sc.App_2.last_rx_msg->header.target      = msg->header.target;
-    default_sc.App_2.last_rx_msg->header.target_mode = msg->header.target_mode;
-    default_sc.App_2.last_rx_msg->header.cmd         = msg->header.cmd;
-    default_sc.App_2.last_rx_msg->header.size        = msg->header.size;
-    for (uint16_t i = 0; i < msg->header.size; i++)
-    {
-        default_sc.App_2.last_rx_msg->data[i] = msg->data[i];
-    }
-    if (msg->header.config == TIMESTAMP_PROTOCOL)
-    {
-        for (uint16_t i = 0; i < sizeof(time_luos_t); i++)
-        {
-            default_sc.App_2.last_rx_msg->data[msg->header.size + i] = msg->data[msg->header.size + i];
-        }
-    }
+    memcpy(&default_sc.App_2.last_rx_msg, msg, sizeof(msg_t));
 }
 
 /******************************************************************************
@@ -291,23 +109,5 @@ static void App_2_MsgHandler(service_t *service, msg_t *msg)
  ******************************************************************************/
 static void App_3_MsgHandler(service_t *service, msg_t *msg)
 {
-    // Save last message
-    default_sc.App_3.last_rx_msg->header.config      = msg->header.config;
-    default_sc.App_3.last_rx_msg->header.source      = msg->header.source;
-    default_sc.App_3.last_rx_msg->header.target      = msg->header.target;
-    default_sc.App_3.last_rx_msg->header.target_mode = msg->header.target_mode;
-    default_sc.App_3.last_rx_msg->header.cmd         = msg->header.cmd;
-    default_sc.App_3.last_rx_msg->header.size        = msg->header.size;
-    for (uint16_t i = 0; i < msg->header.size; i++)
-    {
-        default_sc.App_3.last_rx_msg->data[i] = msg->data[i];
-    }
-
-    if (msg->header.config == TIMESTAMP_PROTOCOL)
-    {
-        for (uint16_t i = 0; i < sizeof(time_luos_t); i++)
-        {
-            default_sc.App_3.last_rx_msg->data[msg->header.size + i] = msg->data[msg->header.size + i];
-        }
-    }
+    memcpy(&default_sc.App_3.last_rx_msg, msg, sizeof(msg_t));
 }