Improve UNIT_TEST_RUN macro to correctly manage function name passing…

… to unity.
Luos-io · May 5, 2023 · 3af5b9b · 3af5b9b
1 parent bcfc661
commit 3af5b9b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -32,4 +32,4 @@ build_type = debug
 test_build_src = true
 
 ; To debug a test, replace "test_template" by the directory test name you want to debug (example : "test_msg_alloc")
-debug_test = tests_io/test_filter
+debug_test = tests_io/test_msg_alloc
diff --git a/test/_resources/Unity/unit_test.c b/test/_resources/Unity/unit_test.c
@@ -27,21 +27,6 @@ bool try_state = false;
  * Function
  ******************************************************************************/
 
-/******************************************************************************
- * @brief Launch a unit test
- * @param None
- * @return None
- ******************************************************************************/
-void RUN(const char *name, void (*function)(void))
-{
-    printf("\n\n===============================================================================================================\n");
-    printf("Unit test function : %s\n", name);
-    printf("===============================================================================================================\n");
-
-    test_case_number = 0;
-    RUN_TEST(function);
-}
-
 /******************************************************************************
  * @brief Start a new test case
  * @param title (test description title)
@@ -150,4 +135,4 @@ void setUp(void)
 
 void tearDown(void)
 {
-}
+}
diff --git a/test/_resources/Unity/unit_test.h b/test/_resources/Unity/unit_test.h
@@ -24,9 +24,15 @@
 
 extern jmp_buf err_ctx;
 extern bool try_state;
+extern uint16_t test_case_number;
 
 #ifndef UNIT_TEST_RUN
-    #define UNIT_TEST_RUN(f) RUN(#f, f)
+    #define UNIT_TEST_RUN(f)                                                                                                             \
+        printf("\n\n===============================================================================================================\n"); \
+        printf("Unit test function : %s\n", #f);                                                                                         \
+        printf("===============================================================================================================\n");     \
+        test_case_number = 0;                                                                                                            \
+        RUN_TEST(f)
 #endif
 
 #define TRY           \

diff --git a/test/tests_core/test_topic/main.c b/test/tests_core/test_topic/main.c
@@ -129,4 +129,4 @@ int main(int argc, char **argv)
     UNIT_TEST_RUN(unittest_Luos_Unsubscribe);
 
     UNITY_END();
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -129,4 +129,4 @@ int main(int argc, char **argv) @@
         UNIT_TEST_RUN(unittest_Luos_Unsubscribe);
         UNITY_END();
-    }
+    }