nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #564 from bebehei/testsuite

Browse Source 
Misc Testsuite updates
This commit is contained in:
Benedikt Heine 2018-11-26 15:00:45 +01:00 committed by GitHub
commit 7b1157c5af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 564 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.valgrind.suppressions
View File

@ -1,28 +1,43 @@
# librsvg leaks some memory, when an invalid svg file is read # rsvg_error_handle_close got fixed in
# TODO: find the memory leak and fix it upstream # - GNOME/librsvg@7bf1014
# (2018-11-12, first tags: v2.45.0, v2.44.9)
# but the release has to seep into the distros
{ {
invalid_svgs1 rsvg_error_handle_close
Memcheck:Leak Memcheck:Leak
... match-leak-kinds: definite
fun:gdk_pixbuf__svg_image_load_increment fun:malloc
... fun:g_malloc
fun:g_slice_alloc
fun:g_error_new_valist
fun:g_set_error
obj:*/librsvg-2.so*
obj:*/librsvg-2.so*
obj:*/loaders/libpixbufloader-svg.so
obj:*/libgdk_pixbuf-2.0.so*
fun:gdk_pixbuf_new_from_file
fun:get_pixbuf_from_file fun:get_pixbuf_from_file
...
} }
# rsvg_error_writehandler got fixed in
# - GNOME/librsvg@7b4cc9b
# (2018-11-12, first tags: v2.45.0, v2.44.9)
# but the release has to seep into the distros
{ {
invalid_svgs2 rsvg_error_writehandler
Memcheck:Leak Memcheck:Leak
... match-leak-kinds: definite
fun:gdk_pixbuf__svg_image_begin_load fun:malloc
... fun:g_malloc
fun:get_pixbuf_from_file fun:g_slice_alloc
} fun:g_error_new_valist
fun:g_set_error
{ obj:*/librsvg-2.so*
invalid_svgs3
Memcheck:Leak
...
fun:rsvg_handle_write fun:rsvg_handle_write
... obj:*/loaders/libpixbufloader-svg.so
obj:*/libgdk_pixbuf-2.0.so*
fun:gdk_pixbuf_new_from_file
fun:get_pixbuf_from_file fun:get_pixbuf_from_file
...
} }

4
Makefile
View File

@ -71,7 +71,7 @@ dunstify: dunstify.o
.PHONY: test test-valgrind test-coverage .PHONY: test test-valgrind test-coverage
test: test/test clean-coverage-run test: test/test clean-coverage-run
./test/test ./test/test -v
test-valgrind: test/test test-valgrind: test/test
valgrind \ valgrind \
@ -81,7 +81,7 @@ test-valgrind: test/test
--errors-for-leak-kinds=definite \ --errors-for-leak-kinds=definite \
--num-callers=40 \ --num-callers=40 \
--error-exitcode=123 \ --error-exitcode=123 \
./test/test ./test/test -v
test-coverage: CFLAGS += -fprofile-arcs -ftest-coverage -O0 test-coverage: CFLAGS += -fprofile-arcs -ftest-coverage -O0
test-coverage: test test-coverage: test

624
test/greatest.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2016 Scott Vokes <vokes.s@gmail.com> * Copyright (c) 2011-2018 Scott Vokes <vokes.s@gmail.com>
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -17,14 +17,14 @@
#ifndef GREATEST_H #ifndef GREATEST_H
#define GREATEST_H #define GREATEST_H
#ifdef __cplusplus #if defined(__cplusplus) && !defined(GREATEST_NO_EXTERN_CPLUSPLUS)
extern "C" { extern "C" {
#endif #endif
/* 1.2.1 */ /* 1.4.0 */
#define GREATEST_VERSION_MAJOR 1 #define GREATEST_VERSION_MAJOR 1
#define GREATEST_VERSION_MINOR 2 #define GREATEST_VERSION_MINOR 4
#define GREATEST_VERSION_PATCH 1 #define GREATEST_VERSION_PATCH 0
/* A unit testing system for C, contained in 1 file. /* A unit testing system for C, contained in 1 file.
* It doesn't use dynamic allocation or depend on anything * It doesn't use dynamic allocation or depend on anything
@ -122,6 +122,12 @@ int main(int argc, char **argv) {
#define GREATEST_USE_LONGJMP 1 #define GREATEST_USE_LONGJMP 1
#endif #endif
/* Make it possible to replace fprintf with another
* function with the same interface. */
#ifndef GREATEST_FPRINTF
#define GREATEST_FPRINTF fprintf
#endif
#if GREATEST_USE_LONGJMP #if GREATEST_USE_LONGJMP
#include <setjmp.h> #include <setjmp.h>
#endif #endif
@ -141,6 +147,12 @@ int main(int argc, char **argv) {
#define GREATEST_FLOAT_FMT "%g" #define GREATEST_FLOAT_FMT "%g"
#endif #endif
/* Size of buffer for test name + optional '_' separator and suffix */
#ifndef GREATEST_TESTNAME_BUF_SIZE
#define GREATEST_TESTNAME_BUF_SIZE 128
#endif
/********* /*********
* Types * * Types *
*********/ *********/
@ -162,12 +174,12 @@ typedef struct greatest_suite_info {
} greatest_suite_info; } greatest_suite_info;
/* Type for a suite function. */ /* Type for a suite function. */
typedef void (greatest_suite_cb)(void); typedef void greatest_suite_cb(void);
/* Types for setup/teardown callbacks. If non-NULL, these will be run /* Types for setup/teardown callbacks. If non-NULL, these will be run
* and passed the pointer to their additional data. */ * and passed the pointer to their additional data. */
typedef void (greatest_setup_cb)(void *udata); typedef void greatest_setup_cb(void *udata);
typedef void (greatest_teardown_cb)(void *udata); typedef void greatest_teardown_cb(void *udata);
/* Type for an equality comparison between two pointers of the same type. /* Type for an equality comparison between two pointers of the same type.
* Should return non-0 if equal, otherwise 0. * Should return non-0 if equal, otherwise 0.
@ -198,27 +210,45 @@ extern greatest_type_info greatest_type_info_memory;
typedef enum { typedef enum {
GREATEST_FLAG_FIRST_FAIL = 0x01, GREATEST_FLAG_FIRST_FAIL = 0x01,
GREATEST_FLAG_LIST_ONLY = 0x02 GREATEST_FLAG_LIST_ONLY = 0x02,
GREATEST_FLAG_ABORT_ON_FAIL = 0x04
} greatest_flag_t; } greatest_flag_t;
/* Internal state for a PRNG, used to shuffle test order. */
struct greatest_prng {
unsigned char random_order; /* use random ordering? */
unsigned char initialized; /* is random ordering initialized? */
unsigned char pad_0[6];
unsigned long state; /* PRNG state */
unsigned long count; /* how many tests, this pass */
unsigned long count_ceil; /* total number of tests */
unsigned long count_run; /* total tests run */
unsigned long mod; /* power-of-2 ceiling of count_ceil */
unsigned long a; /* LCG multiplier */
unsigned long c; /* LCG increment */
};
/* Struct containing all test runner state. */ /* Struct containing all test runner state. */
typedef struct greatest_run_info { typedef struct greatest_run_info {
unsigned char flags; unsigned char flags;
unsigned char verbosity; unsigned char verbosity;
unsigned char pad_0[2];
unsigned int tests_run; /* total test count */ unsigned int tests_run; /* total test count */
/* currently running test suite */
greatest_suite_info suite;
/* overall pass/fail/skip counts */ /* overall pass/fail/skip counts */
unsigned int passed; unsigned int passed;
unsigned int failed; unsigned int failed;
unsigned int skipped; unsigned int skipped;
unsigned int assertions; unsigned int assertions;
/* currently running test suite */
greatest_suite_info suite;
/* info to print about the most recent failure */ /* info to print about the most recent failure */
const char *fail_file;
unsigned int fail_line; unsigned int fail_line;
unsigned int pad_1;
const char *fail_file;
const char *msg; const char *msg;
/* current setup/teardown hooks and userdata */ /* current setup/teardown hooks and userdata */
@ -234,6 +264,11 @@ typedef struct greatest_run_info {
/* only run a specific suite or test */ /* only run a specific suite or test */
const char *suite_filter; const char *suite_filter;
const char *test_filter; const char *test_filter;
const char *test_exclude;
const char *name_suffix; /* print suffix with test name */
char name_buf[GREATEST_TESTNAME_BUF_SIZE];
struct greatest_prng prng[2]; /* 0: suites, 1: tests */
#if GREATEST_USE_TIME #if GREATEST_USE_TIME
/* overall timers */ /* overall timers */
@ -242,6 +277,8 @@ typedef struct greatest_run_info {
#endif #endif
#if GREATEST_USE_LONGJMP #if GREATEST_USE_LONGJMP
int pad_jmp_buf;
unsigned char pad_2[4];
jmp_buf jump_dest; jmp_buf jump_dest;
#endif #endif
} greatest_run_info; } greatest_run_info;
@ -261,30 +298,37 @@ extern greatest_run_info greatest_info;
/* Type for ASSERT_ENUM_EQ's ENUM_STR argument. */ /* Type for ASSERT_ENUM_EQ's ENUM_STR argument. */
typedef const char *greatest_enum_str_fun(int value); typedef const char *greatest_enum_str_fun(int value);
/********************** /**********************
* Exported functions * * Exported functions *
**********************/ **********************/
/* These are used internally by greatest. */ /* These are used internally by greatest macros. */
void greatest_do_pass(const char *name); int greatest_test_pre(const char *name);
void greatest_do_fail(const char *name); void greatest_test_post(int res);
void greatest_do_skip(const char *name);
int greatest_pre_test(const char *name);
void greatest_post_test(const char *name, int res);
void greatest_usage(const char *name);
int greatest_do_assert_equal_t(const void *exp, const void *got, int greatest_do_assert_equal_t(const void *exp, const void *got,
greatest_type_info *type_info, void *udata); greatest_type_info *type_info, void *udata);
void greatest_prng_init_first_pass(int id);
int greatest_prng_init_second_pass(int id, unsigned long seed);
void greatest_prng_step(int id);
/* These are part of the public greatest API. */ /* These are part of the public greatest API. */
void GREATEST_SET_SETUP_CB(greatest_setup_cb *cb, void *udata); void GREATEST_SET_SETUP_CB(greatest_setup_cb *cb, void *udata);
void GREATEST_SET_TEARDOWN_CB(greatest_teardown_cb *cb, void *udata); void GREATEST_SET_TEARDOWN_CB(greatest_teardown_cb *cb, void *udata);
void GREATEST_INIT(void);
void GREATEST_PRINT_REPORT(void);
int greatest_all_passed(void); int greatest_all_passed(void);
void greatest_set_test_filter(const char *name); void greatest_set_suite_filter(const char *filter);
void greatest_set_suite_filter(const char *name); void greatest_set_test_filter(const char *filter);
void greatest_set_test_exclude(const char *filter);
void greatest_stop_at_first_fail(void);
void greatest_abort_on_fail(void);
void greatest_list_only(void);
void greatest_get_report(struct greatest_report_t *report); void greatest_get_report(struct greatest_report_t *report);
unsigned int greatest_get_verbosity(void); unsigned int greatest_get_verbosity(void);
void greatest_set_verbosity(unsigned int verbosity); void greatest_set_verbosity(unsigned int verbosity);
void greatest_set_flag(greatest_flag_t flag); void greatest_set_flag(greatest_flag_t flag);
void greatest_set_test_suffix(const char *suffix);
/******************** /********************
@ -293,7 +337,8 @@ void greatest_set_flag(greatest_flag_t flag);
/* If __VA_ARGS__ (C99) is supported, allow parametric testing /* If __VA_ARGS__ (C99) is supported, allow parametric testing
* without needing to manually manage the argument struct. */ * without needing to manually manage the argument struct. */
#if __STDC_VERSION__ >= 19901L || _MSC_VER >= 1800 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19901L) || \
(defined(_MSC_VER) && _MSC_VER >= 1800)
#define GREATEST_VA_ARGS #define GREATEST_VA_ARGS
#endif #endif
@ -325,14 +370,12 @@ typedef enum greatest_test_res {
/* Run a test in the current suite. */ /* Run a test in the current suite. */
#define GREATEST_RUN_TEST(TEST) \ #define GREATEST_RUN_TEST(TEST) \
do { \ do { \
if (greatest_pre_test(#TEST) == 1) { \ if (greatest_test_pre(#TEST) == 1) { \
enum greatest_test_res res = GREATEST_SAVE_CONTEXT(); \ enum greatest_test_res res = GREATEST_SAVE_CONTEXT(); \
if (res == GREATEST_TEST_RES_PASS) { \ if (res == GREATEST_TEST_RES_PASS) { \
res = TEST(); \ res = TEST(); \
} \ } \
greatest_post_test(#TEST, res); \ greatest_test_post(res); \
} else if (GREATEST_LIST_ONLY()) { \
fprintf(GREATEST_STDOUT, " %s\n", #TEST); \
} \ } \
} while (0) } while (0)
@ -343,22 +386,24 @@ typedef enum greatest_test_res {
* which can be a pointer to a struct with multiple arguments. */ * which can be a pointer to a struct with multiple arguments. */
#define GREATEST_RUN_TEST1(TEST, ENV) \ #define GREATEST_RUN_TEST1(TEST, ENV) \
do { \ do { \
if (greatest_pre_test(#TEST) == 1) { \ if (greatest_test_pre(#TEST) == 1) { \
int res = TEST(ENV); \ enum greatest_test_res res = GREATEST_SAVE_CONTEXT(); \
greatest_post_test(#TEST, res); \ if (res == GREATEST_TEST_RES_PASS) { \
} else if (GREATEST_LIST_ONLY()) { \ res = TEST(ENV); \
fprintf(GREATEST_STDOUT, " %s\n", #TEST); \ } \
greatest_test_post(res); \
} \ } \
} while (0) } while (0)
#ifdef GREATEST_VA_ARGS #ifdef GREATEST_VA_ARGS
#define GREATEST_RUN_TESTp(TEST, ...) \ #define GREATEST_RUN_TESTp(TEST, ...) \
do { \ do { \
if (greatest_pre_test(#TEST) == 1) { \ if (greatest_test_pre(#TEST) == 1) { \
int res = TEST(__VA_ARGS__); \ enum greatest_test_res res = GREATEST_SAVE_CONTEXT(); \
greatest_post_test(#TEST, res); \ if (res == GREATEST_TEST_RES_PASS) { \
} else if (GREATEST_LIST_ONLY()) { \ res = TEST(__VA_ARGS__); \
fprintf(GREATEST_STDOUT, " %s\n", #TEST); \ } \
greatest_test_post(res); \
} \ } \
} while (0) } while (0)
#endif #endif
@ -370,8 +415,11 @@ typedef enum greatest_test_res {
(greatest_info.flags & GREATEST_FLAG_LIST_ONLY) (greatest_info.flags & GREATEST_FLAG_LIST_ONLY)
#define GREATEST_FIRST_FAIL() \ #define GREATEST_FIRST_FAIL() \
(greatest_info.flags & GREATEST_FLAG_FIRST_FAIL) (greatest_info.flags & GREATEST_FLAG_FIRST_FAIL)
#define GREATEST_ABORT_ON_FAIL() \
(greatest_info.flags & GREATEST_FLAG_ABORT_ON_FAIL)
#define GREATEST_FAILURE_ABORT() \ #define GREATEST_FAILURE_ABORT() \
(greatest_info.suite.failed > 0 && GREATEST_FIRST_FAIL()) (GREATEST_FIRST_FAIL() && \
(greatest_info.suite.failed > 0 || greatest_info.failed > 0))
/* Message-less forms of tests defined below. */ /* Message-less forms of tests defined below. */
#define GREATEST_PASS() GREATEST_PASSm(NULL) #define GREATEST_PASS() GREATEST_PASSm(NULL)
@ -432,17 +480,17 @@ typedef enum greatest_test_res {
} while (0) } while (0)
/* Fail if EXP != GOT (equality comparison by ==). /* Fail if EXP != GOT (equality comparison by ==).
* Warning: EXP and GOT will be evaluated more than once on failure. */ * Warning: FMT, EXP, and GOT will be evaluated more
* than once on failure. */
#define GREATEST_ASSERT_EQ_FMTm(MSG, EXP, GOT, FMT) \ #define GREATEST_ASSERT_EQ_FMTm(MSG, EXP, GOT, FMT) \
do { \ do { \
const char *greatest_FMT = ( FMT ); \
greatest_info.assertions++; \ greatest_info.assertions++; \
if ((EXP) != (GOT)) { \ if ((EXP) != (GOT)) { \
fprintf(GREATEST_STDOUT, "\nExpected: "); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\nExpected: "); \
fprintf(GREATEST_STDOUT, greatest_FMT, EXP); \ GREATEST_FPRINTF(GREATEST_STDOUT, FMT, EXP); \
fprintf(GREATEST_STDOUT, "\n Got: "); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n Got: "); \
fprintf(GREATEST_STDOUT, greatest_FMT, GOT); \ GREATEST_FPRINTF(GREATEST_STDOUT, FMT, GOT); \
fprintf(GREATEST_STDOUT, "\n"); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \
GREATEST_FAILm(MSG); \ GREATEST_FAILm(MSG); \
} \ } \
} while (0) } while (0)
@ -454,9 +502,9 @@ typedef enum greatest_test_res {
int greatest_GOT = (int)(GOT); \ int greatest_GOT = (int)(GOT); \
greatest_enum_str_fun *greatest_ENUM_STR = ENUM_STR; \ greatest_enum_str_fun *greatest_ENUM_STR = ENUM_STR; \
if (greatest_EXP != greatest_GOT) { \ if (greatest_EXP != greatest_GOT) { \
fprintf(GREATEST_STDOUT, "\nExpected: %s", \ GREATEST_FPRINTF(GREATEST_STDOUT, "\nExpected: %s", \
greatest_ENUM_STR(greatest_EXP)); \ greatest_ENUM_STR(greatest_EXP)); \
fprintf(GREATEST_STDOUT, "\n Got: %s\n", \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n Got: %s\n", \
greatest_ENUM_STR(greatest_GOT)); \ greatest_ENUM_STR(greatest_GOT)); \
GREATEST_FAILm(MSG); \ GREATEST_FAILm(MSG); \
} \ } \
@ -473,7 +521,7 @@ typedef enum greatest_test_res {
greatest_EXP - greatest_GOT > greatest_TOL) || \ greatest_EXP - greatest_GOT > greatest_TOL) || \
(greatest_EXP < greatest_GOT && \ (greatest_EXP < greatest_GOT && \
greatest_GOT - greatest_EXP > greatest_TOL)) { \ greatest_GOT - greatest_EXP > greatest_TOL)) { \
fprintf(GREATEST_STDOUT, \ GREATEST_FPRINTF(GREATEST_STDOUT, \
"\nExpected: " GREATEST_FLOAT_FMT \ "\nExpected: " GREATEST_FLOAT_FMT \
" +/- " GREATEST_FLOAT_FMT \ " +/- " GREATEST_FLOAT_FMT \
"\n Got: " GREATEST_FLOAT_FMT \ "\n Got: " GREATEST_FLOAT_FMT \
@ -539,6 +587,7 @@ typedef enum greatest_test_res {
greatest_info.fail_file = __FILE__; \ greatest_info.fail_file = __FILE__; \
greatest_info.fail_line = __LINE__; \ greatest_info.fail_line = __LINE__; \
greatest_info.msg = MSG; \ greatest_info.msg = MSG; \
if (GREATEST_ABORT_ON_FAIL()) { abort(); } \
return GREATEST_TEST_RES_FAIL; \ return GREATEST_TEST_RES_FAIL; \
} while (0) } while (0)
@ -574,13 +623,13 @@ typedef enum greatest_test_res {
#define GREATEST_SET_TIME(NAME) \ #define GREATEST_SET_TIME(NAME) \
NAME = clock(); \ NAME = clock(); \
if (NAME == (clock_t) -1) { \ if (NAME == (clock_t) -1) { \
fprintf(GREATEST_STDOUT, \ GREATEST_FPRINTF(GREATEST_STDOUT, \
"clock error: %s\n", #NAME); \ "clock error: %s\n", #NAME); \
exit(EXIT_FAILURE); \ exit(EXIT_FAILURE); \
} }
#define GREATEST_CLOCK_DIFF(C1, C2) \ #define GREATEST_CLOCK_DIFF(C1, C2) \
fprintf(GREATEST_STDOUT, " (%lu ticks, %.3f sec)", \ GREATEST_FPRINTF(GREATEST_STDOUT, " (%lu ticks, %.3f sec)", \
(long unsigned int) (C2) - (long unsigned int)(C1), \ (long unsigned int) (C2) - (long unsigned int)(C1), \
(double)((C2) - (C1)) / (1.0 * (double)CLOCKS_PER_SEC)) (double)((C2) - (C1)) / (1.0 * (double)CLOCKS_PER_SEC))
#else #else
@ -590,8 +639,8 @@ typedef enum greatest_test_res {
#if GREATEST_USE_LONGJMP #if GREATEST_USE_LONGJMP
#define GREATEST_SAVE_CONTEXT() \ #define GREATEST_SAVE_CONTEXT() \
/* setjmp returns 0 (GREATEST_TEST_RES_PASS) on first call */ \ /* setjmp returns 0 (GREATEST_TEST_RES_PASS) on first call * \
/* so the test runs, then RES_FAIL from FAIL_WITH_LONGJMP. */ \ * so the test runs, then RES_FAIL from FAIL_WITH_LONGJMP. */ \
((enum greatest_test_res)(setjmp(greatest_info.jump_dest))) ((enum greatest_test_res)(setjmp(greatest_info.jump_dest)))
#else #else
#define GREATEST_SAVE_CONTEXT() \ #define GREATEST_SAVE_CONTEXT() \
@ -599,14 +648,46 @@ typedef enum greatest_test_res {
GREATEST_TEST_RES_PASS GREATEST_TEST_RES_PASS
#endif #endif
/* Run every suite / test function run within BODY in pseudo-random
* order, seeded by SEED. (The top 3 bits of the seed are ignored.)
*
* This should be called like:
* GREATEST_SHUFFLE_TESTS(seed, {
* GREATEST_RUN_TEST(some_test);
* GREATEST_RUN_TEST(some_other_test);
* GREATEST_RUN_TEST(yet_another_test);
* });
*
* Note that the body of the second argument will be evaluated
* multiple times. */
#define GREATEST_SHUFFLE_SUITES(SD, BODY) GREATEST_SHUFFLE(0, SD, BODY)
#define GREATEST_SHUFFLE_TESTS(SD, BODY) GREATEST_SHUFFLE(1, SD, BODY)
#define GREATEST_SHUFFLE(ID, SD, BODY) \
do { \
struct greatest_prng *prng = &greatest_info.prng[ID]; \
greatest_prng_init_first_pass(ID); \
do { \
prng->count = 0; \
if (prng->initialized) { greatest_prng_step(ID); } \
BODY; \
if (!prng->initialized) { \
if (!greatest_prng_init_second_pass(ID, SD)) { break; } \
} else if (prng->count_run == prng->count_ceil) { \
break; \
} \
} while (!GREATEST_FAILURE_ABORT()); \
prng->count_run = prng->random_order = prng->initialized = 0; \
} while(0)
/* Include several function definitions in the main test file. */ /* Include several function definitions in the main test file. */
#define GREATEST_MAIN_DEFS() \ #define GREATEST_MAIN_DEFS() \
\ \
/* Is FILTER a subset of NAME? */ \ /* Is FILTER a subset of NAME? */ \
static int greatest_name_match(const char *name, \ static int greatest_name_match(const char *name, const char *filter, \
const char *filter) { \ int res_if_none) { \
size_t offset = 0; \ size_t offset = 0; \
size_t filter_len = strlen(filter); \ size_t filter_len = filter ? strlen(filter) : 0; \
if (filter_len == 0) { return res_if_none; } /* no filter */ \
while (name[offset] != '\0') { \ while (name[offset] != '\0') { \
if (name[offset] == filter[0]) { \ if (name[offset] == filter[0]) { \
if (0 == strncmp(&name[offset], filter, filter_len)) { \ if (0 == strncmp(&name[offset], filter, filter_len)) { \
@ -619,22 +700,94 @@ static int greatest_name_match(const char *name, \
return 0; \ return 0; \
} \ } \
\ \
int greatest_pre_test(const char *name) { \ static void greatest_buffer_test_name(const char *name) { \
if (!GREATEST_LIST_ONLY() \ struct greatest_run_info *g = &greatest_info; \
&& (!GREATEST_FIRST_FAIL() || greatest_info.suite.failed == 0) \ size_t len = strlen(name), size = sizeof(g->name_buf); \
&& (greatest_info.test_filter == NULL || \ memset(g->name_buf, 0x00, size); \
greatest_name_match(name, greatest_info.test_filter))) { \ (void)strncat(g->name_buf, name, size - 1); \
GREATEST_SET_TIME(greatest_info.suite.pre_test); \ if (g->name_suffix && (len + 1 < size)) { \
if (greatest_info.setup) { \ g->name_buf[len] = '_'; \
greatest_info.setup(greatest_info.setup_udata); \ strncat(&g->name_buf[len+1], g->name_suffix, size-(len+2)); \
} \
return 1; /* test should be run */ \
} else { \
return 0; /* skipped */ \
} \ } \
} \ } \
\ \
void greatest_post_test(const char *name, int res) { \ /* Before running a test, check the name filtering and \
* test shuffling state, if applicable, and then call setup hooks. */ \
int greatest_test_pre(const char *name) { \
struct greatest_run_info *g = &greatest_info; \
int match; \
greatest_buffer_test_name(name); \
match = greatest_name_match(g->name_buf, g->test_filter, 1) && \
!greatest_name_match(g->name_buf, g->test_exclude, 0); \
if (GREATEST_LIST_ONLY()) { /* just listing test names */ \
if (match) { \
fprintf(GREATEST_STDOUT, " %s\n", g->name_buf); \
} \
goto clear; \
} \
if (match && (!GREATEST_FIRST_FAIL() || g->suite.failed == 0)) { \
struct greatest_prng *p = &g->prng[1]; \
if (p->random_order) { \
p->count++; \
if (!p->initialized || ((p->count - 1) != p->state)) { \
goto clear; /* don't run this test yet */ \
} \
} \
GREATEST_SET_TIME(g->suite.pre_test); \
if (g->setup) { g->setup(g->setup_udata); } \
p->count_run++; \
return 1; /* test should be run */ \
} else { \
goto clear; /* skipped */ \
} \
clear: \
g->name_suffix = NULL; \
return 0; \
} \
\
static void greatest_do_pass(void) { \
struct greatest_run_info *g = &greatest_info; \
if (GREATEST_IS_VERBOSE()) { \
GREATEST_FPRINTF(GREATEST_STDOUT, "PASS %s: %s", \
g->name_buf, g->msg ? g->msg : ""); \
} else { \
GREATEST_FPRINTF(GREATEST_STDOUT, "."); \
} \
g->suite.passed++; \
} \
\
static void greatest_do_fail(void) { \
struct greatest_run_info *g = &greatest_info; \
if (GREATEST_IS_VERBOSE()) { \
GREATEST_FPRINTF(GREATEST_STDOUT, \
"FAIL %s: %s (%s:%u)", g->name_buf, \
g->msg ? g->msg : "", g->fail_file, g->fail_line); \
} else { \
GREATEST_FPRINTF(GREATEST_STDOUT, "F"); \
g->col++; /* add linebreak if in line of '.'s */ \
if (g->col != 0) { \
GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \
g->col = 0; \
} \
GREATEST_FPRINTF(GREATEST_STDOUT, "FAIL %s: %s (%s:%u)\n", \
g->name_buf, g->msg ? g->msg : "", \
g->fail_file, g->fail_line); \
} \
g->suite.failed++; \
} \
\
static void greatest_do_skip(void) { \
struct greatest_run_info *g = &greatest_info; \
if (GREATEST_IS_VERBOSE()) { \
GREATEST_FPRINTF(GREATEST_STDOUT, "SKIP %s: %s", \
g->name_buf, g->msg ? g->msg : ""); \
} else { \
GREATEST_FPRINTF(GREATEST_STDOUT, "s"); \
} \
g->suite.skipped++; \
} \
\
void greatest_test_post(int res) { \
GREATEST_SET_TIME(greatest_info.suite.post_test); \ GREATEST_SET_TIME(greatest_info.suite.post_test); \
if (greatest_info.teardown) { \ if (greatest_info.teardown) { \
void *udata = greatest_info.teardown_udata; \ void *udata = greatest_info.teardown_udata; \
@ -642,28 +795,29 @@ void greatest_post_test(const char *name, int res) { \
} \ } \
\ \
if (res <= GREATEST_TEST_RES_FAIL) { \ if (res <= GREATEST_TEST_RES_FAIL) { \
greatest_do_fail(name); \ greatest_do_fail(); \
} else if (res >= GREATEST_TEST_RES_SKIP) { \ } else if (res >= GREATEST_TEST_RES_SKIP) { \
greatest_do_skip(name); \ greatest_do_skip(); \
} else if (res == GREATEST_TEST_RES_PASS) { \ } else if (res == GREATEST_TEST_RES_PASS) { \
greatest_do_pass(name); \ greatest_do_pass(); \
} \ } \
greatest_info.name_suffix = NULL; \
greatest_info.suite.tests_run++; \ greatest_info.suite.tests_run++; \
greatest_info.col++; \ greatest_info.col++; \
if (GREATEST_IS_VERBOSE()) { \ if (GREATEST_IS_VERBOSE()) { \
GREATEST_CLOCK_DIFF(greatest_info.suite.pre_test, \ GREATEST_CLOCK_DIFF(greatest_info.suite.pre_test, \
greatest_info.suite.post_test); \ greatest_info.suite.post_test); \
fprintf(GREATEST_STDOUT, "\n"); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \
} else if (greatest_info.col % greatest_info.width == 0) { \ } else if (greatest_info.col % greatest_info.width == 0) { \
fprintf(GREATEST_STDOUT, "\n"); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \
greatest_info.col = 0; \ greatest_info.col = 0; \
} \ } \
if (GREATEST_STDOUT == stdout) fflush(stdout); \ fflush(GREATEST_STDOUT); \
} \ } \
\ \
static void report_suite(void) { \ static void report_suite(void) { \
if (greatest_info.suite.tests_run > 0) { \ if (greatest_info.suite.tests_run > 0) { \
fprintf(GREATEST_STDOUT, \ GREATEST_FPRINTF(GREATEST_STDOUT, \
"\n%u test%s - %u passed, %u failed, %u skipped", \ "\n%u test%s - %u passed, %u failed, %u skipped", \
greatest_info.suite.tests_run, \ greatest_info.suite.tests_run, \
greatest_info.suite.tests_run == 1 ? "" : "s", \ greatest_info.suite.tests_run == 1 ? "" : "s", \
@ -672,7 +826,7 @@ static void report_suite(void) { \
greatest_info.suite.skipped); \ greatest_info.suite.skipped); \
GREATEST_CLOCK_DIFF(greatest_info.suite.pre_suite, \ GREATEST_CLOCK_DIFF(greatest_info.suite.pre_suite, \
greatest_info.suite.post_suite); \ greatest_info.suite.post_suite); \
fprintf(GREATEST_STDOUT, "\n"); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \
} \ } \
} \ } \
\ \
@ -689,63 +843,36 @@ static void update_counts_and_reset_suite(void) { \
greatest_info.col = 0; \ greatest_info.col = 0; \
} \ } \
\ \
static void greatest_run_suite(greatest_suite_cb *suite_cb, \ static int greatest_suite_pre(const char *suite_name) { \
const char *suite_name) { \ struct greatest_prng *p = &greatest_info.prng[0]; \
if (greatest_info.suite_filter && \ if (!greatest_name_match(suite_name, greatest_info.suite_filter, 1) \
!greatest_name_match(suite_name, greatest_info.suite_filter)) { \ || (GREATEST_FIRST_FAIL() && greatest_info.failed > 0)) { \
return; \ return 0; \
} \ } \
if (p->random_order) { \
p->count++; \
if (!p->initialized || ((p->count - 1) != p->state)) { \
return 0; /* don't run this suite yet */ \
} \
} \
p->count_run++; \
update_counts_and_reset_suite(); \ update_counts_and_reset_suite(); \
if (GREATEST_FIRST_FAIL() && greatest_info.failed > 0) { return; } \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n* Suite %s:\n", suite_name); \
fprintf(GREATEST_STDOUT, "\n* Suite %s:\n", suite_name); \
GREATEST_SET_TIME(greatest_info.suite.pre_suite); \ GREATEST_SET_TIME(greatest_info.suite.pre_suite); \
suite_cb(); \ return 1; \
} \
\
static void greatest_suite_post(void) { \
GREATEST_SET_TIME(greatest_info.suite.post_suite); \ GREATEST_SET_TIME(greatest_info.suite.post_suite); \
report_suite(); \ report_suite(); \
} \ } \
\ \
void greatest_do_pass(const char *name) { \ static void greatest_run_suite(greatest_suite_cb *suite_cb, \
if (GREATEST_IS_VERBOSE()) { \ const char *suite_name) { \
fprintf(GREATEST_STDOUT, "PASS %s: %s", \ if (greatest_suite_pre(suite_name)) { \
name, greatest_info.msg ? greatest_info.msg : ""); \ suite_cb(); \
} else { \ greatest_suite_post(); \
fprintf(GREATEST_STDOUT, "."); \
} \ } \
greatest_info.suite.passed++; \
} \
\
void greatest_do_fail(const char *name) { \
if (GREATEST_IS_VERBOSE()) { \
fprintf(GREATEST_STDOUT, \
"FAIL %s: %s (%s:%u)", \
name, greatest_info.msg ? greatest_info.msg : "", \
greatest_info.fail_file, greatest_info.fail_line); \
} else { \
fprintf(GREATEST_STDOUT, "F"); \
greatest_info.col++; \
/* add linebreak if in line of '.'s */ \
if (greatest_info.col != 0) { \
fprintf(GREATEST_STDOUT, "\n"); \
greatest_info.col = 0; \
} \
fprintf(GREATEST_STDOUT, "FAIL %s: %s (%s:%u)\n", \
name, \
greatest_info.msg ? greatest_info.msg : "", \
greatest_info.fail_file, greatest_info.fail_line); \
} \
greatest_info.suite.failed++; \
} \
\
void greatest_do_skip(const char *name) { \
if (GREATEST_IS_VERBOSE()) { \
fprintf(GREATEST_STDOUT, "SKIP %s: %s", \
name, \
greatest_info.msg ? \
greatest_info.msg : "" ); \
} else { \
fprintf(GREATEST_STDOUT, "s"); \
} \
greatest_info.suite.skipped++; \
} \ } \
\ \
int greatest_do_assert_equal_t(const void *exp, const void *got, \ int greatest_do_assert_equal_t(const void *exp, const void *got, \
@ -757,79 +884,95 @@ int greatest_do_assert_equal_t(const void *exp, const void *got, \
eq = type_info->equal(exp, got, udata); \ eq = type_info->equal(exp, got, udata); \
if (!eq) { \ if (!eq) { \
if (type_info->print != NULL) { \ if (type_info->print != NULL) { \
fprintf(GREATEST_STDOUT, "\nExpected: "); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\nExpected: "); \
(void)type_info->print(exp, udata); \ (void)type_info->print(exp, udata); \
fprintf(GREATEST_STDOUT, "\n Got: "); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n Got: "); \
(void)type_info->print(got, udata); \ (void)type_info->print(got, udata); \
fprintf(GREATEST_STDOUT, "\n"); \ GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \
} else { \
fprintf(GREATEST_STDOUT, \
"GREATEST_ASSERT_EQUAL_T failure at %s:%u\n", \
greatest_info.fail_file, \
greatest_info.fail_line); \
} \ } \
} \ } \
return eq; \ return eq; \
} \ } \
\ \
void greatest_usage(const char *name) { \ static void greatest_usage(const char *name) { \
fprintf(GREATEST_STDOUT, \ GREATEST_FPRINTF(GREATEST_STDOUT, \
"Usage: %s [-hlfv] [-s SUITE] [-t TEST]\n" \ "Usage: %s [--help] [-hlfav] [-s SUITE] [-t TEST]\n" \
" -h, --help print this Help\n" \ " -h, --help print this Help\n" \
" -l List suites and their tests, then exit\n" \ " -l List suites and tests, then exit (dry run)\n" \
" -f Stop runner after first failure\n" \ " -f Stop runner after first failure\n" \
" -a Abort on first failure (implies -f)\n" \
" -v Verbose output\n" \ " -v Verbose output\n" \
" -s SUITE only run suites containing string SUITE\n" \ " -s SUITE only run suites containing string SUITE\n" \
" -t TEST only run tests containing string TEST\n", \ " -t TEST only run tests containing string TEST\n" \
" -x EXCLUDE exclude tests containing string EXCLUDE\n", \
name); \ name); \
} \ } \
\ \
static void greatest_parse_args(int argc, char **argv) { \ static void greatest_parse_options(int argc, char **argv) { \
int i = 0; \ int i = 0; \
for (i = 1; i < argc; i++) { \ for (i = 1; i < argc; i++) { \
if (0 == strncmp("-t", argv[i], 2)) { \ if (argv[i][0] == '-') { \
if (argc <= i + 1) { \ char f = argv[i][1]; \
if ((f == 's' || f == 't' || f == 'x') && argc <= i + 1) { \
greatest_usage(argv[0]); exit(EXIT_FAILURE); \
} \
switch (f) { \
case 's': /* suite name filter */ \
greatest_set_suite_filter(argv[i + 1]); i++; break; \
case 't': /* test name filter */ \
greatest_set_test_filter(argv[i + 1]); i++; break; \
case 'x': /* test name exclusion */ \
greatest_set_test_exclude(argv[i + 1]); i++; break; \
case 'f': /* first fail flag */ \
greatest_stop_at_first_fail(); break; \
case 'a': /* abort() on fail flag */ \
greatest_abort_on_fail(); break; \
case 'l': /* list only (dry run) */ \
greatest_list_only(); break; \
case 'v': /* first fail flag */ \
greatest_info.verbosity++; break; \
case 'h': /* help */ \
greatest_usage(argv[0]); exit(EXIT_SUCCESS); \
case '-': \
if (0 == strncmp("--help", argv[i], 6)) { \
greatest_usage(argv[0]); exit(EXIT_SUCCESS); \
} else if (0 == strncmp("--", argv[i], 2)) { \
return; /* ignore following arguments */ \
} /* fall through */ \
default: \
GREATEST_FPRINTF(GREATEST_STDOUT, \
"Unknown argument '%s'\n", argv[i]); \
greatest_usage(argv[0]); \ greatest_usage(argv[0]); \
exit(EXIT_FAILURE); \ exit(EXIT_FAILURE); \
} \ } \
greatest_info.test_filter = argv[i+1]; \
i++; \
} else if (0 == strncmp("-s", argv[i], 2)) { \
if (argc <= i + 1) { \
greatest_usage(argv[0]); \
exit(EXIT_FAILURE); \
} \
greatest_info.suite_filter = argv[i+1]; \
i++; \
} else if (0 == strncmp("-f", argv[i], 2)) { \
greatest_info.flags |= GREATEST_FLAG_FIRST_FAIL; \
} else if (0 == strncmp("-v", argv[i], 2)) { \
greatest_info.verbosity++; \
} else if (0 == strncmp("-l", argv[i], 2)) { \
greatest_info.flags |= GREATEST_FLAG_LIST_ONLY; \
} else if (0 == strncmp("-h", argv[i], 2) || \
0 == strncmp("--help", argv[i], 6)) { \
greatest_usage(argv[0]); \
exit(EXIT_SUCCESS); \
} else if (0 == strncmp("--", argv[i], 2)) { \
break; \
} else { \
fprintf(GREATEST_STDOUT, \
"Unknown argument '%s'\n", argv[i]); \
greatest_usage(argv[0]); \
exit(EXIT_FAILURE); \
} \ } \
} \ } \
} \ } \
\ \
int greatest_all_passed(void) { return (greatest_info.failed == 0); } \ int greatest_all_passed(void) { return (greatest_info.failed == 0); } \
\ \
void greatest_set_test_filter(const char *name) { \ void greatest_set_test_filter(const char *filter) { \
greatest_info.test_filter = name; \ greatest_info.test_filter = filter; \
} \ } \
\ \
void greatest_set_suite_filter(const char *name) { \ void greatest_set_test_exclude(const char *filter) { \
greatest_info.suite_filter = name; \ greatest_info.test_exclude = filter; \
} \
\
void greatest_set_suite_filter(const char *filter) { \
greatest_info.suite_filter = filter; \
} \
\
void greatest_stop_at_first_fail(void) { \
greatest_set_flag(GREATEST_FLAG_FIRST_FAIL); \
} \
\
void greatest_abort_on_fail(void) { \
greatest_set_flag(GREATEST_FLAG_ABORT_ON_FAIL); \
} \
\
void greatest_list_only(void) { \
greatest_set_flag(GREATEST_FLAG_LIST_ONLY); \
} \ } \
\ \
void greatest_get_report(struct greatest_report_t *report) { \ void greatest_get_report(struct greatest_report_t *report) { \
@ -853,6 +996,10 @@ void greatest_set_flag(greatest_flag_t flag) { \
greatest_info.flags |= flag; \ greatest_info.flags |= flag; \
} \ } \
\ \
void greatest_set_test_suffix(const char *suffix) { \
greatest_info.name_suffix = suffix; \
} \
\
void GREATEST_SET_SETUP_CB(greatest_setup_cb *cb, void *udata) { \ void GREATEST_SET_SETUP_CB(greatest_setup_cb *cb, void *udata) { \
greatest_info.setup = cb; \ greatest_info.setup = cb; \
greatest_info.setup_udata = udata; \ greatest_info.setup_udata = udata; \
@ -874,7 +1021,7 @@ static int greatest_string_equal_cb(const void *exp, const void *got, \
\ \
static int greatest_string_printf_cb(const void *t, void *udata) { \ static int greatest_string_printf_cb(const void *t, void *udata) { \
(void)udata; /* note: does not check \0 termination. */ \ (void)udata; /* note: does not check \0 termination. */ \
return fprintf(GREATEST_STDOUT, "%s", (const char *)t); \ return GREATEST_FPRINTF(GREATEST_STDOUT, "%s", (const char *)t); \
} \ } \
\ \
greatest_type_info greatest_type_info_string = { \ greatest_type_info greatest_type_info_string = { \
@ -888,9 +1035,11 @@ static int greatest_memory_equal_cb(const void *exp, const void *got, \
return (0 == memcmp(exp, got, env->size)); \ return (0 == memcmp(exp, got, env->size)); \
} \ } \
\ \
/* Hexdump raw memory, with differences highlighted */ \
static int greatest_memory_printf_cb(const void *t, void *udata) { \ static int greatest_memory_printf_cb(const void *t, void *udata) { \
greatest_memory_cmp_env *env = (greatest_memory_cmp_env *)udata; \ greatest_memory_cmp_env *env = (greatest_memory_cmp_env *)udata; \
unsigned char *buf = (unsigned char *)t, diff_mark = ' '; \ const unsigned char *buf = (const unsigned char *)t; \
unsigned char diff_mark = ' '; \
FILE *out = GREATEST_STDOUT; \ FILE *out = GREATEST_STDOUT; \
size_t i, line_i, line_len = 0; \ size_t i, line_i, line_len = 0; \
int len = 0; /* format hexdump with differences highlighted */ \ int len = 0; /* format hexdump with differences highlighted */ \
@ -901,24 +1050,100 @@ static int greatest_memory_printf_cb(const void *t, void *udata) { \
for (line_i = i; line_i < i + line_len; line_i++) { \ for (line_i = i; line_i < i + line_len; line_i++) { \
if (env->exp[line_i] != env->got[line_i]) diff_mark = 'X'; \ if (env->exp[line_i] != env->got[line_i]) diff_mark = 'X'; \
} \ } \
len += fprintf(out, "\n%04x %c ", (unsigned int)i, diff_mark); \ len += GREATEST_FPRINTF(out, "\n%04x %c ", \
(unsigned int)i, diff_mark); \
for (line_i = i; line_i < i + line_len; line_i++) { \ for (line_i = i; line_i < i + line_len; line_i++) { \
int m = env->exp[line_i] == env->got[line_i]; /* match? */ \ int m = env->exp[line_i] == env->got[line_i]; /* match? */ \
len += fprintf(out, "%02x%c", buf[line_i], m ? ' ' : '<'); \ len += GREATEST_FPRINTF(out, "%02x%c", \
buf[line_i], m ? ' ' : '<'); \
} \ } \
for (line_i = 0; line_i < 16 - line_len; line_i++) { \ for (line_i = 0; line_i < 16 - line_len; line_i++) { \
len += fprintf(out, " "); \ len += GREATEST_FPRINTF(out, " "); \
} \ } \
fprintf(out, " "); \ GREATEST_FPRINTF(out, " "); \
for (line_i = i; line_i < i + line_len; line_i++) { \ for (line_i = i; line_i < i + line_len; line_i++) { \
unsigned char c = buf[line_i]; \ unsigned char c = buf[line_i]; \
len += fprintf(out, "%c", isprint(c) ? c : '.'); \ len += GREATEST_FPRINTF(out, "%c", isprint(c) ? c : '.'); \
} \ } \
} \ } \
len += fprintf(out, "\n"); \ len += GREATEST_FPRINTF(out, "\n"); \
return len; \ return len; \
} \ } \
\ \
void greatest_prng_init_first_pass(int id) { \
greatest_info.prng[id].random_order = 1; \
greatest_info.prng[id].count_run = 0; \
} \
\
int greatest_prng_init_second_pass(int id, unsigned long seed) { \
static unsigned long primes[] = { 11, 101, 1009, 10007, \
100003, 1000003, 10000019, 100000007, 1000000007, \
1538461, 1865471, 17471, 2147483647 /* 2**32 - 1 */, }; \
struct greatest_prng *prng = &greatest_info.prng[id]; \
if (prng->count == 0) { return 0; } \
prng->mod = 1; \
prng->count_ceil = prng->count; \
while (prng->mod < prng->count) { prng->mod <<= 1; } \
prng->state = seed & 0x1fffffff; /* only use lower 29 bits... */ \
prng->a = (4LU * prng->state) + 1; /* to avoid overflow */ \
prng->c = primes[(seed * 16451) % sizeof(primes)/sizeof(primes[0])];\
prng->initialized = 1; \
return 1; \
} \
\
/* Step the pseudorandom number generator until its state reaches \
* another test ID between 0 and the test count. \
* This use a linear congruential pseudorandom number generator, \
* with the power-of-two ceiling of the test count as the modulus, the \
* masked seed as the multiplier, and a prime as the increment. For \
* each generated value < the test count, run the corresponding test. \
* This will visit all IDs 0 <= X < mod once before repeating, \
* with a starting position chosen based on the initial seed. \
* For details, see: Knuth, The Art of Computer Programming \
* Volume. 2, section 3.2.1. */ \
void greatest_prng_step(int id) { \
struct greatest_prng *p = &greatest_info.prng[id]; \
do { \
p->state = ((p->a * p->state) + p->c) & (p->mod - 1); \
} while (p->state >= p->count_ceil); \
} \
\
void GREATEST_INIT(void) { \
/* Suppress unused function warning if features aren't used */ \
(void)greatest_run_suite; \
(void)greatest_parse_options; \
(void)greatest_prng_step; \
(void)greatest_prng_init_first_pass; \
(void)greatest_prng_init_second_pass; \
(void)greatest_set_test_suffix; \
\
memset(&greatest_info, 0, sizeof(greatest_info)); \
greatest_info.width = GREATEST_DEFAULT_WIDTH; \
GREATEST_SET_TIME(greatest_info.begin); \
} \
\
/* Report passes, failures, skipped tests, the number of \
* assertions, and the overall run time. */ \
void GREATEST_PRINT_REPORT(void) { \
if (!GREATEST_LIST_ONLY()) { \
update_counts_and_reset_suite(); \
GREATEST_SET_TIME(greatest_info.end); \
GREATEST_FPRINTF(GREATEST_STDOUT, \
"\nTotal: %u test%s", \
greatest_info.tests_run, \
greatest_info.tests_run == 1 ? "" : "s"); \
GREATEST_CLOCK_DIFF(greatest_info.begin, \
greatest_info.end); \
GREATEST_FPRINTF(GREATEST_STDOUT, ", %u assertion%s\n", \
greatest_info.assertions, \
greatest_info.assertions == 1 ? "" : "s"); \
GREATEST_FPRINTF(GREATEST_STDOUT, \
"Pass: %u, fail: %u, skip: %u.\n", \
greatest_info.passed, \
greatest_info.failed, greatest_info.skipped); \
} \
} \
\
greatest_type_info greatest_type_info_memory = { \ greatest_type_info greatest_type_info_memory = { \
greatest_memory_equal_cb, \ greatest_memory_equal_cb, \
greatest_memory_printf_cb, \ greatest_memory_printf_cb, \
@ -926,46 +1151,11 @@ greatest_type_info greatest_type_info_memory = { \
\ \
greatest_run_info greatest_info greatest_run_info greatest_info
/* Init internals. */
#define GREATEST_INIT() \
do { \
/* Suppress unused function warning if features aren't used */ \
(void)greatest_run_suite; \
(void)greatest_parse_args; \
\
memset(&greatest_info, 0, sizeof(greatest_info)); \
greatest_info.width = GREATEST_DEFAULT_WIDTH; \
GREATEST_SET_TIME(greatest_info.begin); \
} while (0) \
/* Handle command-line arguments, etc. */ /* Handle command-line arguments, etc. */
#define GREATEST_MAIN_BEGIN() \ #define GREATEST_MAIN_BEGIN() \
do { \ do { \
GREATEST_INIT(); \ GREATEST_INIT(); \
greatest_parse_args(argc, argv); \ greatest_parse_options(argc, argv); \
} while (0)
/* Report passes, failures, skipped tests, the number of
* assertions, and the overall run time. */
#define GREATEST_PRINT_REPORT() \
do { \
if (!GREATEST_LIST_ONLY()) { \
update_counts_and_reset_suite(); \
GREATEST_SET_TIME(greatest_info.end); \
fprintf(GREATEST_STDOUT, \
"\nTotal: %u test%s", \
greatest_info.tests_run, \
greatest_info.tests_run == 1 ? "" : "s"); \
GREATEST_CLOCK_DIFF(greatest_info.begin, \
greatest_info.end); \
fprintf(GREATEST_STDOUT, ", %u assertion%s\n", \
greatest_info.assertions, \
greatest_info.assertions == 1 ? "" : "s"); \
fprintf(GREATEST_STDOUT, \
"Pass: %u, fail: %u, skip: %u.\n", \
greatest_info.passed, \
greatest_info.failed, greatest_info.skipped); \
} \
} while (0) } while (0)
/* Report results, exit with exit status based on results. */ /* Report results, exit with exit status based on results. */
@ -1014,6 +1204,8 @@ greatest_run_info greatest_info
#define SET_SETUP GREATEST_SET_SETUP_CB #define SET_SETUP GREATEST_SET_SETUP_CB
#define SET_TEARDOWN GREATEST_SET_TEARDOWN_CB #define SET_TEARDOWN GREATEST_SET_TEARDOWN_CB
#define CHECK_CALL GREATEST_CHECK_CALL #define CHECK_CALL GREATEST_CHECK_CALL
#define SHUFFLE_TESTS GREATEST_SHUFFLE_TESTS
#define SHUFFLE_SUITES GREATEST_SHUFFLE_SUITES
#ifdef GREATEST_VA_ARGS #ifdef GREATEST_VA_ARGS
#define RUN_TESTp GREATEST_RUN_TESTp #define RUN_TESTp GREATEST_RUN_TESTp
@ -1028,7 +1220,7 @@ greatest_run_info greatest_info
#endif /* USE_ABBREVS */ #endif /* USE_ABBREVS */
#ifdef __cplusplus #if defined(__cplusplus) && !defined(GREATEST_NO_EXTERN_CPLUSPLUS)
} }
#endif #endif

35
test/log.c Normal file
View File

@ -0,0 +1,35 @@
#include "../src/log.c"
#include "greatest.h"
TEST test_log_level(GLogLevelFlags level, const char *shortstr, const char *longstr)
{
ASSERT_STR_EQ(log_level_to_string(level), longstr);
log_set_level_from_string(shortstr);
if (level != G_LOG_LEVEL_ERROR)
ASSERT_ENUM_EQ(level, log_level, log_level_to_string);
log_set_level_from_string(longstr);
if (level != G_LOG_LEVEL_ERROR)
ASSERT_ENUM_EQ(level, log_level, log_level_to_string);
PASS();
}
SUITE(suite_log)
{
GLogLevelFlags oldlevel = log_level;
RUN_TESTp(test_log_level, G_LOG_LEVEL_ERROR, NULL, "ERROR");
RUN_TESTp(test_log_level, G_LOG_LEVEL_CRITICAL, "crit", "CRITICAL");
RUN_TESTp(test_log_level, G_LOG_LEVEL_WARNING, "warn", "WARNING");
RUN_TESTp(test_log_level, G_LOG_LEVEL_MESSAGE, "mesg", "MESSAGE");
RUN_TESTp(test_log_level, G_LOG_LEVEL_INFO, "info", "INFO");
RUN_TESTp(test_log_level, G_LOG_LEVEL_DEBUG, "deb", "DEBUG");
log_level = oldlevel;
}
/* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */

82
test/notification.c
View File

@ -19,12 +19,9 @@ TEST test_notification_is_duplicate_field(char **field,
PASS(); PASS();
} }
TEST test_notification_is_duplicate(void *notifications) TEST test_notification_is_duplicate(struct notification *a,
struct notification *b)
{ {
struct notification **n = (struct notification**)notifications;
struct notification *a = n[0];
struct notification *b = n[1];
ASSERT(notification_is_duplicate(a, b)); ASSERT(notification_is_duplicate(a, b));
CHECK_CALL(test_notification_is_duplicate_field(&(b->appname), a, b)); CHECK_CALL(test_notification_is_duplicate_field(&(b->appname), a, b));
@ -117,6 +114,40 @@ TEST test_notification_referencing(void)
PASS(); PASS();
} }
TEST test_notification_format_message(struct notification *n, const char *format, const char *exp)
{
n->format = format;
notification_format_message(n);
ASSERT_STR_EQ(exp, n->msg);
PASS();
}
TEST test_notification_maxlength(void)
{
unsigned int len = 5005;
struct notification *n = notification_create();
n->format = "%a";
n->appname = g_malloc(len + 1);
n->appname[len] = '\0';
static const char sigma[] =
" 0123456789"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz";
for (int i = 0; i < len; ++i)
n->appname[i] = sigma[rand() % (sizeof(sigma) - 1)];
notification_format_message(n);
ASSERT(STRN_EQ(n->appname, n->msg, 5000));
notification_unref(n);
PASS();
}
SUITE(suite_notification) SUITE(suite_notification)
{ {
cmdline_load(0, NULL); cmdline_load(0, NULL);
@ -138,15 +169,46 @@ SUITE(suite_notification)
b->urgency = URG_NORM; b->urgency = URG_NORM;
//2 equal notifications to be passed for duplicate checking, //2 equal notifications to be passed for duplicate checking,
struct notification *n[2] = {a, b}; RUN_TESTp(test_notification_is_duplicate, a, b);
g_clear_pointer(&a, notification_unref);
RUN_TEST1(test_notification_is_duplicate, (void*) n); g_clear_pointer(&b, notification_unref);
notification_unref(a);
notification_unref(b);
RUN_TEST(test_notification_replace_single_field); RUN_TEST(test_notification_replace_single_field);
RUN_TEST(test_notification_referencing); RUN_TEST(test_notification_referencing);
// TEST notification_format_message
a = notification_create();
a->appname = g_strdup("MyApp");
a->summary = g_strdup("I've got a summary!");
a->body = g_strdup("Look at my shiny <notification>");
a->icon = g_strdup("/this/is/my/icoknpath.png");
a->progress = 95;
const char *strings[] = {
"%a", "MyApp",
"%s", "I&apos;ve got a summary!",
"%b", "Look at my shiny <notification>",
"%I", "icoknpath.png",
"%i", "/this/is/my/icoknpath.png",
"%p", "[ 95%]",
"%n", "95",
"%%", "%",
"%", "%",
"%UNKNOWN", "%UNKNOWN",
NULL
};
const char **in = strings;
const char **out = strings+1;
while (*in && *out) {
RUN_TESTp(test_notification_format_message, a, *in, *out);
in +=2;
out+=2;
}
g_clear_pointer(&a, notification_unref);
RUN_TEST(test_notification_maxlength);
g_clear_pointer(&settings.icon_path, g_free); g_clear_pointer(&settings.icon_path, g_free);
g_free(config_path); g_free(config_path);
} }

12
test/option_parser.c
View File

@ -97,6 +97,10 @@ TEST test_ini_get_int(void)
TEST test_ini_get_double(void) TEST test_ini_get_double(void)
{ {
if (2.3 != atof("2.3")) {
SKIPm("Skipping test_ini_get_double, as it seems we're running under musl+valgrind!");
}
char *double_section = "double"; char *double_section = "double";
ASSERT_EQ(1, ini_get_double(double_section, "simple", 0)); ASSERT_EQ(1, ini_get_double(double_section, "simple", 0));
ASSERT_EQ(1.5, ini_get_double(double_section, "decimal", 0)); ASSERT_EQ(1.5, ini_get_double(double_section, "decimal", 0));
@ -152,6 +156,10 @@ TEST test_cmdline_get_int(void)
TEST test_cmdline_get_double(void) TEST test_cmdline_get_double(void)
{ {
if (2.3 != atof("2.3")) {
SKIPm("Skipping test_cmdline_get_double, as it seems we're running under musl+valgrind!");
}
ASSERT_EQ(2, cmdline_get_double("-simple_double", 0, "")); ASSERT_EQ(2, cmdline_get_double("-simple_double", 0, ""));
ASSERT_EQ(5.2, cmdline_get_double("-double", 0, "")); ASSERT_EQ(5.2, cmdline_get_double("-double", 0, ""));
ASSERT_EQ(3.14, cmdline_get_double("-nonexistent", 3.14, "")); ASSERT_EQ(3.14, cmdline_get_double("-nonexistent", 3.14, ""));
@ -258,6 +266,10 @@ TEST test_option_get_int(void)
TEST test_option_get_double(void) TEST test_option_get_double(void)
{ {
if (2.3 != atof("2.3")) {
SKIPm("Skipping test_option_get_double, as it seems we're running under musl+valgrind!");
}
char *double_section = "double"; char *double_section = "double";
ASSERT_EQ(2, option_get_double(double_section, "simple", "-simple_double", 0, "")); ASSERT_EQ(2, option_get_double(double_section, "simple", "-simple_double", 0, ""));
ASSERT_EQ(5.2, option_get_double(double_section, "simple", "-double", 0, "")); ASSERT_EQ(5.2, option_get_double(double_section, "simple", "-double", 0, ""));

2
test/test.c
View File

@ -17,6 +17,7 @@ SUITE_EXTERN(suite_misc);
SUITE_EXTERN(suite_icon); SUITE_EXTERN(suite_icon);
SUITE_EXTERN(suite_queues); SUITE_EXTERN(suite_queues);
SUITE_EXTERN(suite_dunst); SUITE_EXTERN(suite_dunst);
SUITE_EXTERN(suite_log);
GREATEST_MAIN_DEFS(); GREATEST_MAIN_DEFS();
@ -40,6 +41,7 @@ int main(int argc, char *argv[]) {
RUN_SUITE(suite_icon); RUN_SUITE(suite_icon);
RUN_SUITE(suite_queues); RUN_SUITE(suite_queues);
RUN_SUITE(suite_dunst); RUN_SUITE(suite_dunst);
RUN_SUITE(suite_log);
GREATEST_MAIN_END(); GREATEST_MAIN_END();
base = NULL; base = NULL;