rewrite test

Author: qgymib

src/cutest.c

@@ -905,14 +905,31 @@ static int _cutest_porting_color_vfprintf(FILE* stream, cutest_porting_color_t c
 
 #endif
 
+/**
+ * @brief Protocol type of #cutest_porting_cvfprintf().
+ */
+typedef int (*cutest_porting_cvfprintf_fn)(FILE* stream, int color,
+    const char* fmt, va_list ap);
+
 /**
  * @brief Print data to \p stream.
  */
 int cutest_porting_cvfprintf(FILE* stream, int color, const char* fmt, va_list ap)
 {
-    int ret;
-    CUTEST_PORTING_ASSERT(stream != NULL);
+    /* Internal behavior for capture output. */
+    static cutest_porting_cvfprintf_fn s_proxy = NULL;
+    if (stream == NULL && color == -1)
+    {
+        s_proxy = (cutest_porting_cvfprintf_fn)fmt;
+        return 0;
+    }
+    if (s_proxy != NULL)
+    {
+        return s_proxy(stream, color, fmt, ap);
+    }
 
+    /* Standard behavior. */
+    int ret;
     int stream_fd = fileno(stream);
     if (!_cutest_should_use_color(isatty(stream_fd)) || (color == CUTEST_COLOR_DEFAULT))
     {

test2/CMakeLists.txt

@@ -1,4 +1,6 @@
 add_executable(cutest_test
+    cases/__init__.c
+    cases/cmd_also_run_disabled_tests.c
     tools/__init__.c
     tools/eolcheck.c
     tools/help.c

test2/cases/__init__.c

@@ -0,0 +1,23 @@
+#include <stdlib.h>
+#include "__init__.h"
+
+extern const test_case_t cmd_also_run_disabled_tests;
+
+static const test_case_t* s_test_cases[] = {
+    &cmd_also_run_disabled_tests,
+};
+
+int test_run_all_tests(void)
+{
+    size_t i;
+    for (i = 0; i < TEST_ARRAY_SIZE(s_test_cases); i++)
+    {
+        const test_case_t* tc = s_test_cases[i];
+
+        fprintf(stdout, "[ RUN      ] %s\n", tc->name);
+        tc->proc();
+        fprintf(stdout, "[       OK ] %s\n", tc->name);
+    }
+
+    return 0;
+}

test2/cases/__init__.h

@@ -0,0 +1,28 @@
+#ifndef __CUTEST_TEST_CASE_INIT_H__
+#define __CUTEST_TEST_CASE_INIT_H__
+
+#include "cutest.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct test_case
+{
+    /**
+     * @brief Test case name.
+     */
+    const char* name;
+
+    /**
+     * @brief Test case body.
+     */
+    void (*proc)(void);
+} test_case_t;
+
+int test_run_all_tests(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

test2/cases/cmd_also_run_disabled_tests.c

@@ -0,0 +1,12 @@
+#include "__init__.h"
+
+
+
+static void _cmd_also_run_disabled_tests(void)
+{
+    
+}
+
+const test_case_t cmd_also_run_disabled_tests = {
+"cmd.also_run_disabled_tests", _cmd_also_run_disabled_tests,
+};

test2/main.c

@@ -1,6 +1,8 @@
+#include "cases/__init__.h"
 #include "test.h"
 
 int main(int argc, char* argv[])
 {
-    return cutest_run_tests(argc, argv, stdout, &test_hook);
+    cutest_test_run_tools(argc, argv);
+    return test_run_all_tests();
 }

test2/test.c

@@ -8,7 +8,7 @@ static const char* s_tool_help =
 "what tools builtin.\n"
 ;
 
-static void _before_all_test(int argc, char* argv[])
+void cutest_test_run_tools(int argc, char* argv[])
 {
     int i;
     for (i = 0; i < argc; i++)
@@ -27,7 +27,7 @@ static void _before_all_test(int argc, char* argv[])
 }
 
 const cutest_hook_t test_hook = {
-    _before_all_test,   /* .before_all_test */
+    NULL,               /* .before_all_test */
     NULL,               /* .after_all_test */
     NULL,               /* .before_setup */
     NULL,               /* .after_setup */

test2/test.h

@@ -12,6 +12,8 @@ extern "C" {
  */
 extern const cutest_hook_t test_hook;
 
+void cutest_test_run_tools(int argc, char* argv[]);
+
 #ifdef __cplusplus
 }
 #endif