ucx: comparison src/cx/test.h

-:560a60fcf6ee
+:d53be93acc10
 *   // tests with CX_TEST_ASSERT()
 * }
 *
 * CX_TEST(function_name) {
 *   // memory allocation and other stuff here
-*   #CX_TEST_DO {
+*   CX_TEST_DO {
 *     // tests with CX_TEST_ASSERT() and/or
 *     // calls with CX_TEST_CALL_SUBROUTINE() here
 *   }
 *   // cleanup of memory here
 * }
 */
 #ifndef UCX_TEST_H
 #define	UCX_TEST_H
-#include "common.h"
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <setjmp.h>
 #ifndef __FUNCTION__
 #endif
 /** Type for the CxTestSuite. */
 typedef struct CxTestSuite CxTestSuite;
+/** Output function compatible to cx_write_func */
+typedef size_t (*cx_test_output_func)(const void*, size_t, size_t, void*);
 /** Pointer to a test function. */
-typedef void(*CxTest)(CxTestSuite *, void *, cx_write_func);
+typedef void(*CxTest)(CxTestSuite *, void *, cx_test_output_func);
 /** Type for the internal list of test cases. */
 typedef struct CxTestSet CxTestSet;
 /** Structure for the internal list of test cases. */
 /**
 * Creates a new test suite.
 * @param name optional name of the suite
 * @return a new test suite
 */
-CX_NONNULL CX_NODISCARD  CX_CSTR_ARG(1) CX_MALLOC
 static inline CxTestSuite* cx_test_suite_new(const char *name) {
 CxTestSuite* suite = (CxTestSuite*) malloc(sizeof(CxTestSuite));
 if (suite != NULL) {
 suite->name = name;
 suite->success = 0;
 /**
 * Deallocates a test suite.
 *
 * @param suite the test suite to free
 */
-CX_INLINE void cx_test_suite_free(CxTestSuite* suite) {
+static inline void cx_test_suite_free(CxTestSuite* suite) {
 if (suite == NULL) return;
 CxTestSet *l = suite->tests;
 while (l != NULL) {
 CxTestSet *e = l;
 l = l->next;
 * @param suite the suite the test function shall be added to
 * @param test the test function to register
 * @retval zero success
 * @retval non-zero failure
 */
-CX_NONNULL
+static inline int cx_test_register(CxTestSuite* suite, CxTest test) {
-CX_INLINE int cx_test_register(CxTestSuite* suite, CxTest test) {
 CxTestSet *t = (CxTestSet*) malloc(sizeof(CxTestSet));
 if (t) {
 t->test = test;
 t->next = NULL;
 if (suite->tests == NULL) {
 * Runs a test suite and writes the test log to the specified stream.
 * @param suite the test suite to run
 * @param out_target the target buffer or file to write the output to
 * @param out_writer the write function writing to @p out_target
 */
-CX_NONNULL
+static inline void cx_test_run(CxTestSuite *suite, void *out_target,
-CX_INLINE void cx_test_run(CxTestSuite *suite, void *out_target, cx_write_func out_writer) {
+cx_test_output_func out_writer) {
 if (suite->name == NULL) {
 out_writer("*** Test Suite ***\n", 1, 19, out_target);
 } else {
 out_writer("*** Test Suite : ", 1, 17, out_target);
 out_writer(suite->name, 1, strlen(suite->name), out_target);
 /**
 * Runs a test suite and writes the test log to the specified FILE stream.
 * @param suite (@c CxTestSuite*) the test suite to run
 * @param file (@c FILE*) the target file to write the output to
 */
-#define cx_test_run_f(suite, file) cx_test_run(suite, (void*)file, (cx_write_func)fwrite)
+#define cx_test_run_f(suite, file) cx_test_run(suite, (void*)file, \
+(cx_test_output_func) fwrite)
 /**
 * Runs a test suite and writes the test log to stdout.
 * @param suite (@c CxTestSuite*) the test suite to run
 */
 *
 * Use this macro to declare and/or define a #CxTest function.
 *
 * @param name the name of the test function
 */
-#define CX_TEST(name) void name(CxTestSuite* _suite_,void *_output_, cx_write_func _writefnc_)
+#define CX_TEST(name) void name(CxTestSuite* _suite_,void *_output_, \
+cx_test_output_func _writefnc_)
 /**
 * Defines the scope of a test.
 *
 * @code
 * If the assertion is correct, the test carries on. If the assertion is not
 * correct, the specified message (terminated by a dot and a line break) is
 * written to the test suites output stream.
 * @param condition (@c bool) the condition to check
 */
-#define CX_TEST_ASSERT(condition) CX_TEST_ASSERTM(condition, #condition " failed")
+#define CX_TEST_ASSERT(condition) \
+CX_TEST_ASSERTM(condition, #condition " failed")
 /**
 * Macro for a test subroutine function header.
 *
 * Use this to declare and/or define a subroutine that can be called by using
 * @param ... the parameter list
 *
 * @see CX_TEST_CALL_SUBROUTINE()
 */
 #define CX_TEST_SUBROUTINE(name,...) void name(CxTestSuite* _suite_,\
-void *_output_, cx_write_func _writefnc_, jmp_buf _env_, __VA_ARGS__)
+void *_output_, cx_test_output_func _writefnc_, \
+jmp_buf _env_, __VA_ARGS__)
 /**
 * Macro for calling a test subroutine.
 *
 * Subroutines declared with CX_TEST_SUBROUTINE() can be called by using this

Mercurial > hg > ucx / file comparison

comparison: src/cx/test.h

src/cx/test.h