Mercurial > molko
changeset 336:f5a5bbb77122
tests: switch to rexo
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 13 Oct 2021 20:56:07 +0200 |
| parents | 68287c7bcdb5 |
| children | 68b9d010e081 |
| files | CMakeLists.txt extern/LICENSE.libgreatest.txt extern/VERSION.libgreatest.txt extern/libgreatest/CMakeLists.txt extern/libgreatest/greatest.h tests/CMakeLists.txt tests/test-action-script.c tests/test-action.c tests/test-alloc.c tests/test-character.c tests/test-color.c tests/test-drawable.c tests/test-error.c tests/test-map.c tests/test-save-quest.c tests/test-save.c tests/test-state.c tests/test-tileset.c tests/test-util.c |
| diffstat | 19 files changed, 869 insertions(+), 2513 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Oct 13 15:58:02 2021 +0200 +++ b/CMakeLists.txt Wed Oct 13 20:56:07 2021 +0200 @@ -73,7 +73,6 @@ endif () add_subdirectory(extern/libsqlite) -add_subdirectory(extern/libgreatest) add_subdirectory(extern/librexo) add_subdirectory(src/tools/bcc)
--- a/extern/LICENSE.libgreatest.txt Wed Oct 13 15:58:02 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -Copyright (c) 2011-2018 Scott Vokes <vokes.s@gmail.com> - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/extern/VERSION.libgreatest.txt Wed Oct 13 15:58:02 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -1.4.2
--- a/extern/libgreatest/CMakeLists.txt Wed Oct 13 15:58:02 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# -# CMakeLists.txt -- CMake build system for Molko's Adventure -# -# Copyright (c) 2020-2021 David Demelier <markand@malikania.fr> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# - -project(libmlk-greatest) - -add_library(libmlk-greatest INTERFACE ${libmlk-greatest_SOURCE_DIR}/greatest.h) -target_include_directories( - libmlk-greatest - INTERFACE - $<BUILD_INTERFACE:${libmlk-greatest_SOURCE_DIR}> -) -set_target_properties(libmlk-greatest PROPERTIES FOLDER extern) - -source_group("" FILES ${libmlk-greatest_SOURCE_DIR}/greatest.h)
--- a/extern/libgreatest/greatest.h Wed Oct 13 15:58:02 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1225 +0,0 @@ -/* - * Copyright (c) 2011-2019 Scott Vokes <vokes.s@gmail.com> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef GREATEST_H -#define GREATEST_H - -#if defined(__cplusplus) && !defined(GREATEST_NO_EXTERN_CPLUSPLUS) -extern "C" { -#endif - -/* 1.4.2 */ -#define GREATEST_VERSION_MAJOR 1 -#define GREATEST_VERSION_MINOR 4 -#define GREATEST_VERSION_PATCH 2 - -/* A unit testing system for C, contained in 1 file. - * It doesn't use dynamic allocation or depend on anything - * beyond ANSI C89. - * - * An up-to-date version can be found at: - * https://github.com/silentbicycle/greatest/ - */ - - -/********************************************************************* - * Minimal test runner template - *********************************************************************/ -#if 0 - -#include "greatest.h" - -TEST foo_should_foo(void) { - PASS(); -} - -static void setup_cb(void *data) { - printf("setup callback for each test case\n"); -} - -static void teardown_cb(void *data) { - printf("teardown callback for each test case\n"); -} - -SUITE(suite) { - /* Optional setup/teardown callbacks which will be run before/after - * every test case. If using a test suite, they will be cleared when - * the suite finishes. */ - SET_SETUP(setup_cb, voidp_to_callback_data); - SET_TEARDOWN(teardown_cb, voidp_to_callback_data); - - RUN_TEST(foo_should_foo); -} - -/* Add definitions that need to be in the test runner's main file. */ -GREATEST_MAIN_DEFS(); - -/* Set up, run suite(s) of tests, report pass/fail/skip stats. */ -int run_tests(void) { - GREATEST_INIT(); /* init. greatest internals */ - /* List of suites to run (if any). */ - RUN_SUITE(suite); - - /* Tests can also be run directly, without using test suites. */ - RUN_TEST(foo_should_foo); - - GREATEST_PRINT_REPORT(); /* display results */ - return greatest_all_passed(); -} - -/* main(), for a standalone command-line test runner. - * This replaces run_tests above, and adds command line option - * handling and exiting with a pass/fail status. */ -int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); /* init & parse command-line args */ - RUN_SUITE(suite); - GREATEST_MAIN_END(); /* display results */ -} - -#endif -/*********************************************************************/ - - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <ctype.h> - -/*********** - * Options * - ***********/ - -/* Default column width for non-verbose output. */ -#ifndef GREATEST_DEFAULT_WIDTH -#define GREATEST_DEFAULT_WIDTH 72 -#endif - -/* FILE *, for test logging. */ -#ifndef GREATEST_STDOUT -#define GREATEST_STDOUT stdout -#endif - -/* Remove GREATEST_ prefix from most commonly used symbols? */ -#ifndef GREATEST_USE_ABBREVS -#define GREATEST_USE_ABBREVS 1 -#endif - -/* Set to 0 to disable all use of setjmp/longjmp. */ -#ifndef GREATEST_USE_LONGJMP -#define GREATEST_USE_LONGJMP 1 -#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 -#include <setjmp.h> -#endif - -/* Set to 0 to disable all use of time.h / clock(). */ -#ifndef GREATEST_USE_TIME -#define GREATEST_USE_TIME 1 -#endif - -#if GREATEST_USE_TIME -#include <time.h> -#endif - -/* Floating point type, for ASSERT_IN_RANGE. */ -#ifndef GREATEST_FLOAT -#define GREATEST_FLOAT double -#define GREATEST_FLOAT_FMT "%g" -#endif - -/* Size of buffer for test name + optional '_' separator and suffix */ -#ifndef GREATEST_TESTNAME_BUF_SIZE -#define GREATEST_TESTNAME_BUF_SIZE 128 -#endif - - -/********* - * Types * - *********/ - -/* Info for the current running suite. */ -typedef struct greatest_suite_info { - unsigned int tests_run; - unsigned int passed; - unsigned int failed; - unsigned int skipped; - -#if GREATEST_USE_TIME - /* timers, pre/post running suite and individual tests */ - clock_t pre_suite; - clock_t post_suite; - clock_t pre_test; - clock_t post_test; -#endif -} greatest_suite_info; - -/* Type for a suite function. */ -typedef void greatest_suite_cb(void); - -/* Types for setup/teardown callbacks. If non-NULL, these will be run - * and passed the pointer to their additional data. */ -typedef void greatest_setup_cb(void *udata); -typedef void greatest_teardown_cb(void *udata); - -/* Type for an equality comparison between two pointers of the same type. - * Should return non-0 if equal, otherwise 0. - * UDATA is a closure value, passed through from ASSERT_EQUAL_T[m]. */ -typedef int greatest_equal_cb(const void *expd, const void *got, void *udata); - -/* Type for a callback that prints a value pointed to by T. - * Return value has the same meaning as printf's. - * UDATA is a closure value, passed through from ASSERT_EQUAL_T[m]. */ -typedef int greatest_printf_cb(const void *t, void *udata); - -/* Callbacks for an arbitrary type; needed for type-specific - * comparisons via GREATEST_ASSERT_EQUAL_T[m].*/ -typedef struct greatest_type_info { - greatest_equal_cb *equal; - greatest_printf_cb *print; -} greatest_type_info; - -typedef struct greatest_memory_cmp_env { - const unsigned char *exp; - const unsigned char *got; - size_t size; -} greatest_memory_cmp_env; - -/* Callbacks for string and raw memory types. */ -extern greatest_type_info greatest_type_info_string; -extern greatest_type_info greatest_type_info_memory; - -typedef enum { - GREATEST_FLAG_FIRST_FAIL = 0x01, - GREATEST_FLAG_LIST_ONLY = 0x02, - GREATEST_FLAG_ABORT_ON_FAIL = 0x04 -} 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 a; /* LCG multiplier */ - unsigned long c; /* LCG increment */ - unsigned long m; /* LCG modulus, based on count_ceil */ -}; - -/* Struct containing all test runner state. */ -typedef struct greatest_run_info { - unsigned char flags; - unsigned char verbosity; - unsigned char pad_0[2]; - - unsigned int tests_run; /* total test count */ - - /* currently running test suite */ - greatest_suite_info suite; - - /* overall pass/fail/skip counts */ - unsigned int passed; - unsigned int failed; - unsigned int skipped; - unsigned int assertions; - - /* info to print about the most recent failure */ - unsigned int fail_line; - unsigned int pad_1; - const char *fail_file; - const char *msg; - - /* current setup/teardown hooks and userdata */ - greatest_setup_cb *setup; - void *setup_udata; - greatest_teardown_cb *teardown; - void *teardown_udata; - - /* formatting info for ".....s...F"-style output */ - unsigned int col; - unsigned int width; - - /* only run a specific suite or test */ - const char *suite_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 - /* overall timers */ - clock_t begin; - clock_t end; -#endif - -#if GREATEST_USE_LONGJMP - int pad_jmp_buf; - unsigned char pad_2[4]; - jmp_buf jump_dest; -#endif -} greatest_run_info; - -struct greatest_report_t { - /* overall pass/fail/skip counts */ - unsigned int passed; - unsigned int failed; - unsigned int skipped; - unsigned int assertions; -}; - -/* Global var for the current testing context. - * Initialized by GREATEST_MAIN_DEFS(). */ -extern greatest_run_info greatest_info; - -/* Type for ASSERT_ENUM_EQ's ENUM_STR argument. */ -typedef const char *greatest_enum_str_fun(int value); - - -/********************** - * Exported functions * - **********************/ - -/* These are used internally by greatest macros. */ -int greatest_test_pre(const char *name); -void greatest_test_post(int res); -int greatest_do_assert_equal_t(const void *expd, const void *got, - 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. */ -void GREATEST_SET_SETUP_CB(greatest_setup_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); -void greatest_set_suite_filter(const char *filter); -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); -unsigned int greatest_get_verbosity(void); -void greatest_set_verbosity(unsigned int verbosity); -void greatest_set_flag(greatest_flag_t flag); -void greatest_set_test_suffix(const char *suffix); - - -/******************** -* Language Support * -********************/ - -/* If __VA_ARGS__ (C99) is supported, allow parametric testing -* without needing to manually manage the argument struct. */ -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19901L) || \ - (defined(_MSC_VER) && _MSC_VER >= 1800) -#define GREATEST_VA_ARGS -#endif - - -/********** - * Macros * - **********/ - -/* Define a suite. (The duplication is intentional -- it eliminates - * a warning from -Wmissing-declarations.) */ -#define GREATEST_SUITE(NAME) void NAME(void); void NAME(void) - -/* Declare a suite, provided by another compilation unit. */ -#define GREATEST_SUITE_EXTERN(NAME) void NAME(void) - -/* Start defining a test function. - * The arguments are not included, to allow parametric testing. */ -#define GREATEST_TEST static enum greatest_test_res - -/* PASS/FAIL/SKIP result from a test. Used internally. */ -typedef enum greatest_test_res { - GREATEST_TEST_RES_PASS = 0, - GREATEST_TEST_RES_FAIL = -1, - GREATEST_TEST_RES_SKIP = 1 -} greatest_test_res; - -/* Run a suite. */ -#define GREATEST_RUN_SUITE(S_NAME) greatest_run_suite(S_NAME, #S_NAME) - -/* Run a test in the current suite. */ -#define GREATEST_RUN_TEST(TEST) \ - do { \ - if (greatest_test_pre(#TEST) == 1) { \ - enum greatest_test_res res = GREATEST_SAVE_CONTEXT(); \ - if (res == GREATEST_TEST_RES_PASS) { \ - res = TEST(); \ - } \ - greatest_test_post(res); \ - } \ - } while (0) - -/* Ignore a test, don't warn about it being unused. */ -#define GREATEST_IGNORE_TEST(TEST) (void)TEST - -/* Run a test in the current suite with one void * argument, - * which can be a pointer to a struct with multiple arguments. */ -#define GREATEST_RUN_TEST1(TEST, ENV) \ - do { \ - if (greatest_test_pre(#TEST) == 1) { \ - enum greatest_test_res res = GREATEST_SAVE_CONTEXT(); \ - if (res == GREATEST_TEST_RES_PASS) { \ - res = TEST(ENV); \ - } \ - greatest_test_post(res); \ - } \ - } while (0) - -#ifdef GREATEST_VA_ARGS -#define GREATEST_RUN_TESTp(TEST, ...) \ - do { \ - if (greatest_test_pre(#TEST) == 1) { \ - enum greatest_test_res res = GREATEST_SAVE_CONTEXT(); \ - if (res == GREATEST_TEST_RES_PASS) { \ - res = TEST(__VA_ARGS__); \ - } \ - greatest_test_post(res); \ - } \ - } while (0) -#endif - - -/* Check if the test runner is in verbose mode. */ -#define GREATEST_IS_VERBOSE() ((greatest_info.verbosity) > 0) -#define GREATEST_LIST_ONLY() \ - (greatest_info.flags & GREATEST_FLAG_LIST_ONLY) -#define GREATEST_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() \ - (GREATEST_FIRST_FAIL() && \ - (greatest_info.suite.failed > 0 || greatest_info.failed > 0)) - -/* Message-less forms of tests defined below. */ -#define GREATEST_PASS() GREATEST_PASSm(NULL) -#define GREATEST_FAIL() GREATEST_FAILm(NULL) -#define GREATEST_SKIP() GREATEST_SKIPm(NULL) -#define GREATEST_ASSERT(COND) \ - GREATEST_ASSERTm(#COND, COND) -#define GREATEST_ASSERT_OR_LONGJMP(COND) \ - GREATEST_ASSERT_OR_LONGJMPm(#COND, COND) -#define GREATEST_ASSERT_FALSE(COND) \ - GREATEST_ASSERT_FALSEm(#COND, COND) -#define GREATEST_ASSERT_EQ(EXP, GOT) \ - GREATEST_ASSERT_EQm(#EXP " != " #GOT, EXP, GOT) -#define GREATEST_ASSERT_EQ_FMT(EXP, GOT, FMT) \ - GREATEST_ASSERT_EQ_FMTm(#EXP " != " #GOT, EXP, GOT, FMT) -#define GREATEST_ASSERT_IN_RANGE(EXP, GOT, TOL) \ - GREATEST_ASSERT_IN_RANGEm(#EXP " != " #GOT " +/- " #TOL, EXP, GOT, TOL) -#define GREATEST_ASSERT_EQUAL_T(EXP, GOT, TYPE_INFO, UDATA) \ - GREATEST_ASSERT_EQUAL_Tm(#EXP " != " #GOT, EXP, GOT, TYPE_INFO, UDATA) -#define GREATEST_ASSERT_STR_EQ(EXP, GOT) \ - GREATEST_ASSERT_STR_EQm(#EXP " != " #GOT, EXP, GOT) -#define GREATEST_ASSERT_STRN_EQ(EXP, GOT, SIZE) \ - GREATEST_ASSERT_STRN_EQm(#EXP " != " #GOT, EXP, GOT, SIZE) -#define GREATEST_ASSERT_MEM_EQ(EXP, GOT, SIZE) \ - GREATEST_ASSERT_MEM_EQm(#EXP " != " #GOT, EXP, GOT, SIZE) -#define GREATEST_ASSERT_ENUM_EQ(EXP, GOT, ENUM_STR) \ - GREATEST_ASSERT_ENUM_EQm(#EXP " != " #GOT, EXP, GOT, ENUM_STR) - -/* The following forms take an additional message argument first, - * to be displayed by the test runner. */ - -/* Fail if a condition is not true, with message. */ -#define GREATEST_ASSERTm(MSG, COND) \ - do { \ - greatest_info.assertions++; \ - if (!(COND)) { GREATEST_FAILm(MSG); } \ - } while (0) - -/* Fail if a condition is not true, longjmping out of test. */ -#define GREATEST_ASSERT_OR_LONGJMPm(MSG, COND) \ - do { \ - greatest_info.assertions++; \ - if (!(COND)) { GREATEST_FAIL_WITH_LONGJMPm(MSG); } \ - } while (0) - -/* Fail if a condition is not false, with message. */ -#define GREATEST_ASSERT_FALSEm(MSG, COND) \ - do { \ - greatest_info.assertions++; \ - if ((COND)) { GREATEST_FAILm(MSG); } \ - } while (0) - -/* Fail if EXP != GOT (equality comparison by ==). */ -#define GREATEST_ASSERT_EQm(MSG, EXP, GOT) \ - do { \ - greatest_info.assertions++; \ - if ((EXP) != (GOT)) { GREATEST_FAILm(MSG); } \ - } while (0) - -/* Fail if EXP != GOT (equality comparison by ==). - * Warning: FMT, EXP, and GOT will be evaluated more - * than once on failure. */ -#define GREATEST_ASSERT_EQ_FMTm(MSG, EXP, GOT, FMT) \ - do { \ - greatest_info.assertions++; \ - if ((EXP) != (GOT)) { \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\nExpected: "); \ - GREATEST_FPRINTF(GREATEST_STDOUT, FMT, EXP); \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n Got: "); \ - GREATEST_FPRINTF(GREATEST_STDOUT, FMT, GOT); \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \ - GREATEST_FAILm(MSG); \ - } \ - } while (0) - -/* Fail if EXP is not equal to GOT, printing enum IDs. */ -#define GREATEST_ASSERT_ENUM_EQm(MSG, EXP, GOT, ENUM_STR) \ - do { \ - int greatest_EXP = (int)(EXP); \ - int greatest_GOT = (int)(GOT); \ - greatest_enum_str_fun *greatest_ENUM_STR = ENUM_STR; \ - if (greatest_EXP != greatest_GOT) { \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\nExpected: %s", \ - greatest_ENUM_STR(greatest_EXP)); \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n Got: %s\n", \ - greatest_ENUM_STR(greatest_GOT)); \ - GREATEST_FAILm(MSG); \ - } \ - } while (0) \ - -/* Fail if GOT not in range of EXP +|- TOL. */ -#define GREATEST_ASSERT_IN_RANGEm(MSG, EXP, GOT, TOL) \ - do { \ - GREATEST_FLOAT greatest_EXP = (EXP); \ - GREATEST_FLOAT greatest_GOT = (GOT); \ - GREATEST_FLOAT greatest_TOL = (TOL); \ - greatest_info.assertions++; \ - if ((greatest_EXP > greatest_GOT && \ - greatest_EXP - greatest_GOT > greatest_TOL) || \ - (greatest_EXP < greatest_GOT && \ - greatest_GOT - greatest_EXP > greatest_TOL)) { \ - GREATEST_FPRINTF(GREATEST_STDOUT, \ - "\nExpected: " GREATEST_FLOAT_FMT \ - " +/- " GREATEST_FLOAT_FMT \ - "\n Got: " GREATEST_FLOAT_FMT \ - "\n", \ - greatest_EXP, greatest_TOL, greatest_GOT); \ - GREATEST_FAILm(MSG); \ - } \ - } while (0) - -/* Fail if EXP is not equal to GOT, according to strcmp. */ -#define GREATEST_ASSERT_STR_EQm(MSG, EXP, GOT) \ - do { \ - GREATEST_ASSERT_EQUAL_Tm(MSG, EXP, GOT, \ - &greatest_type_info_string, NULL); \ - } while (0) \ - -/* Fail if EXP is not equal to GOT, according to strncmp. */ -#define GREATEST_ASSERT_STRN_EQm(MSG, EXP, GOT, SIZE) \ - do { \ - size_t size = SIZE; \ - GREATEST_ASSERT_EQUAL_Tm(MSG, EXP, GOT, \ - &greatest_type_info_string, &size); \ - } while (0) \ - -/* Fail if EXP is not equal to GOT, according to memcmp. */ -#define GREATEST_ASSERT_MEM_EQm(MSG, EXP, GOT, SIZE) \ - do { \ - greatest_memory_cmp_env env; \ - env.exp = (const unsigned char *)EXP; \ - env.got = (const unsigned char *)GOT; \ - env.size = SIZE; \ - GREATEST_ASSERT_EQUAL_Tm(MSG, env.exp, env.got, \ - &greatest_type_info_memory, &env); \ - } while (0) \ - -/* Fail if EXP is not equal to GOT, according to a comparison - * callback in TYPE_INFO. If they are not equal, optionally use a - * print callback in TYPE_INFO to print them. */ -#define GREATEST_ASSERT_EQUAL_Tm(MSG, EXP, GOT, TYPE_INFO, UDATA) \ - do { \ - greatest_type_info *type_info = (TYPE_INFO); \ - greatest_info.assertions++; \ - if (!greatest_do_assert_equal_t(EXP, GOT, \ - type_info, UDATA)) { \ - if (type_info == NULL || type_info->equal == NULL) { \ - GREATEST_FAILm("type_info->equal callback missing!"); \ - } else { \ - GREATEST_FAILm(MSG); \ - } \ - } \ - } while (0) \ - -/* Pass. */ -#define GREATEST_PASSm(MSG) \ - do { \ - greatest_info.msg = MSG; \ - return GREATEST_TEST_RES_PASS; \ - } while (0) - -/* Fail. */ -#define GREATEST_FAILm(MSG) \ - do { \ - greatest_info.fail_file = __FILE__; \ - greatest_info.fail_line = __LINE__; \ - greatest_info.msg = MSG; \ - if (GREATEST_ABORT_ON_FAIL()) { abort(); } \ - return GREATEST_TEST_RES_FAIL; \ - } while (0) - -/* Optional GREATEST_FAILm variant that longjmps. */ -#if GREATEST_USE_LONGJMP -#define GREATEST_FAIL_WITH_LONGJMP() GREATEST_FAIL_WITH_LONGJMPm(NULL) -#define GREATEST_FAIL_WITH_LONGJMPm(MSG) \ - do { \ - greatest_info.fail_file = __FILE__; \ - greatest_info.fail_line = __LINE__; \ - greatest_info.msg = MSG; \ - longjmp(greatest_info.jump_dest, GREATEST_TEST_RES_FAIL); \ - } while (0) -#endif - -/* Skip the current test. */ -#define GREATEST_SKIPm(MSG) \ - do { \ - greatest_info.msg = MSG; \ - return GREATEST_TEST_RES_SKIP; \ - } while (0) - -/* Check the result of a subfunction using ASSERT, etc. */ -#define GREATEST_CHECK_CALL(RES) \ - do { \ - enum greatest_test_res greatest_RES = RES; \ - if (greatest_RES != GREATEST_TEST_RES_PASS) { \ - return greatest_RES; \ - } \ - } while (0) \ - -#if GREATEST_USE_TIME -#define GREATEST_SET_TIME(NAME) \ - NAME = clock(); \ - if (NAME == (clock_t) -1) { \ - GREATEST_FPRINTF(GREATEST_STDOUT, \ - "clock error: %s\n", #NAME); \ - exit(EXIT_FAILURE); \ - } - -#define GREATEST_CLOCK_DIFF(C1, C2) \ - GREATEST_FPRINTF(GREATEST_STDOUT, " (%lu ticks, %.3f sec)", \ - (long unsigned int) (C2) - (long unsigned int)(C1), \ - (double)((C2) - (C1)) / (1.0 * (double)CLOCKS_PER_SEC)) -#else -#define GREATEST_SET_TIME(UNUSED) -#define GREATEST_CLOCK_DIFF(UNUSED1, UNUSED2) -#endif - -#if GREATEST_USE_LONGJMP -#define GREATEST_SAVE_CONTEXT() \ - /* setjmp returns 0 (GREATEST_TEST_RES_PASS) on first call * \ - * so the test runs, then RES_FAIL from FAIL_WITH_LONGJMP. */ \ - ((enum greatest_test_res)(setjmp(greatest_info.jump_dest))) -#else -#define GREATEST_SAVE_CONTEXT() \ - /*a no-op, since setjmp/longjmp aren't being used */ \ - GREATEST_TEST_RES_PASS -#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. */ -#define GREATEST_MAIN_DEFS() \ - \ -/* Is FILTER a subset of NAME? */ \ -static int greatest_name_match(const char *name, const char *filter, \ - int res_if_none) { \ - size_t offset = 0; \ - size_t filter_len = filter ? strlen(filter) : 0; \ - if (filter_len == 0) { return res_if_none; } /* no filter */ \ - while (name[offset] != '\0') { \ - if (name[offset] == filter[0]) { \ - if (0 == strncmp(&name[offset], filter, filter_len)) { \ - return 1; \ - } \ - } \ - offset++; \ - } \ - \ - return 0; \ -} \ - \ -static void greatest_buffer_test_name(const char *name) { \ - struct greatest_run_info *g = &greatest_info; \ - size_t len = strlen(name), size = sizeof(g->name_buf); \ - memset(g->name_buf, 0x00, size); \ - (void)strncat(g->name_buf, name, size - 1); \ - if (g->name_suffix && (len + 1 < size)) { \ - g->name_buf[len] = '_'; \ - strncat(&g->name_buf[len+1], g->name_suffix, size-(len+2)); \ - } \ -} \ - \ -/* 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) { \ - GREATEST_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); \ - if (greatest_info.teardown) { \ - void *udata = greatest_info.teardown_udata; \ - greatest_info.teardown(udata); \ - } \ - \ - if (res <= GREATEST_TEST_RES_FAIL) { \ - greatest_do_fail(); \ - } else if (res >= GREATEST_TEST_RES_SKIP) { \ - greatest_do_skip(); \ - } else if (res == GREATEST_TEST_RES_PASS) { \ - greatest_do_pass(); \ - } \ - greatest_info.name_suffix = NULL; \ - greatest_info.suite.tests_run++; \ - greatest_info.col++; \ - if (GREATEST_IS_VERBOSE()) { \ - GREATEST_CLOCK_DIFF(greatest_info.suite.pre_test, \ - greatest_info.suite.post_test); \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \ - } else if (greatest_info.col % greatest_info.width == 0) { \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \ - greatest_info.col = 0; \ - } \ - fflush(GREATEST_STDOUT); \ -} \ - \ -static void report_suite(void) { \ - if (greatest_info.suite.tests_run > 0) { \ - GREATEST_FPRINTF(GREATEST_STDOUT, \ - "\n%u test%s - %u passed, %u failed, %u skipped", \ - greatest_info.suite.tests_run, \ - greatest_info.suite.tests_run == 1 ? "" : "s", \ - greatest_info.suite.passed, \ - greatest_info.suite.failed, \ - greatest_info.suite.skipped); \ - GREATEST_CLOCK_DIFF(greatest_info.suite.pre_suite, \ - greatest_info.suite.post_suite); \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \ - } \ -} \ - \ -static void update_counts_and_reset_suite(void) { \ - greatest_info.setup = NULL; \ - greatest_info.setup_udata = NULL; \ - greatest_info.teardown = NULL; \ - greatest_info.teardown_udata = NULL; \ - greatest_info.passed += greatest_info.suite.passed; \ - greatest_info.failed += greatest_info.suite.failed; \ - greatest_info.skipped += greatest_info.suite.skipped; \ - greatest_info.tests_run += greatest_info.suite.tests_run; \ - memset(&greatest_info.suite, 0, sizeof(greatest_info.suite)); \ - greatest_info.col = 0; \ -} \ - \ -static int greatest_suite_pre(const char *suite_name) { \ - struct greatest_prng *p = &greatest_info.prng[0]; \ - if (!greatest_name_match(suite_name, greatest_info.suite_filter, 1) \ - || (GREATEST_FAILURE_ABORT())) { 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(); \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n* Suite %s:\n", suite_name); \ - GREATEST_SET_TIME(greatest_info.suite.pre_suite); \ - return 1; \ -} \ - \ -static void greatest_suite_post(void) { \ - GREATEST_SET_TIME(greatest_info.suite.post_suite); \ - report_suite(); \ -} \ - \ -static void greatest_run_suite(greatest_suite_cb *suite_cb, \ - const char *suite_name) { \ - if (greatest_suite_pre(suite_name)) { \ - suite_cb(); \ - greatest_suite_post(); \ - } \ -} \ - \ -int greatest_do_assert_equal_t(const void *expd, const void *got, \ - greatest_type_info *type_info, void *udata) { \ - int eq = 0; \ - if (type_info == NULL || type_info->equal == NULL) { \ - return 0; \ - } \ - eq = type_info->equal(expd, got, udata); \ - if (!eq) { \ - if (type_info->print != NULL) { \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\nExpected: "); \ - (void)type_info->print(expd, udata); \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n Got: "); \ - (void)type_info->print(got, udata); \ - GREATEST_FPRINTF(GREATEST_STDOUT, "\n"); \ - } \ - } \ - return eq; \ -} \ - \ -static void greatest_usage(const char *name) { \ - GREATEST_FPRINTF(GREATEST_STDOUT, \ - "Usage: %s [-hlfav] [-s SUITE] [-t TEST] [-x EXCLUDE]\n" \ - " -h, --help print this Help\n" \ - " -l List suites and tests, then exit (dry run)\n" \ - " -f Stop runner after first failure\n" \ - " -a Abort on first failure (implies -f)\n" \ - " -v Verbose output\n" \ - " -s SUITE only run suites containing substring SUITE\n" \ - " -t TEST only run tests containing substring TEST\n" \ - " -x EXCLUDE exclude tests containing substring EXCLUDE\n", \ - name); \ -} \ - \ -static void greatest_parse_options(int argc, char **argv) { \ - int i = 0; \ - for (i = 1; i < argc; i++) { \ - if (argv[i][0] == '-') { \ - 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]); \ - exit(EXIT_FAILURE); \ - } \ - } \ - } \ -} \ - \ -int greatest_all_passed(void) { return (greatest_info.failed == 0); } \ - \ -void greatest_set_test_filter(const char *filter) { \ - greatest_info.test_filter = filter; \ -} \ - \ -void greatest_set_test_exclude(const char *filter) { \ - 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) { \ - if (report) { \ - report->passed = greatest_info.passed; \ - report->failed = greatest_info.failed; \ - report->skipped = greatest_info.skipped; \ - report->assertions = greatest_info.assertions; \ - } \ -} \ - \ -unsigned int greatest_get_verbosity(void) { \ - return greatest_info.verbosity; \ -} \ - \ -void greatest_set_verbosity(unsigned int verbosity) { \ - greatest_info.verbosity = (unsigned char)verbosity; \ -} \ - \ -void greatest_set_flag(greatest_flag_t flag) { \ - greatest_info.flags = (unsigned char)(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) { \ - greatest_info.setup = cb; \ - greatest_info.setup_udata = udata; \ -} \ - \ -void GREATEST_SET_TEARDOWN_CB(greatest_teardown_cb *cb, \ - void *udata) { \ - greatest_info.teardown = cb; \ - greatest_info.teardown_udata = udata; \ -} \ - \ -static int greatest_string_equal_cb(const void *expd, const void *got, \ - void *udata) { \ - size_t *size = (size_t *)udata; \ - return (size != NULL \ - ? (0 == strncmp((const char *)expd, (const char *)got, *size)) \ - : (0 == strcmp((const char *)expd, (const char *)got))); \ -} \ - \ -static int greatest_string_printf_cb(const void *t, void *udata) { \ - (void)udata; /* note: does not check \0 termination. */ \ - return GREATEST_FPRINTF(GREATEST_STDOUT, "%s", (const char *)t); \ -} \ - \ -greatest_type_info greatest_type_info_string = { \ - greatest_string_equal_cb, \ - greatest_string_printf_cb, \ -}; \ - \ -static int greatest_memory_equal_cb(const void *expd, const void *got, \ - void *udata) { \ - greatest_memory_cmp_env *env = (greatest_memory_cmp_env *)udata; \ - return (0 == memcmp(expd, got, env->size)); \ -} \ - \ -/* Hexdump raw memory, with differences highlighted */ \ -static int greatest_memory_printf_cb(const void *t, void *udata) { \ - greatest_memory_cmp_env *env = (greatest_memory_cmp_env *)udata; \ - const unsigned char *buf = (const unsigned char *)t; \ - unsigned char diff_mark = ' '; \ - FILE *out = GREATEST_STDOUT; \ - size_t i, line_i, line_len = 0; \ - int len = 0; /* format hexdump with differences highlighted */ \ - for (i = 0; i < env->size; i+= line_len) { \ - diff_mark = ' '; \ - line_len = env->size - i; \ - if (line_len > 16) { line_len = 16; } \ - for (line_i = i; line_i < i + line_len; line_i++) { \ - if (env->exp[line_i] != env->got[line_i]) diff_mark = 'X'; \ - } \ - len += GREATEST_FPRINTF(out, "\n%04x %c ", \ - (unsigned int)i, diff_mark); \ - for (line_i = i; line_i < i + line_len; line_i++) { \ - int m = env->exp[line_i] == env->got[line_i]; /* match? */ \ - len += GREATEST_FPRINTF(out, "%02x%c", \ - buf[line_i], m ? ' ' : '<'); \ - } \ - for (line_i = 0; line_i < 16 - line_len; line_i++) { \ - len += GREATEST_FPRINTF(out, " "); \ - } \ - GREATEST_FPRINTF(out, " "); \ - for (line_i = i; line_i < i + line_len; line_i++) { \ - unsigned char c = buf[line_i]; \ - len += GREATEST_FPRINTF(out, "%c", isprint(c) ? c : '.'); \ - } \ - } \ - len += GREATEST_FPRINTF(out, "\n"); \ - 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) { \ - struct greatest_prng *p = &greatest_info.prng[id]; \ - if (p->count == 0) { return 0; } \ - p->count_ceil = p->count; \ - for (p->m = 1; p->m < p->count; p->m <<= 1) {} \ - p->state = seed & 0x1fffffff; /* only use lower 29 bits */ \ - p->a = 4LU * p->state; /* to avoid overflow when */ \ - p->a = (p->a ? p->a : 4) | 1; /* multiplied by 4 */ \ - p->c = 2147483647; /* and so p->c ((2 ** 31) - 1) is */ \ - p->initialized = 1; /* always relatively prime to p->a. */ \ - fprintf(stderr, "init_second_pass: a %lu, c %lu, state %lu\n", \ - p->a, p->c, p->state); \ - 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->m - 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_memory_equal_cb, \ - greatest_memory_printf_cb, \ -}; \ - \ -greatest_run_info greatest_info - -/* Handle command-line arguments, etc. */ -#define GREATEST_MAIN_BEGIN() \ - do { \ - GREATEST_INIT(); \ - greatest_parse_options(argc, argv); \ - } while (0) - -/* Report results, exit with exit status based on results. */ -#define GREATEST_MAIN_END() \ - do { \ - GREATEST_PRINT_REPORT(); \ - return (greatest_all_passed() ? EXIT_SUCCESS : EXIT_FAILURE); \ - } while (0) - -/* Make abbreviations without the GREATEST_ prefix for the - * most commonly used symbols. */ -#if GREATEST_USE_ABBREVS -#define TEST GREATEST_TEST -#define SUITE GREATEST_SUITE -#define SUITE_EXTERN GREATEST_SUITE_EXTERN -#define RUN_TEST GREATEST_RUN_TEST -#define RUN_TEST1 GREATEST_RUN_TEST1 -#define RUN_SUITE GREATEST_RUN_SUITE -#define IGNORE_TEST GREATEST_IGNORE_TEST -#define ASSERT GREATEST_ASSERT -#define ASSERTm GREATEST_ASSERTm -#define ASSERT_FALSE GREATEST_ASSERT_FALSE -#define ASSERT_EQ GREATEST_ASSERT_EQ -#define ASSERT_EQ_FMT GREATEST_ASSERT_EQ_FMT -#define ASSERT_IN_RANGE GREATEST_ASSERT_IN_RANGE -#define ASSERT_EQUAL_T GREATEST_ASSERT_EQUAL_T -#define ASSERT_STR_EQ GREATEST_ASSERT_STR_EQ -#define ASSERT_STRN_EQ GREATEST_ASSERT_STRN_EQ -#define ASSERT_MEM_EQ GREATEST_ASSERT_MEM_EQ -#define ASSERT_ENUM_EQ GREATEST_ASSERT_ENUM_EQ -#define ASSERT_FALSEm GREATEST_ASSERT_FALSEm -#define ASSERT_EQm GREATEST_ASSERT_EQm -#define ASSERT_EQ_FMTm GREATEST_ASSERT_EQ_FMTm -#define ASSERT_IN_RANGEm GREATEST_ASSERT_IN_RANGEm -#define ASSERT_EQUAL_Tm GREATEST_ASSERT_EQUAL_Tm -#define ASSERT_STR_EQm GREATEST_ASSERT_STR_EQm -#define ASSERT_STRN_EQm GREATEST_ASSERT_STRN_EQm -#define ASSERT_MEM_EQm GREATEST_ASSERT_MEM_EQm -#define ASSERT_ENUM_EQm GREATEST_ASSERT_ENUM_EQm -#define PASS GREATEST_PASS -#define FAIL GREATEST_FAIL -#define SKIP GREATEST_SKIP -#define PASSm GREATEST_PASSm -#define FAILm GREATEST_FAILm -#define SKIPm GREATEST_SKIPm -#define SET_SETUP GREATEST_SET_SETUP_CB -#define SET_TEARDOWN GREATEST_SET_TEARDOWN_CB -#define CHECK_CALL GREATEST_CHECK_CALL -#define SHUFFLE_TESTS GREATEST_SHUFFLE_TESTS -#define SHUFFLE_SUITES GREATEST_SHUFFLE_SUITES - -#ifdef GREATEST_VA_ARGS -#define RUN_TESTp GREATEST_RUN_TESTp -#endif - -#if GREATEST_USE_LONGJMP -#define ASSERT_OR_LONGJMP GREATEST_ASSERT_OR_LONGJMP -#define ASSERT_OR_LONGJMPm GREATEST_ASSERT_OR_LONGJMPm -#define FAIL_WITH_LONGJMP GREATEST_FAIL_WITH_LONGJMP -#define FAIL_WITH_LONGJMPm GREATEST_FAIL_WITH_LONGJMPm -#endif - -#endif /* USE_ABBREVS */ - -#if defined(__cplusplus) && !defined(GREATEST_NO_EXTERN_CPLUSPLUS) -} -#endif - -#endif
--- a/tests/CMakeLists.txt Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/CMakeLists.txt Wed Oct 13 20:56:07 2021 +0200 @@ -40,7 +40,7 @@ foreach (t ${TESTS}) add_executable(test-${t} ${tests_SOURCE_DIR}/test-${t}.c) add_test(NAME test-${t} COMMAND test-${t}) - target_link_libraries(test-${t} libmlk-adventure libmlk-greatest libmlk-rexo) + target_link_libraries(test-${t} libmlk-adventure libmlk-rexo) target_compile_definitions(test-${t} PRIVATE DIRECTORY="${tests_SOURCE_DIR}/assets") set_target_properties(test-${t} PROPERTIES FOLDER tests) source_group("" FILES test-${t}.c)
--- a/tests/test-action-script.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-action-script.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,8 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/action.h> #include <core/event.h> @@ -86,50 +85,43 @@ ((struct invokes *)act->data)->finish++; } -GREATEST_TEST -basics_init(void) +RX_TEST_CASE(basics, init) { struct script sc; script_init(&sc); - GREATEST_ASSERT_EQ(sc.actionsz, 0U); - GREATEST_ASSERT_EQ(sc.cur, 0U); - - GREATEST_PASS(); + RX_UINT_REQUIRE_EQUAL(sc.actionsz, 0U); + RX_UINT_REQUIRE_EQUAL(sc.cur, 0U); } -GREATEST_TEST -basics_append(void) +RX_TEST_CASE(basics, append) { struct action act[3] = {0}; struct script sc = {0}; - GREATEST_ASSERT(script_append(&sc, &act[0]) == 0); - GREATEST_ASSERT_EQ(sc.cur, 0U); - GREATEST_ASSERT_EQ(sc.actionsz, 1U); - GREATEST_ASSERT_EQ(sc.actions[0], &act[0]); + RX_REQUIRE(script_append(&sc, &act[0]) == 0); + RX_UINT_REQUIRE_EQUAL(sc.cur, 0U); + RX_UINT_REQUIRE_EQUAL(sc.actionsz, 1U); + RX_PTR_REQUIRE_EQUAL(sc.actions[0], &act[0]); - GREATEST_ASSERT(script_append(&sc, &act[1]) == 0); - GREATEST_ASSERT_EQ(sc.cur, 0U); - GREATEST_ASSERT_EQ(sc.actionsz, 2U); - GREATEST_ASSERT_EQ(sc.actions[0], &act[0]); - GREATEST_ASSERT_EQ(sc.actions[1], &act[1]); + RX_REQUIRE(script_append(&sc, &act[1]) == 0); + RX_UINT_REQUIRE_EQUAL(sc.cur, 0U); + RX_UINT_REQUIRE_EQUAL(sc.actionsz, 2U); + RX_PTR_REQUIRE_EQUAL(sc.actions[0], &act[0]); + RX_PTR_REQUIRE_EQUAL(sc.actions[1], &act[1]); - GREATEST_ASSERT(script_append(&sc, &act[2]) == 0); - GREATEST_ASSERT_EQ(sc.cur, 0U); - GREATEST_ASSERT_EQ(sc.actionsz, 3U); - GREATEST_ASSERT_EQ(sc.actions[0], &act[0]); - GREATEST_ASSERT_EQ(sc.actions[1], &act[1]); - GREATEST_ASSERT_EQ(sc.actions[2], &act[2]); + RX_REQUIRE(script_append(&sc, &act[2]) == 0); + RX_UINT_REQUIRE_EQUAL(sc.cur, 0U); + RX_UINT_REQUIRE_EQUAL(sc.actionsz, 3U); + RX_PTR_REQUIRE_EQUAL(sc.actions[0], &act[0]); + RX_PTR_REQUIRE_EQUAL(sc.actions[1], &act[1]); + RX_PTR_REQUIRE_EQUAL(sc.actions[2], &act[2]); script_finish(&sc); - - GREATEST_PASS(); } -GREATEST_TEST -basics_handle(void) +RX_TEST_CASE(basics, handle) { struct { struct invokes inv; @@ -142,73 +134,70 @@ struct script sc = {0}; - GREATEST_ASSERT(script_append(&sc, &table[0].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[1].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[2].act) == 0); + RX_REQUIRE(script_append(&sc, &table[0].act) == 0); + RX_REQUIRE(script_append(&sc, &table[1].act) == 0); + RX_REQUIRE(script_append(&sc, &table[2].act) == 0); /* [0] */ script_handle(&sc, &(union event){0}); - GREATEST_ASSERT_EQ(table[0].inv.handle, 1); - GREATEST_ASSERT_EQ(table[0].inv.update, 0); - GREATEST_ASSERT_EQ(table[0].inv.draw, 0); - GREATEST_ASSERT_EQ(table[0].inv.end, 0); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 0); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 0); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); /* [0] -> [1] */ - GREATEST_ASSERT(!script_update(&sc, 0)); + RX_REQUIRE(!script_update(&sc, 0)); script_handle(&sc, &(union event){0}); - GREATEST_ASSERT_EQ(table[0].inv.handle, 1); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 0); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 1); - GREATEST_ASSERT_EQ(table[1].inv.update, 0); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 0); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); /* [2] */ - GREATEST_ASSERT(!script_update(&sc, 0)); + RX_REQUIRE(!script_update(&sc, 0)); script_handle(&sc, &(union event){0}); - GREATEST_ASSERT_EQ(table[0].inv.handle, 1); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 0); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 1); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 1); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); - - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); } -GREATEST_TEST -basics_update(void) +RX_TEST_CASE(basics, update) { struct { struct invokes inv; @@ -221,90 +210,87 @@ struct script sc = {0}; - GREATEST_ASSERT(script_append(&sc, &table[0].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[1].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[2].act) == 0); + RX_REQUIRE(script_append(&sc, &table[0].act) == 0); + RX_REQUIRE(script_append(&sc, &table[1].act) == 0); + RX_REQUIRE(script_append(&sc, &table[2].act) == 0); /* 0 -> 1 */ - GREATEST_ASSERT(!script_update(&sc, 0)); - GREATEST_ASSERT_EQ(table[0].inv.handle, 0); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 0); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 0); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 0); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_REQUIRE(!script_update(&sc, 0)); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); /* 1 -> 2 */ - GREATEST_ASSERT(!script_update(&sc, 0)); - GREATEST_ASSERT_EQ(table[0].inv.handle, 0); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 0); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_REQUIRE(!script_update(&sc, 0)); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); /* 2 stays, it never ends. */ - GREATEST_ASSERT(!script_update(&sc, 0)); - GREATEST_ASSERT(!script_update(&sc, 0)); - GREATEST_ASSERT(!script_update(&sc, 0)); - GREATEST_ASSERT_EQ(table[0].inv.handle, 0); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 0); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 3); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_REQUIRE(!script_update(&sc, 0)); + RX_REQUIRE(!script_update(&sc, 0)); + RX_REQUIRE(!script_update(&sc, 0)); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 3); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); /* Now, change its update function to complete the script. */ table[2].act.update = my_update_true; - GREATEST_ASSERT(script_update(&sc, 0)); - GREATEST_ASSERT_EQ(table[0].inv.handle, 0); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 0); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 4); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 1); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); - - GREATEST_PASS(); + RX_REQUIRE(script_update(&sc, 0)); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 4); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); } -GREATEST_TEST -basics_draw(void) +RX_TEST_CASE(basics, draw) { struct { struct invokes inv; @@ -317,73 +303,70 @@ struct script sc = {0}; - GREATEST_ASSERT(script_append(&sc, &table[0].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[1].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[2].act) == 0); + RX_REQUIRE(script_append(&sc, &table[0].act) == 0); + RX_REQUIRE(script_append(&sc, &table[1].act) == 0); + RX_REQUIRE(script_append(&sc, &table[2].act) == 0); /* [0] */ script_draw(&sc); - GREATEST_ASSERT_EQ(table[0].inv.handle, 0); - GREATEST_ASSERT_EQ(table[0].inv.update, 0); - GREATEST_ASSERT_EQ(table[0].inv.draw, 1); - GREATEST_ASSERT_EQ(table[0].inv.end, 0); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 0); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 0); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); /* [0] -> [1] */ - GREATEST_ASSERT(!script_update(&sc, 0)); + RX_REQUIRE(!script_update(&sc, 0)); script_draw(&sc); - GREATEST_ASSERT_EQ(table[0].inv.handle, 0); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 1); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 0); - GREATEST_ASSERT_EQ(table[1].inv.draw, 1); - GREATEST_ASSERT_EQ(table[1].inv.end, 0); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); /* [2] */ - GREATEST_ASSERT(!script_update(&sc, 0)); + RX_REQUIRE(!script_update(&sc, 0)); script_draw(&sc); - GREATEST_ASSERT_EQ(table[0].inv.handle, 0); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 1); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 1); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 1); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); - - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); } -GREATEST_TEST -basics_finish(void) +RX_TEST_CASE(basics, finish) { struct { struct invokes inv; @@ -396,46 +379,33 @@ struct script sc = {0}; - GREATEST_ASSERT(script_append(&sc, &table[0].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[1].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[2].act) == 0); + RX_REQUIRE(script_append(&sc, &table[0].act) == 0); + RX_REQUIRE(script_append(&sc, &table[1].act) == 0); + RX_REQUIRE(script_append(&sc, &table[2].act) == 0); /* Update once so that the current action goes to 1. */ - GREATEST_ASSERT(!script_update(&sc, 0)); + RX_REQUIRE(!script_update(&sc, 0)); script_finish(&sc); - GREATEST_ASSERT_EQ(table[0].inv.handle, 0); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 0); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 1); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 0); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 0); - GREATEST_ASSERT_EQ(table[1].inv.finish, 1); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 1); - - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 1); } -GREATEST_SUITE(suite_basics) -{ - GREATEST_RUN_TEST(basics_init); - GREATEST_RUN_TEST(basics_append); - GREATEST_RUN_TEST(basics_handle); - GREATEST_RUN_TEST(basics_update); - GREATEST_RUN_TEST(basics_draw); - GREATEST_RUN_TEST(basics_finish); -} - -GREATEST_TEST -action_simple(void) +RX_TEST_CASE(action, simple) { struct { struct invokes inv; @@ -449,9 +419,9 @@ struct script sc = {0}; struct action act; - GREATEST_ASSERT(script_append(&sc, &table[0].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[1].act) == 0); - GREATEST_ASSERT(script_append(&sc, &table[2].act) == 0); + RX_REQUIRE(script_append(&sc, &table[0].act) == 0); + RX_REQUIRE(script_append(&sc, &table[1].act) == 0); + RX_REQUIRE(script_append(&sc, &table[2].act) == 0); /* Now convert this script into an action itself. */ script_action(&sc, &act); @@ -461,118 +431,106 @@ action_draw(&act); /* [0] -> [1] */ - GREATEST_ASSERT(!action_update(&act, 0)); - GREATEST_ASSERT_EQ(table[0].inv.handle, 1); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 1); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 0); - GREATEST_ASSERT_EQ(table[1].inv.update, 0); - GREATEST_ASSERT_EQ(table[1].inv.draw, 0); - GREATEST_ASSERT_EQ(table[1].inv.end, 0); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_REQUIRE(!action_update(&act, 0)); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); action_handle(&act, &(union event){0}); action_draw(&act); /* [1] -> [2] */ - GREATEST_ASSERT(!action_update(&act, 0)); - GREATEST_ASSERT_EQ(table[0].inv.handle, 1); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 1); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 1); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 1); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 0); - GREATEST_ASSERT_EQ(table[2].inv.update, 0); - GREATEST_ASSERT_EQ(table[2].inv.draw, 0); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_REQUIRE(!action_update(&act, 0)); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); action_handle(&act, &(union event){0}); action_draw(&act); /* 2 stays, it never ends. */ - GREATEST_ASSERT(!action_update(&act, 0)); - GREATEST_ASSERT(!action_update(&act, 0)); - GREATEST_ASSERT(!action_update(&act, 0)); - GREATEST_ASSERT_EQ(table[0].inv.handle, 1); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 1); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 1); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 1); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 1); - GREATEST_ASSERT_EQ(table[2].inv.update, 3); - GREATEST_ASSERT_EQ(table[2].inv.draw, 1); - GREATEST_ASSERT_EQ(table[2].inv.end, 0); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_REQUIRE(!action_update(&act, 0)); + RX_REQUIRE(!action_update(&act, 0)); + RX_REQUIRE(!action_update(&act, 0)); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 3); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); table[2].act.update = my_update_true; - GREATEST_ASSERT(action_update(&act, 0)); - GREATEST_ASSERT_EQ(table[0].inv.handle, 1); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 1); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 0); - GREATEST_ASSERT_EQ(table[1].inv.handle, 1); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 1); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 0); - GREATEST_ASSERT_EQ(table[2].inv.handle, 1); - GREATEST_ASSERT_EQ(table[2].inv.update, 4); - GREATEST_ASSERT_EQ(table[2].inv.draw, 1); - GREATEST_ASSERT_EQ(table[2].inv.end, 1); - GREATEST_ASSERT_EQ(table[2].inv.finish, 0); + RX_REQUIRE(action_update(&act, 0)); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 0); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 4); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 0); /* Also dispose resources. */ action_finish(&act); - GREATEST_ASSERT_EQ(table[0].inv.handle, 1); - GREATEST_ASSERT_EQ(table[0].inv.update, 1); - GREATEST_ASSERT_EQ(table[0].inv.draw, 1); - GREATEST_ASSERT_EQ(table[0].inv.end, 1); - GREATEST_ASSERT_EQ(table[0].inv.finish, 1); - GREATEST_ASSERT_EQ(table[1].inv.handle, 1); - GREATEST_ASSERT_EQ(table[1].inv.update, 1); - GREATEST_ASSERT_EQ(table[1].inv.draw, 1); - GREATEST_ASSERT_EQ(table[1].inv.end, 1); - GREATEST_ASSERT_EQ(table[1].inv.finish, 1); - GREATEST_ASSERT_EQ(table[2].inv.handle, 1); - GREATEST_ASSERT_EQ(table[2].inv.update, 4); - GREATEST_ASSERT_EQ(table[2].inv.draw, 1); - GREATEST_ASSERT_EQ(table[2].inv.end, 1); - GREATEST_ASSERT_EQ(table[2].inv.finish, 1); - - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(table[0].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[0].inv.finish, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.update, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[1].inv.finish, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.handle, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.update, 4); + RX_INT_REQUIRE_EQUAL(table[2].inv.draw, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.end, 1); + RX_INT_REQUIRE_EQUAL(table[2].inv.finish, 1); } -GREATEST_SUITE(suite_action) -{ - GREATEST_RUN_TEST(action_simple); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(suite_basics); - GREATEST_RUN_SUITE(suite_action); - GREATEST_MAIN_END(); + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-action.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-action.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,8 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/action.h> #include <core/event.h> @@ -87,24 +86,21 @@ ((struct invokes *)act->data)->finish = 1; } -GREATEST_TEST -basics_handle(void) +RX_TEST_CASE(basics, handle) { struct invokes inv = {0}; struct action act = INIT(&inv, my_update_true); action_handle(&act, &dummy); - GREATEST_ASSERT(inv.handle); - GREATEST_ASSERT(!inv.update); - GREATEST_ASSERT(!inv.draw); - GREATEST_ASSERT(!inv.end); - GREATEST_ASSERT(!inv.finish); - GREATEST_PASS(); + RX_REQUIRE(inv.handle); + RX_REQUIRE(!inv.update); + RX_REQUIRE(!inv.draw); + RX_REQUIRE(!inv.end); + RX_REQUIRE(!inv.finish); } -GREATEST_TEST -basics_update(void) +RX_TEST_CASE(basics, update) { struct { struct invokes inv; @@ -115,101 +111,80 @@ }; /* True version. */ - GREATEST_ASSERT(action_update(&table[0].act, 0)); - GREATEST_ASSERT(!table[0].inv.handle); - GREATEST_ASSERT(table[0].inv.update); - GREATEST_ASSERT(!table[0].inv.draw); - GREATEST_ASSERT(!table[0].inv.end); - GREATEST_ASSERT(!table[0].inv.finish); + RX_REQUIRE(action_update(&table[0].act, 0)); + RX_REQUIRE(!table[0].inv.handle); + RX_REQUIRE(table[0].inv.update); + RX_REQUIRE(!table[0].inv.draw); + RX_REQUIRE(!table[0].inv.end); + RX_REQUIRE(!table[0].inv.finish); /* False version. */ - GREATEST_ASSERT(!action_update(&table[1].act, 0)); - GREATEST_ASSERT(!table[1].inv.handle); - GREATEST_ASSERT(table[1].inv.update); - GREATEST_ASSERT(!table[1].inv.draw); - GREATEST_ASSERT(!table[1].inv.end); - GREATEST_ASSERT(!table[1].inv.finish); - - GREATEST_PASS(); + RX_REQUIRE(!action_update(&table[1].act, 0)); + RX_REQUIRE(!table[1].inv.handle); + RX_REQUIRE(table[1].inv.update); + RX_REQUIRE(!table[1].inv.draw); + RX_REQUIRE(!table[1].inv.end); + RX_REQUIRE(!table[1].inv.finish); } -GREATEST_TEST -basics_draw(void) +RX_TEST_CASE(basics, draw) { struct invokes inv = {0}; struct action act = INIT(&inv, my_update_true); action_draw(&act); - GREATEST_ASSERT(!inv.handle); - GREATEST_ASSERT(!inv.update); - GREATEST_ASSERT(inv.draw); - GREATEST_ASSERT(!inv.end); - GREATEST_ASSERT(!inv.finish); - GREATEST_PASS(); + RX_REQUIRE(!inv.handle); + RX_REQUIRE(!inv.update); + RX_REQUIRE(inv.draw); + RX_REQUIRE(!inv.end); + RX_REQUIRE(!inv.finish); } -GREATEST_TEST -basics_end(void) +RX_TEST_CASE(basics, end) { struct invokes inv = {0}; struct action act = INIT(&inv, my_update_true); action_end(&act); - GREATEST_ASSERT(!inv.handle); - GREATEST_ASSERT(!inv.update); - GREATEST_ASSERT(!inv.draw); - GREATEST_ASSERT(inv.end); - GREATEST_ASSERT(!inv.finish); - GREATEST_PASS(); + RX_REQUIRE(!inv.handle); + RX_REQUIRE(!inv.update); + RX_REQUIRE(!inv.draw); + RX_REQUIRE(inv.end); + RX_REQUIRE(!inv.finish); } -GREATEST_TEST -basics_finish(void) +RX_TEST_CASE(basics, finish) { struct invokes inv = {0}; struct action act = INIT(&inv, my_update_true); action_finish(&act); - GREATEST_ASSERT(!inv.handle); - GREATEST_ASSERT(!inv.update); - GREATEST_ASSERT(!inv.draw); - GREATEST_ASSERT(!inv.end); - GREATEST_ASSERT(inv.finish); - GREATEST_PASS(); + RX_REQUIRE(!inv.handle); + RX_REQUIRE(!inv.update); + RX_REQUIRE(!inv.draw); + RX_REQUIRE(!inv.end); + RX_REQUIRE(inv.finish); } -GREATEST_SUITE(suite_basics) -{ - GREATEST_RUN_TEST(basics_handle); - GREATEST_RUN_TEST(basics_update); - GREATEST_RUN_TEST(basics_draw); - GREATEST_RUN_TEST(basics_end); - GREATEST_RUN_TEST(basics_finish); -} - -GREATEST_TEST -stack_add(void) +RX_TEST_CASE(stack, add) { struct action_stack st = {0}; struct action act = {0}; - GREATEST_ASSERT(action_stack_add(&st, &act) == 0); + RX_INT_REQUIRE_EQUAL(action_stack_add(&st, &act), 0); /* Now fill up. */ for (int i = 0; i < ACTION_STACK_MAX - 1; ++i) - GREATEST_ASSERT(action_stack_add(&st, &act) == 0); + RX_INT_REQUIRE_EQUAL(action_stack_add(&st, &act), 0); /* This one should not fit in. */ - GREATEST_ASSERT(action_stack_add(&st, &act) < 0); - - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(action_stack_add(&st, &act), -1); } -GREATEST_TEST -stack_handle(void) +RX_TEST_CASE(stack, handle) { struct { int called; @@ -227,14 +202,12 @@ action_stack_add(&st, &table[2].act); action_stack_handle(&st, &dummy); - GREATEST_ASSERT(table[0].called); - GREATEST_ASSERT(table[1].called); - GREATEST_ASSERT(table[2].called); - GREATEST_PASS(); + RX_REQUIRE(table[0].called); + RX_REQUIRE(table[1].called); + RX_REQUIRE(table[2].called); } -GREATEST_TEST -stack_update(void) +RX_TEST_CASE(stack, update) { struct { struct invokes inv; @@ -259,58 +232,58 @@ action_stack_add(&st, &table[5].act); action_stack_add(&st, &table[6].act); - GREATEST_ASSERT(!action_stack_update(&st, 0)); + RX_REQUIRE(!action_stack_update(&st, 0)); - GREATEST_ASSERT(!table[0].inv.handle); - GREATEST_ASSERT(!table[1].inv.handle); - GREATEST_ASSERT(!table[2].inv.handle); - GREATEST_ASSERT(!table[3].inv.handle); - GREATEST_ASSERT(!table[4].inv.handle); - GREATEST_ASSERT(!table[5].inv.handle); - GREATEST_ASSERT(!table[6].inv.handle); + RX_REQUIRE(!table[0].inv.handle); + RX_REQUIRE(!table[1].inv.handle); + RX_REQUIRE(!table[2].inv.handle); + RX_REQUIRE(!table[3].inv.handle); + RX_REQUIRE(!table[4].inv.handle); + RX_REQUIRE(!table[5].inv.handle); + RX_REQUIRE(!table[6].inv.handle); - GREATEST_ASSERT(table[0].inv.update); - GREATEST_ASSERT(table[1].inv.update); - GREATEST_ASSERT(table[2].inv.update); - GREATEST_ASSERT(table[3].inv.update); - GREATEST_ASSERT(table[4].inv.update); - GREATEST_ASSERT(table[5].inv.update); - GREATEST_ASSERT(table[6].inv.update); + RX_REQUIRE(table[0].inv.update); + RX_REQUIRE(table[1].inv.update); + RX_REQUIRE(table[2].inv.update); + RX_REQUIRE(table[3].inv.update); + RX_REQUIRE(table[4].inv.update); + RX_REQUIRE(table[5].inv.update); + RX_REQUIRE(table[6].inv.update); - GREATEST_ASSERT(!table[0].inv.draw); - GREATEST_ASSERT(!table[1].inv.draw); - GREATEST_ASSERT(!table[2].inv.draw); - GREATEST_ASSERT(!table[3].inv.draw); - GREATEST_ASSERT(!table[4].inv.draw); - GREATEST_ASSERT(!table[5].inv.draw); - GREATEST_ASSERT(!table[6].inv.draw); + RX_REQUIRE(!table[0].inv.draw); + RX_REQUIRE(!table[1].inv.draw); + RX_REQUIRE(!table[2].inv.draw); + RX_REQUIRE(!table[3].inv.draw); + RX_REQUIRE(!table[4].inv.draw); + RX_REQUIRE(!table[5].inv.draw); + RX_REQUIRE(!table[6].inv.draw); - GREATEST_ASSERT(!table[0].inv.end); - GREATEST_ASSERT(table[1].inv.end); - GREATEST_ASSERT(!table[2].inv.end); - GREATEST_ASSERT(!table[3].inv.end); - GREATEST_ASSERT(table[4].inv.end); - GREATEST_ASSERT(table[5].inv.end); - GREATEST_ASSERT(!table[6].inv.end); + RX_REQUIRE(!table[0].inv.end); + RX_REQUIRE(table[1].inv.end); + RX_REQUIRE(!table[2].inv.end); + RX_REQUIRE(!table[3].inv.end); + RX_REQUIRE(table[4].inv.end); + RX_REQUIRE(table[5].inv.end); + RX_REQUIRE(!table[6].inv.end); - GREATEST_ASSERT(!table[0].inv.finish); - GREATEST_ASSERT(table[1].inv.finish); - GREATEST_ASSERT(!table[2].inv.finish); - GREATEST_ASSERT(!table[3].inv.finish); - GREATEST_ASSERT(table[4].inv.finish); - GREATEST_ASSERT(table[5].inv.finish); - GREATEST_ASSERT(!table[6].inv.finish); + RX_REQUIRE(!table[0].inv.finish); + RX_REQUIRE(table[1].inv.finish); + RX_REQUIRE(!table[2].inv.finish); + RX_REQUIRE(!table[3].inv.finish); + RX_REQUIRE(table[4].inv.finish); + RX_REQUIRE(table[5].inv.finish); + RX_REQUIRE(!table[6].inv.finish); /* The following must still be there. */ - GREATEST_ASSERT_EQ(st.actions[0], &table[0].act); - GREATEST_ASSERT_EQ(st.actions[2], &table[2].act); - GREATEST_ASSERT_EQ(st.actions[3], &table[3].act); - GREATEST_ASSERT_EQ(st.actions[6], &table[6].act); + RX_PTR_REQUIRE_EQUAL(st.actions[0], &table[0].act); + RX_PTR_REQUIRE_EQUAL(st.actions[2], &table[2].act); + RX_PTR_REQUIRE_EQUAL(st.actions[3], &table[3].act); + RX_PTR_REQUIRE_EQUAL(st.actions[6], &table[6].act); /* The following must have been NULL-ed. */ - GREATEST_ASSERT_EQ(st.actions[1], NULL); - GREATEST_ASSERT_EQ(st.actions[4], NULL); - GREATEST_ASSERT_EQ(st.actions[5], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[1], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[4], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[5], NULL); /* * Now make all actions to return 1 and check if it cleans the stack. @@ -320,20 +293,17 @@ table[3].act.update = table[6].act.update = my_update_true; - GREATEST_ASSERT(action_stack_update(&st, 0)); - GREATEST_ASSERT_EQ(st.actions[0], NULL); - GREATEST_ASSERT_EQ(st.actions[1], NULL); - GREATEST_ASSERT_EQ(st.actions[2], NULL); - GREATEST_ASSERT_EQ(st.actions[3], NULL); - GREATEST_ASSERT_EQ(st.actions[4], NULL); - GREATEST_ASSERT_EQ(st.actions[5], NULL); - GREATEST_ASSERT_EQ(st.actions[6], NULL); - - GREATEST_PASS(); + RX_REQUIRE(action_stack_update(&st, 0)); + RX_PTR_REQUIRE_EQUAL(st.actions[0], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[1], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[2], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[3], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[4], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[5], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[6], NULL); } -GREATEST_TEST -stack_finish(void) +RX_TEST_CASE(stack, finish) { struct { struct invokes inv; @@ -348,42 +318,25 @@ action_stack_add(&st, &table[1].act); action_stack_finish(&st); - GREATEST_ASSERT(!table[0].inv.handle); - GREATEST_ASSERT(!table[0].inv.update); - GREATEST_ASSERT(!table[0].inv.draw); - GREATEST_ASSERT(table[0].inv.end); - GREATEST_ASSERT(table[0].inv.finish); + RX_REQUIRE(!table[0].inv.handle); + RX_REQUIRE(!table[0].inv.update); + RX_REQUIRE(!table[0].inv.draw); + RX_REQUIRE(table[0].inv.end); + RX_REQUIRE(table[0].inv.finish); - GREATEST_ASSERT(!table[0].inv.handle); - GREATEST_ASSERT(!table[0].inv.update); - GREATEST_ASSERT(!table[0].inv.draw); - GREATEST_ASSERT(table[0].inv.end); - GREATEST_ASSERT(table[0].inv.finish); + RX_REQUIRE(!table[0].inv.handle); + RX_REQUIRE(!table[0].inv.update); + RX_REQUIRE(!table[0].inv.draw); + RX_REQUIRE(table[0].inv.end); + RX_REQUIRE(table[0].inv.finish); /* They should also be NULL'ed. */ - GREATEST_ASSERT_EQ(st.actions[0], NULL); - GREATEST_ASSERT_EQ(st.actions[1], NULL); - - GREATEST_PASS(); + RX_PTR_REQUIRE_EQUAL(st.actions[0], NULL); + RX_PTR_REQUIRE_EQUAL(st.actions[1], NULL); } -GREATEST_SUITE(suite_stack) -{ - GREATEST_RUN_TEST(stack_add); - GREATEST_RUN_TEST(stack_handle); - GREATEST_RUN_TEST(stack_update); - GREATEST_RUN_TEST(stack_finish); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(suite_basics); - GREATEST_RUN_SUITE(suite_stack); - GREATEST_MAIN_END(); - - return 0; + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-alloc.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-alloc.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,8 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/alloc.h> @@ -26,50 +25,41 @@ int y; }; -GREATEST_TEST -test_array_simple(void) +RX_TEST_CASE(test, array_simple) { struct point *points; - GREATEST_ASSERT((points = alloc_array0(2, sizeof (*points)))); - GREATEST_ASSERT_EQ(0, points[0].x); - GREATEST_ASSERT_EQ(0, points[0].y); - GREATEST_ASSERT_EQ(0, points[1].x); - GREATEST_ASSERT_EQ(0, points[1].y); + RX_REQUIRE((points = alloc_array0(2, sizeof (*points)))); + RX_INT_REQUIRE_EQUAL(points[0].x, 0); + RX_INT_REQUIRE_EQUAL(points[0].y, 0); + RX_INT_REQUIRE_EQUAL(points[1].x, 0); + RX_INT_REQUIRE_EQUAL(points[1].y, 0); points[0].x = 10; points[0].y = 20; points[1].x = 30; points[1].y = 40; - GREATEST_ASSERT((points = alloc_rearray0(points, 2, 4, sizeof (*points)))); - GREATEST_ASSERT_EQ(10, points[0].x); - GREATEST_ASSERT_EQ(20, points[0].y); - GREATEST_ASSERT_EQ(30, points[1].x); - GREATEST_ASSERT_EQ(40, points[1].y); - GREATEST_ASSERT_EQ(0, points[2].x); - GREATEST_ASSERT_EQ(0, points[2].y); - GREATEST_ASSERT_EQ(0, points[3].x); - GREATEST_ASSERT_EQ(0, points[3].y); - - GREATEST_PASS(); + RX_REQUIRE((points = alloc_rearray0(points, 2, 4, sizeof (*points)))); + RX_INT_REQUIRE_EQUAL(points[0].x, 10); + RX_INT_REQUIRE_EQUAL(points[0].y, 20); + RX_INT_REQUIRE_EQUAL(points[1].x, 30); + RX_INT_REQUIRE_EQUAL(points[1].y, 40); + RX_INT_REQUIRE_EQUAL(points[2].x, 0); + RX_INT_REQUIRE_EQUAL(points[2].y, 0); + RX_INT_REQUIRE_EQUAL(points[3].x, 0); + RX_INT_REQUIRE_EQUAL(points[3].y, 0); } -GREATEST_SUITE(suite_basics) -{ - GREATEST_RUN_TEST(test_array_simple); -} - -GREATEST_TEST -test_pool_simple(void) +RX_TEST_CASE(test, pool_simple) { struct alloc_pool pool; struct point *p; - GREATEST_ASSERT(alloc_pool_init(&pool, sizeof (*p), NULL) == 0); - GREATEST_ASSERT_EQ(sizeof (*p), pool.elemsize); - GREATEST_ASSERT_EQ(0, pool.size); - GREATEST_ASSERT_EQ(ALLOC_POOL_INIT_DEFAULT, pool.capacity); + RX_REQUIRE(alloc_pool_init(&pool, sizeof (*p), NULL) == 0); + RX_UINT_REQUIRE_EQUAL(pool.elemsize, sizeof (*p)); + RX_UINT_REQUIRE_EQUAL(pool.size, 0); + RX_UINT_REQUIRE_EQUAL(pool.capacity, ALLOC_POOL_INIT_DEFAULT); /* Create until we reach the capacity. */ for (size_t i = 0; i < pool.capacity; ++i) { @@ -78,14 +68,14 @@ p->y = (int)i + 1; } - GREATEST_ASSERT_EQ(pool.size, pool.capacity); + RX_UINT_REQUIRE_EQUAL(pool.size, pool.capacity); /* Verify values are correct. */ for (size_t i = 0; i < pool.size; ++i) { p = ((struct point *)pool.data) + i; - GREATEST_ASSERT_EQ((int)i + 1, p->x); - GREATEST_ASSERT_EQ((int)i + 1, p->y); + RX_INT_REQUIRE_EQUAL(p->x, (int)i + 1); + RX_INT_REQUIRE_EQUAL(p->y, (int)i + 1); } /* Now it should reallocate. */ @@ -93,32 +83,18 @@ p->x = 9999; p->y = 9999; - GREATEST_ASSERT(pool.capacity > pool.size); + RX_REQUIRE(pool.capacity > pool.size); alloc_pool_finish(&pool); - GREATEST_ASSERT_EQ(NULL, pool.data); - GREATEST_ASSERT_EQ(0, pool.elemsize); - GREATEST_ASSERT_EQ(0, pool.size); - GREATEST_ASSERT_EQ(0, pool.capacity); - - GREATEST_PASS(); + RX_PTR_REQUIRE_EQUAL(pool.data, NULL); + RX_UINT_REQUIRE_EQUAL(pool.elemsize, 0U); + RX_UINT_REQUIRE_EQUAL(pool.size, 0U); + RX_UINT_REQUIRE_EQUAL(pool.capacity, 0U); } -GREATEST_SUITE(suite_pool) -{ - GREATEST_RUN_TEST(test_pool_simple); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(suite_basics); - GREATEST_RUN_SUITE(suite_pool); - GREATEST_MAIN_END(); - - return 0; + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-character.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-character.c Wed Oct 13 20:56:07 2021 +0200 @@ -19,22 +19,26 @@ #include <stdio.h> #include <string.h> -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <rpg/character.h> #include <rpg/save.h> -static void -clean(void *data) +RX_SET_UP(setup) { - (void)data; + remove("test.db"); + return RX_SUCCESS; +} + +RX_TEAR_DOWN(teardown) +{ remove("test.db"); } -GREATEST_TEST -test_save_simple(void) +RX_FIXTURE(basics_fixture, void *, .set_up = setup, .tear_down = teardown); + +RX_TEST_CASE(test, save_simple, .fixture = basics_fixture) { struct save db; struct character ch = { @@ -51,40 +55,28 @@ .luckbonus = 1004 }; - GREATEST_ASSERT(save_open_path(&db, "test.db", SAVE_MODE_WRITE) == 0); - GREATEST_ASSERT(character_save(&ch, &db) == 0); + RX_INT_REQUIRE_EQUAL(save_open_path(&db, "test.db", SAVE_MODE_WRITE), 0); + RX_INT_REQUIRE_EQUAL(character_save(&ch, &db), 0); /* Restore. */ memset(&ch, 0, sizeof (ch)); ch.name = "david"; - GREATEST_ASSERT(character_load(&ch, &db) == 0); - GREATEST_ASSERT_EQ(1989, ch.hp); - GREATEST_ASSERT_EQ(1, ch.mp); - GREATEST_ASSERT_EQ(18, ch.level); - GREATEST_ASSERT_EQ(1, ch.team_order); - GREATEST_ASSERT_EQ(500, ch.hpbonus); - GREATEST_ASSERT_EQ(50, ch.mpbonus); - GREATEST_ASSERT_EQ(1001, ch.atkbonus); - GREATEST_ASSERT_EQ(1002, ch.defbonus); - GREATEST_ASSERT_EQ(1003, ch.agtbonus); - GREATEST_ASSERT_EQ(1004, ch.luckbonus); - GREATEST_PASS(); + RX_REQUIRE(character_load(&ch, &db) == 0); + RX_INT_REQUIRE_EQUAL(ch.hp, 1989); + RX_INT_REQUIRE_EQUAL(ch.mp, 1); + RX_INT_REQUIRE_EQUAL(ch.level, 18); + RX_INT_REQUIRE_EQUAL(ch.team_order, 1); + RX_INT_REQUIRE_EQUAL(ch.hpbonus, 500); + RX_INT_REQUIRE_EQUAL(ch.mpbonus, 50); + RX_INT_REQUIRE_EQUAL(ch.atkbonus, 1001); + RX_INT_REQUIRE_EQUAL(ch.defbonus, 1002); + RX_INT_REQUIRE_EQUAL(ch.agtbonus, 1003); + RX_INT_REQUIRE_EQUAL(ch.luckbonus, 1004); } -GREATEST_SUITE(suite_save) -{ - GREATEST_SET_SETUP_CB(clean, NULL); - GREATEST_SET_TEARDOWN_CB(clean, NULL); - GREATEST_RUN_TEST(test_save_simple); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(suite_save); - GREATEST_MAIN_END(); + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-color.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-color.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,65 +16,37 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <greatest.h> +#include <rexo.h> #include <core/color.h> -TEST -red(void) +RX_TEST_CASE(basics, red) { - ASSERT_EQ(163, COLOR_R(0xa3000000)); - PASS(); + RX_INT_REQUIRE_EQUAL(COLOR_R(0xa3000000), 163); } -TEST -green(void) +RX_TEST_CASE(basics, green) { - ASSERT_EQ(19, COLOR_G(0x00130000)); - PASS(); -} - -TEST -blue(void) -{ - ASSERT_EQ(238, COLOR_B(0x0000ee00)); - PASS(); + RX_INT_REQUIRE_EQUAL(COLOR_G(0x00130000), 19); } -TEST -alpha(void) +RX_TEST_CASE(basics, blue) { - ASSERT_EQ(255, COLOR_A(0x000000ff)); - PASS(); -} - -TEST -simple(void) -{ - ASSERT_EQ(0xaabbccee, COLOR_HEX(170, 187, 204, 238)); - PASS(); + RX_INT_REQUIRE_EQUAL(COLOR_B(0x0000ee00), 238); } -SUITE(hex_to_rgb) +RX_TEST_CASE(basics, alpha) { - RUN_TEST(red); - RUN_TEST(green); - RUN_TEST(blue); - RUN_TEST(alpha); + RX_INT_REQUIRE_EQUAL(COLOR_A(0x000000ff), 255); } -SUITE(rgb_to_hex) +RX_TEST_CASE(basics, simple) { - RUN_TEST(simple); + RX_UINT_REQUIRE_EQUAL(COLOR_HEX(170, 187, 204, 238), 0xaabbccee); } -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - RUN_SUITE(hex_to_rgb); - RUN_SUITE(rgb_to_hex); - GREATEST_MAIN_END(); + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-drawable.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-drawable.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,8 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/drawable.h> #include <core/event.h> @@ -75,8 +74,7 @@ ((struct invokes *)dw->data)->finish = 1; } -GREATEST_TEST -basics_update(void) +RX_TEST_CASE(basics, update) { struct { struct invokes inv; @@ -87,95 +85,75 @@ }; /* True version. */ - GREATEST_ASSERT(drawable_update(&table[0].dw, 0)); - GREATEST_ASSERT(table[0].inv.update); - GREATEST_ASSERT(!table[0].inv.draw); - GREATEST_ASSERT(!table[0].inv.end); - GREATEST_ASSERT(!table[0].inv.finish); + RX_REQUIRE(drawable_update(&table[0].dw, 0)); + RX_REQUIRE(table[0].inv.update); + RX_REQUIRE(!table[0].inv.draw); + RX_REQUIRE(!table[0].inv.end); + RX_REQUIRE(!table[0].inv.finish); /* False version. */ - GREATEST_ASSERT(!drawable_update(&table[1].dw, 0)); - GREATEST_ASSERT(table[1].inv.update); - GREATEST_ASSERT(!table[1].inv.draw); - GREATEST_ASSERT(!table[1].inv.end); - GREATEST_ASSERT(!table[1].inv.finish); - - GREATEST_PASS(); + RX_REQUIRE(!drawable_update(&table[1].dw, 0)); + RX_REQUIRE(table[1].inv.update); + RX_REQUIRE(!table[1].inv.draw); + RX_REQUIRE(!table[1].inv.end); + RX_REQUIRE(!table[1].inv.finish); } -GREATEST_TEST -basics_draw(void) +RX_TEST_CASE(basics, draw) { struct invokes inv = {0}; struct drawable dw = INIT(&inv, my_update_true); drawable_draw(&dw); - GREATEST_ASSERT(!inv.update); - GREATEST_ASSERT(inv.draw); - GREATEST_ASSERT(!inv.end); - GREATEST_ASSERT(!inv.finish); - GREATEST_PASS(); + RX_REQUIRE(!inv.update); + RX_REQUIRE(inv.draw); + RX_REQUIRE(!inv.end); + RX_REQUIRE(!inv.finish); } -GREATEST_TEST -basics_end(void) +RX_TEST_CASE(basics, end) { struct invokes inv = {0}; struct drawable dw = INIT(&inv, my_update_true); drawable_end(&dw); - GREATEST_ASSERT(!inv.update); - GREATEST_ASSERT(!inv.draw); - GREATEST_ASSERT(inv.end); - GREATEST_ASSERT(!inv.finish); - GREATEST_PASS(); + RX_REQUIRE(!inv.update); + RX_REQUIRE(!inv.draw); + RX_REQUIRE(inv.end); + RX_REQUIRE(!inv.finish); } -GREATEST_TEST -basics_finish(void) +RX_TEST_CASE(basics, finish) { struct invokes inv = {0}; struct drawable dw = INIT(&inv, my_update_true); drawable_finish(&dw); - GREATEST_ASSERT(!inv.update); - GREATEST_ASSERT(!inv.draw); - GREATEST_ASSERT(!inv.end); - GREATEST_ASSERT(inv.finish); - GREATEST_PASS(); + RX_REQUIRE(!inv.update); + RX_REQUIRE(!inv.draw); + RX_REQUIRE(!inv.end); + RX_REQUIRE(inv.finish); } -GREATEST_SUITE(suite_basics) -{ - GREATEST_RUN_TEST(basics_update); - GREATEST_RUN_TEST(basics_draw); - GREATEST_RUN_TEST(basics_end); - GREATEST_RUN_TEST(basics_finish); -} - -GREATEST_TEST -stack_add(void) +RX_TEST_CASE(stack, add) { struct drawable_stack st = {0}; struct drawable dw = {0}; - GREATEST_ASSERT(drawable_stack_add(&st, &dw) == 0); + RX_INT_REQUIRE_EQUAL(drawable_stack_add(&st, &dw), 0); /* Now fill up. */ for (int i = 0; i < DRAWABLE_STACK_MAX - 1; ++i) - GREATEST_ASSERT(drawable_stack_add(&st, &dw) == 0); + RX_INT_REQUIRE_EQUAL(drawable_stack_add(&st, &dw), 0); /* This one should not fit in. */ - GREATEST_ASSERT(drawable_stack_add(&st, &dw) < 0); - - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(drawable_stack_add(&st, &dw), -1); } -GREATEST_TEST -stack_update(void) +RX_TEST_CASE(stack, update) { struct { struct invokes inv; @@ -200,50 +178,50 @@ drawable_stack_add(&st, &table[5].dw); drawable_stack_add(&st, &table[6].dw); - GREATEST_ASSERT(!drawable_stack_update(&st, 0)); + RX_REQUIRE(!drawable_stack_update(&st, 0)); - GREATEST_ASSERT(table[0].inv.update); - GREATEST_ASSERT(table[1].inv.update); - GREATEST_ASSERT(table[2].inv.update); - GREATEST_ASSERT(table[3].inv.update); - GREATEST_ASSERT(table[4].inv.update); - GREATEST_ASSERT(table[5].inv.update); - GREATEST_ASSERT(table[6].inv.update); + RX_REQUIRE(table[0].inv.update); + RX_REQUIRE(table[1].inv.update); + RX_REQUIRE(table[2].inv.update); + RX_REQUIRE(table[3].inv.update); + RX_REQUIRE(table[4].inv.update); + RX_REQUIRE(table[5].inv.update); + RX_REQUIRE(table[6].inv.update); - GREATEST_ASSERT(!table[0].inv.draw); - GREATEST_ASSERT(!table[1].inv.draw); - GREATEST_ASSERT(!table[2].inv.draw); - GREATEST_ASSERT(!table[3].inv.draw); - GREATEST_ASSERT(!table[4].inv.draw); - GREATEST_ASSERT(!table[5].inv.draw); - GREATEST_ASSERT(!table[6].inv.draw); + RX_REQUIRE(!table[0].inv.draw); + RX_REQUIRE(!table[1].inv.draw); + RX_REQUIRE(!table[2].inv.draw); + RX_REQUIRE(!table[3].inv.draw); + RX_REQUIRE(!table[4].inv.draw); + RX_REQUIRE(!table[5].inv.draw); + RX_REQUIRE(!table[6].inv.draw); - GREATEST_ASSERT(!table[0].inv.end); - GREATEST_ASSERT(table[1].inv.end); - GREATEST_ASSERT(!table[2].inv.end); - GREATEST_ASSERT(!table[3].inv.end); - GREATEST_ASSERT(table[4].inv.end); - GREATEST_ASSERT(table[5].inv.end); - GREATEST_ASSERT(!table[6].inv.end); + RX_REQUIRE(!table[0].inv.end); + RX_REQUIRE(table[1].inv.end); + RX_REQUIRE(!table[2].inv.end); + RX_REQUIRE(!table[3].inv.end); + RX_REQUIRE(table[4].inv.end); + RX_REQUIRE(table[5].inv.end); + RX_REQUIRE(!table[6].inv.end); - GREATEST_ASSERT(!table[0].inv.finish); - GREATEST_ASSERT(table[1].inv.finish); - GREATEST_ASSERT(!table[2].inv.finish); - GREATEST_ASSERT(!table[3].inv.finish); - GREATEST_ASSERT(table[4].inv.finish); - GREATEST_ASSERT(table[5].inv.finish); - GREATEST_ASSERT(!table[6].inv.finish); + RX_REQUIRE(!table[0].inv.finish); + RX_REQUIRE(table[1].inv.finish); + RX_REQUIRE(!table[2].inv.finish); + RX_REQUIRE(!table[3].inv.finish); + RX_REQUIRE(table[4].inv.finish); + RX_REQUIRE(table[5].inv.finish); + RX_REQUIRE(!table[6].inv.finish); /* The following must still be there. */ - GREATEST_ASSERT_EQ(st.objects[0], &table[0].dw); - GREATEST_ASSERT_EQ(st.objects[2], &table[2].dw); - GREATEST_ASSERT_EQ(st.objects[3], &table[3].dw); - GREATEST_ASSERT_EQ(st.objects[6], &table[6].dw); + RX_PTR_REQUIRE_EQUAL(st.objects[0], &table[0].dw); + RX_PTR_REQUIRE_EQUAL(st.objects[2], &table[2].dw); + RX_PTR_REQUIRE_EQUAL(st.objects[3], &table[3].dw); + RX_PTR_REQUIRE_EQUAL(st.objects[6], &table[6].dw); /* The following must have been NULL-ed. */ - GREATEST_ASSERT_EQ(st.objects[1], NULL); - GREATEST_ASSERT_EQ(st.objects[4], NULL); - GREATEST_ASSERT_EQ(st.objects[5], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[1], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[4], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[5], NULL); /* * Now make all actions to return 1 and check if it cleans the stack. @@ -253,20 +231,17 @@ table[3].dw.update = table[6].dw.update = my_update_true; - GREATEST_ASSERT(drawable_stack_update(&st, 0)); - GREATEST_ASSERT_EQ(st.objects[0], NULL); - GREATEST_ASSERT_EQ(st.objects[1], NULL); - GREATEST_ASSERT_EQ(st.objects[2], NULL); - GREATEST_ASSERT_EQ(st.objects[3], NULL); - GREATEST_ASSERT_EQ(st.objects[4], NULL); - GREATEST_ASSERT_EQ(st.objects[5], NULL); - GREATEST_ASSERT_EQ(st.objects[6], NULL); - - GREATEST_PASS(); + RX_REQUIRE(drawable_stack_update(&st, 0)); + RX_PTR_REQUIRE_EQUAL(st.objects[0], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[1], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[2], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[3], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[4], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[5], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[6], NULL); } -GREATEST_TEST -stack_finish(void) +RX_TEST_CASE(stack, finish) { struct { struct invokes inv; @@ -281,39 +256,23 @@ drawable_stack_add(&st, &table[1].dw); drawable_stack_finish(&st); - GREATEST_ASSERT(!table[0].inv.update); - GREATEST_ASSERT(!table[0].inv.draw); - GREATEST_ASSERT(table[0].inv.end); - GREATEST_ASSERT(table[0].inv.finish); + RX_REQUIRE(!table[0].inv.update); + RX_REQUIRE(!table[0].inv.draw); + RX_REQUIRE(table[0].inv.end); + RX_REQUIRE(table[0].inv.finish); - GREATEST_ASSERT(!table[0].inv.update); - GREATEST_ASSERT(!table[0].inv.draw); - GREATEST_ASSERT(table[0].inv.end); - GREATEST_ASSERT(table[0].inv.finish); + RX_REQUIRE(!table[0].inv.update); + RX_REQUIRE(!table[0].inv.draw); + RX_REQUIRE(table[0].inv.end); + RX_REQUIRE(table[0].inv.finish); /* They should also be NULL'ed. */ - GREATEST_ASSERT_EQ(st.objects[0], NULL); - GREATEST_ASSERT_EQ(st.objects[1], NULL); - - GREATEST_PASS(); + RX_PTR_REQUIRE_EQUAL(st.objects[0], NULL); + RX_PTR_REQUIRE_EQUAL(st.objects[1], NULL); } -GREATEST_SUITE(suite_stack) -{ - GREATEST_RUN_TEST(stack_add); - GREATEST_RUN_TEST(stack_update); - GREATEST_RUN_TEST(stack_finish); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(suite_basics); - GREATEST_RUN_SUITE(suite_stack); - GREATEST_MAIN_END(); - - return 0; + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-error.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-error.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,29 +16,18 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <greatest.h> +#include <rexo.h> #include <core/error.h> -TEST -simple(void) +RX_TEST_CASE(basics, simple) { errorf("Failed: %d", 123); - ASSERT_STR_EQ("Failed: 123", error()); - PASS(); + RX_STR_REQUIRE_EQUAL("Failed: 123", error()); } -SUITE(errors) -{ - RUN_TEST(simple); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - RUN_SUITE(errors); - GREATEST_MAIN_END(); + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-map.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-map.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,8 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/core.h> #include <core/error.h> @@ -28,143 +27,111 @@ #include <rpg/map-file.h> #include <rpg/map.h> -GREATEST_TEST -test_basics_sample(void) +RX_TEST_CASE(test, basics_sample) { struct map_file loader = {0}; struct map map = {0}; - GREATEST_ASSERT(map_file_open(&loader, &map, DIRECTORY "sample-map.map")); - GREATEST_ASSERT_STR_EQ("This is a test map", map.title); - GREATEST_ASSERT_EQ(4, map.columns); - GREATEST_ASSERT_EQ(2, map.rows); + RX_INT_REQUIRE_EQUAL(map_file_open(&loader, &map, DIRECTORY "/maps/sample-map.map"), 0); + RX_STR_REQUIRE_EQUAL(map.title, "This is a test map"); + RX_UINT_REQUIRE_EQUAL(map.columns, 4U); + RX_UINT_REQUIRE_EQUAL(map.rows, 2U); - GREATEST_ASSERT_EQ(0, map.layers[0].tiles[0]); - GREATEST_ASSERT_EQ(1, map.layers[0].tiles[1]); - GREATEST_ASSERT_EQ(2, map.layers[0].tiles[2]); - GREATEST_ASSERT_EQ(3, map.layers[0].tiles[3]); - GREATEST_ASSERT_EQ(4, map.layers[0].tiles[4]); - GREATEST_ASSERT_EQ(5, map.layers[0].tiles[5]); - GREATEST_ASSERT_EQ(6, map.layers[0].tiles[6]); - GREATEST_ASSERT_EQ(7, map.layers[0].tiles[7]); + RX_UINT_REQUIRE_EQUAL(map.layers[0].tiles[0], 0U); + RX_UINT_REQUIRE_EQUAL(map.layers[0].tiles[1], 1U); + RX_UINT_REQUIRE_EQUAL(map.layers[0].tiles[2], 2U); + RX_UINT_REQUIRE_EQUAL(map.layers[0].tiles[3], 3U); + RX_UINT_REQUIRE_EQUAL(map.layers[0].tiles[4], 4U); + RX_UINT_REQUIRE_EQUAL(map.layers[0].tiles[5], 5U); + RX_UINT_REQUIRE_EQUAL(map.layers[0].tiles[6], 6U); + RX_UINT_REQUIRE_EQUAL(map.layers[0].tiles[7], 7U); - GREATEST_ASSERT_EQ(8, map.layers[1].tiles[0]); - GREATEST_ASSERT_EQ(9, map.layers[1].tiles[1]); - GREATEST_ASSERT_EQ(10, map.layers[1].tiles[2]); - GREATEST_ASSERT_EQ(11, map.layers[1].tiles[3]); - GREATEST_ASSERT_EQ(12, map.layers[1].tiles[4]); - GREATEST_ASSERT_EQ(13, map.layers[1].tiles[5]); - GREATEST_ASSERT_EQ(14, map.layers[1].tiles[6]); - GREATEST_ASSERT_EQ(15, map.layers[1].tiles[7]); + RX_UINT_REQUIRE_EQUAL(map.layers[1].tiles[0], 8U); + RX_UINT_REQUIRE_EQUAL(map.layers[1].tiles[1], 9U); + RX_UINT_REQUIRE_EQUAL(map.layers[1].tiles[2], 10U); + RX_UINT_REQUIRE_EQUAL(map.layers[1].tiles[3], 11U); + RX_UINT_REQUIRE_EQUAL(map.layers[1].tiles[4], 12U); + RX_UINT_REQUIRE_EQUAL(map.layers[1].tiles[5], 13U); + RX_UINT_REQUIRE_EQUAL(map.layers[1].tiles[6], 14U); + RX_UINT_REQUIRE_EQUAL(map.layers[1].tiles[7], 15U); - GREATEST_ASSERT_EQ(64U, map.tileset->sprite->cellw); - GREATEST_ASSERT_EQ(32U, map.tileset->sprite->cellh); + RX_UINT_REQUIRE_EQUAL(map.tileset->sprite->cellw, 64U); + RX_UINT_REQUIRE_EQUAL(map.tileset->sprite->cellh, 32U); - GREATEST_ASSERT_EQ(4, map.tileset->tiledefsz); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefsz, 4); - GREATEST_ASSERT_EQ(129, map.tileset->tiledefs[0].id); - GREATEST_ASSERT_EQ(8, map.tileset->tiledefs[0].x); - GREATEST_ASSERT_EQ(0, map.tileset->tiledefs[0].y); - GREATEST_ASSERT_EQ(56, map.tileset->tiledefs[0].w); - GREATEST_ASSERT_EQ(40, map.tileset->tiledefs[0].h); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[0].id, 129U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[0].x, 8U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[0].y, 0U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[0].w, 56U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[0].h, 40U); - GREATEST_ASSERT_EQ(130, map.tileset->tiledefs[1].id); - GREATEST_ASSERT_EQ(0, map.tileset->tiledefs[1].x); - GREATEST_ASSERT_EQ(0, map.tileset->tiledefs[1].y); - GREATEST_ASSERT_EQ(62, map.tileset->tiledefs[1].w); - GREATEST_ASSERT_EQ(40, map.tileset->tiledefs[1].h); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[1].id, 130); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[1].x, 0); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[1].y, 0); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[1].w, 62); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[1].h, 40); - GREATEST_ASSERT_EQ(132, map.tileset->tiledefs[2].id); - GREATEST_ASSERT_EQ(0, map.tileset->tiledefs[2].x); - GREATEST_ASSERT_EQ(0, map.tileset->tiledefs[2].y); - GREATEST_ASSERT_EQ(64, map.tileset->tiledefs[2].w); - GREATEST_ASSERT_EQ(40, map.tileset->tiledefs[2].h); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[2].id, 132U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[2].x, 0U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[2].y, 0U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[2].w, 64U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[2].h, 40U); - GREATEST_ASSERT_EQ(133, map.tileset->tiledefs[3].id); - GREATEST_ASSERT_EQ(0, map.tileset->tiledefs[3].x); - GREATEST_ASSERT_EQ(0, map.tileset->tiledefs[3].y); - GREATEST_ASSERT_EQ(58, map.tileset->tiledefs[3].w); - GREATEST_ASSERT_EQ(40, map.tileset->tiledefs[3].h); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[3].id, 133U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[3].x, 0U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[3].y, 0U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[3].w, 58U); + RX_UINT_REQUIRE_EQUAL(map.tileset->tiledefs[3].h, 40U); map_finish(&map); map_file_finish(&loader); - - GREATEST_PASS(); } -GREATEST_TEST -test_error_title(void) +RX_TEST_CASE(test, error_title) { struct map_file loader = {0}; struct map map = {0}; - GREATEST_ASSERT(!map_file_open(&loader, &map, DIRECTORY "error-title.map")); + RX_INT_REQUIRE_EQUAL(map_file_open(&loader, &map, DIRECTORY "error-title.map"), -1); map_finish(&map); map_file_finish(&loader); - - GREATEST_PASS(); } -GREATEST_TEST -test_error_columns(void) -{ - struct map_file loader = {0}; - struct map map = {0}; - - GREATEST_ASSERT(!map_file_open(&loader, &map, DIRECTORY "error-columns.map")); - - map_finish(&map); - map_file_finish(&loader); - - GREATEST_PASS(); -} - -GREATEST_TEST -test_error_rows(void) +RX_TEST_CASE(test, error_columns) { struct map_file loader = {0}; struct map map = {0}; - GREATEST_ASSERT(!map_file_open(&loader, &map, DIRECTORY "error-rows.map")); + RX_INT_REQUIRE_EQUAL(map_file_open(&loader, &map, DIRECTORY "error-columns.map"), -1); map_finish(&map); map_file_finish(&loader); - - GREATEST_PASS(); -} - -GREATEST_SUITE(suite_basics) -{ - GREATEST_RUN_TEST(test_basics_sample); } -GREATEST_SUITE(suite_errors) +RX_TEST_CASE(test, error_rows) { - GREATEST_RUN_TEST(test_error_title); - GREATEST_RUN_TEST(test_error_columns); - GREATEST_RUN_TEST(test_error_rows); + struct map_file loader = {0}; + struct map map = {0}; + + RX_INT_REQUIRE_EQUAL(map_file_open(&loader, &map, DIRECTORY "error-rows.map"), -1); + + map_finish(&map); + map_file_finish(&loader); } -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - /* * This test opens graphical images and therefore need to initialize a * window and all of the API. As tests sometime run on headless machine * we will skip if it fails to initialize. */ - if (core_init("fr.malikania", "test") == 0 && window_open("test-map", 100, 100)) { - GREATEST_RUN_SUITE(suite_basics); - GREATEST_RUN_SUITE(suite_errors); - } + if (core_init("fr.malikania", "test") < 0 || window_open("test-map", 100, 100) < 0) + return 1; - GREATEST_MAIN_END(); - - return 0; + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-save-quest.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-save-quest.c Wed Oct 13 20:56:07 2021 +0200 @@ -18,36 +18,30 @@ #include <stdio.h> -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/util.h> #include <rpg/quest.h> #include <rpg/save.h> -static struct save db; +RX_SET_UP(setup) +{ + if (save_open_path(RX_DATA, "quest.db", SAVE_MODE_WRITE) < 0) + return RX_ERROR; -static void -clean(void *data) + return RX_SUCCESS; +} + +RX_TEAR_DOWN(teardown) { - (void)data; - - save_finish(&db); + save_finish(RX_DATA); remove("quest.db"); } -static void -setup(void *data) -{ - (void)data; +RX_FIXTURE(basics_fixture, struct save, .set_up = setup, .tear_down = teardown); - if (save_open_path(&db, "quest.db", SAVE_MODE_WRITE) < 0) - exit(1); -} - -GREATEST_TEST -basics_load(void) +RX_TEST_CASE(basics, load, .fixture = basics_fixture) { struct quest_step steps[] = { { @@ -67,31 +61,19 @@ .steps = steps, .stepsz = UTIL_SIZE(steps) }; + struct save *save = RX_DATA; - GREATEST_ASSERT_EQ(quest_save(&quest, &db), 0); + RX_INT_REQUIRE_EQUAL(quest_save(&quest, save), 0); /* Reset to inspect. */ steps[0].percent = steps[1].percent = 0; - GREATEST_ASSERT_EQ(quest_load(&quest, &db), 0); - GREATEST_ASSERT_EQ(steps[0].percent, 100); - GREATEST_ASSERT_EQ(steps[1].percent, 50); - - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(quest_load(&quest, save), 0); + RX_INT_REQUIRE_EQUAL(steps[0].percent, 100); + RX_INT_REQUIRE_EQUAL(steps[1].percent, 50); } -GREATEST_SUITE(suite_basics) -{ - GREATEST_SET_SETUP_CB(setup, NULL); - GREATEST_SET_TEARDOWN_CB(clean, NULL); - GREATEST_RUN_TEST(basics_load); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(suite_basics); - GREATEST_MAIN_END(); + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-save.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-save.c Wed Oct 13 20:56:07 2021 +0200 @@ -18,94 +18,78 @@ #include <stdio.h> -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <rpg/property.h> #include <rpg/save.h> -static void -clean(void *data) +RX_TEAR_DOWN(teardown) { - (void)data; - remove("1.db"); remove("2.db"); } -GREATEST_TEST -open_read(void) +RX_FIXTURE(basics_fixture, void *, .tear_down = teardown); + +RX_TEST_CASE(open, read, .fixture = basics_fixture) { struct save db; - /* Non-existent should return false. */ - GREATEST_ASSERT(save_open_path(&db, "1.db", SAVE_MODE_READ) < 0); - + /* Non-existent should return error. */ + RX_INT_REQUIRE_EQUAL(save_open_path(&db, "1.db", SAVE_MODE_READ), -1); save_finish(&db); - - GREATEST_PASS(); } -GREATEST_TEST -open_write(void) +RX_TEST_CASE(open, write, .fixture = basics_fixture) { struct save db[2] = {0}; /* Write should work on both non-existent and existent database. */ - GREATEST_ASSERT(save_open_path(&db[0], "1.db", SAVE_MODE_WRITE) == 0); - GREATEST_ASSERT(save_open_path(&db[1], "2.db", SAVE_MODE_WRITE) == 0); + RX_INT_REQUIRE_EQUAL(save_open_path(&db[0], "1.db", SAVE_MODE_WRITE), 0); + RX_INT_REQUIRE_EQUAL(save_open_path(&db[1], "2.db", SAVE_MODE_WRITE), 0); /* Update and create date must not be 0. */ - GREATEST_ASSERT(db[0].created > 0); - GREATEST_ASSERT(db[0].updated > 0); - GREATEST_ASSERT(db[1].created > 0); - GREATEST_ASSERT(db[1].updated > 0); + RX_REQUIRE(db[0].created > 0); + RX_REQUIRE(db[0].updated > 0); + RX_REQUIRE(db[1].created > 0); + RX_REQUIRE(db[1].updated > 0); save_finish(&db[0]); save_finish(&db[1]); /* Should work again. */ - GREATEST_ASSERT(save_open_path(&db[0], "1.db", SAVE_MODE_WRITE) == 0); - GREATEST_ASSERT(save_open_path(&db[1], "2.db", SAVE_MODE_WRITE) == 0); - GREATEST_ASSERT(db[0].created > 0); - GREATEST_ASSERT(db[0].updated > 0); - GREATEST_ASSERT(db[1].created > 0); - GREATEST_ASSERT(db[1].updated > 0); + RX_REQUIRE(save_open_path(&db[0], "1.db", SAVE_MODE_WRITE) == 0); + RX_REQUIRE(save_open_path(&db[1], "2.db", SAVE_MODE_WRITE) == 0); + RX_REQUIRE(db[0].created > 0); + RX_REQUIRE(db[0].updated > 0); + RX_REQUIRE(db[1].created > 0); + RX_REQUIRE(db[1].updated > 0); save_finish(&db[0]); save_finish(&db[1]); - - GREATEST_PASS(); } -GREATEST_SUITE(open_suite) -{ - GREATEST_SET_SETUP_CB(clean, NULL); - GREATEST_SET_TEARDOWN_CB(clean, NULL); - GREATEST_RUN_TEST(open_read); - GREATEST_RUN_TEST(open_write); -} +#if 0 -GREATEST_TEST -properties_set(void) +RX_TEST_CASE(properties, set) { struct save db; struct property prop; - GREATEST_ASSERT(save_open_path(&db, "1.db", SAVE_MODE_WRITE) == 0); + RX_REQUIRE(save_open_path(&db, "1.db", SAVE_MODE_WRITE) == 0); /* Insert a new property 'state'. */ prop = (struct property){.key = "state", .value = "intro"}; - GREATEST_ASSERT(property_save(&prop, &db) == 0); + RX_REQUIRE(property_save(&prop, &db) == 0); prop = (struct property){.key = "state"}; - GREATEST_ASSERT(property_load(&prop, &db) == 0); + RX_REQUIRE(property_load(&prop, &db) == 0); GREATEST_ASSERT_STR_EQ(prop.value, "intro"); /* Now we replace the value. */ prop = (struct property){.key = "state", .value = "map"}; - GREATEST_ASSERT(property_save(&prop, &db) == 0); + RX_REQUIRE(property_save(&prop, &db) == 0); prop = (struct property){.key = "state"}; - GREATEST_ASSERT(property_load(&prop, &db) == 0); + RX_REQUIRE(property_load(&prop, &db) == 0); GREATEST_ASSERT_STR_EQ(prop.value, "map"); save_finish(&db); @@ -119,8 +103,8 @@ struct save db; struct property prop = {.key = "state"}; - GREATEST_ASSERT(save_open_path(&db, "1.db", SAVE_MODE_WRITE) == 0); - GREATEST_ASSERT(property_load(&prop, &db) < 0); + RX_REQUIRE(save_open_path(&db, "1.db", SAVE_MODE_WRITE) == 0); + RX_REQUIRE(property_load(&prop, &db) < 0); GREATEST_ASSERT_STR_EQ(prop.value, ""); GREATEST_PASS(); @@ -132,36 +116,24 @@ struct save db; struct property prop; - GREATEST_ASSERT(save_open_path(&db, "1.db", SAVE_MODE_WRITE) == 0); + RX_REQUIRE(save_open_path(&db, "1.db", SAVE_MODE_WRITE) == 0); /* Insert a new property 'initialized'. */ prop = (struct property){.key = "state", .value = "intro"}; - GREATEST_ASSERT(property_save(&prop, &db) == 0); + RX_REQUIRE(property_save(&prop, &db) == 0); prop = (struct property){.key = "state"}; - GREATEST_ASSERT(property_remove(&prop, &db) == 0); + RX_REQUIRE(property_remove(&prop, &db) == 0); prop = (struct property){.key = "state"}; - GREATEST_ASSERT(property_load(&prop, &db) < 0); - GREATEST_ASSERT_STR_EQ(prop.value, ""); + RX_REQUIRE(property_load(&prop, &db) < 0); + RX_STR_REQUIRE_EQUAL(prop.value, ""); GREATEST_PASS(); } -GREATEST_SUITE(properties_suite) -{ - GREATEST_SET_SETUP_CB(clean, NULL); - GREATEST_SET_TEARDOWN_CB(clean, NULL); - GREATEST_RUN_TEST(properties_set); - GREATEST_RUN_TEST(properties_notfound); - GREATEST_RUN_TEST(properties_remove); -} - -GREATEST_MAIN_DEFS(); +#endif int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(open_suite); - GREATEST_RUN_SUITE(properties_suite); - GREATEST_MAIN_END(); + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-state.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-state.c Wed Oct 13 20:56:07 2021 +0200 @@ -18,8 +18,7 @@ #include <string.h> -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/event.h> #include <core/game.h> @@ -36,20 +35,14 @@ unsigned int finish; }; -static void -zero(struct invokes *inv) +RX_SET_UP(setup) { - memset(inv, 0, sizeof (*inv)); + game_init(); + + return RX_SUCCESS; } -static void -setup(void *data) -{ - game_init(); -} - -static void -cleanup(void *data) +RX_TEAR_DOWN(teardown) { game_quit(); } @@ -118,120 +111,93 @@ .finish = my_finish \ } -GREATEST_TEST -basics_start(void) +RX_FIXTURE(basics_fixture, void *, .set_up = setup, .tear_down = teardown); + +RX_TEST_CASE(basics, start) { struct invokes inv = {0}; struct state state = INIT(&inv); state_start(&state); - GREATEST_ASSERT_EQ(inv.start, 1); - GREATEST_ASSERT_EQ(inv.handle, 0); - GREATEST_ASSERT_EQ(inv.update, 0); - GREATEST_ASSERT_EQ(inv.draw, 0); - GREATEST_ASSERT_EQ(inv.end, 0); - GREATEST_ASSERT_EQ(inv.finish, 0); - - GREATEST_PASS(); + RX_UINT_REQUIRE_EQUAL(inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(inv.update, 0U); + RX_UINT_REQUIRE_EQUAL(inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(inv.finish, 0U); } -GREATEST_TEST -basics_handle(void) +RX_TEST_CASE(basics, handle) { struct invokes inv = {0}; struct state state = INIT(&inv); - state_handle(&state, &(union event){0}); - GREATEST_ASSERT_EQ(inv.start, 0); - GREATEST_ASSERT_EQ(inv.handle, 1); - GREATEST_ASSERT_EQ(inv.update, 0); - GREATEST_ASSERT_EQ(inv.draw, 0); - GREATEST_ASSERT_EQ(inv.end, 0); - GREATEST_ASSERT_EQ(inv.finish, 0); - - GREATEST_PASS(); + state_handle(&state, &(const union event){0}); + RX_UINT_REQUIRE_EQUAL(inv.start, 0U); + RX_UINT_REQUIRE_EQUAL(inv.handle, 1U); + RX_UINT_REQUIRE_EQUAL(inv.update, 0U); + RX_UINT_REQUIRE_EQUAL(inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(inv.finish, 0U); } -GREATEST_TEST -basics_update(void) +RX_TEST_CASE(basics, update) { struct invokes inv = {0}; struct state state = INIT(&inv); state_update(&state, 0); - GREATEST_ASSERT_EQ(inv.start, 0); - GREATEST_ASSERT_EQ(inv.handle, 0); - GREATEST_ASSERT_EQ(inv.update, 1); - GREATEST_ASSERT_EQ(inv.draw, 0); - GREATEST_ASSERT_EQ(inv.end, 0); - GREATEST_ASSERT_EQ(inv.finish, 0); - - GREATEST_PASS(); + RX_UINT_REQUIRE_EQUAL(inv.start, 0U); + RX_UINT_REQUIRE_EQUAL(inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(inv.update, 1U); + RX_UINT_REQUIRE_EQUAL(inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(inv.finish, 0U); } -GREATEST_TEST -basics_draw(void) +RX_TEST_CASE(basics, draw) { struct invokes inv = {0}; struct state state = INIT(&inv); state_draw(&state); - GREATEST_ASSERT_EQ(inv.start, 0); - GREATEST_ASSERT_EQ(inv.handle, 0); - GREATEST_ASSERT_EQ(inv.update, 0); - GREATEST_ASSERT_EQ(inv.draw, 1); - GREATEST_ASSERT_EQ(inv.end, 0); - GREATEST_ASSERT_EQ(inv.finish, 0); - - GREATEST_PASS(); + RX_UINT_REQUIRE_EQUAL(inv.start, 0U); + RX_UINT_REQUIRE_EQUAL(inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(inv.update, 0U); + RX_UINT_REQUIRE_EQUAL(inv.draw, 1U); + RX_UINT_REQUIRE_EQUAL(inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(inv.finish, 0U); } -GREATEST_TEST -basics_end(void) +RX_TEST_CASE(basics, end) { struct invokes inv = {0}; struct state state = INIT(&inv); state_end(&state); - GREATEST_ASSERT_EQ(inv.start, 0); - GREATEST_ASSERT_EQ(inv.handle, 0); - GREATEST_ASSERT_EQ(inv.update, 0); - GREATEST_ASSERT_EQ(inv.draw, 0); - GREATEST_ASSERT_EQ(inv.end, 1); - GREATEST_ASSERT_EQ(inv.finish, 0); - - GREATEST_PASS(); + RX_UINT_REQUIRE_EQUAL(inv.start, 0U); + RX_UINT_REQUIRE_EQUAL(inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(inv.update, 0U); + RX_UINT_REQUIRE_EQUAL(inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(inv.end, 1U); + RX_UINT_REQUIRE_EQUAL(inv.finish, 0U); } -GREATEST_TEST -basics_finish(void) +RX_TEST_CASE(basics, finish) { struct invokes inv = {0}; struct state state = INIT(&inv); state_finish(&state); - GREATEST_ASSERT_EQ(inv.start, 0); - GREATEST_ASSERT_EQ(inv.handle, 0); - GREATEST_ASSERT_EQ(inv.update, 0); - GREATEST_ASSERT_EQ(inv.draw, 0); - GREATEST_ASSERT_EQ(inv.end, 0); - GREATEST_ASSERT_EQ(inv.finish, 1); - - GREATEST_PASS(); + RX_UINT_REQUIRE_EQUAL(inv.start, 0U); + RX_UINT_REQUIRE_EQUAL(inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(inv.update, 0U); + RX_UINT_REQUIRE_EQUAL(inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(inv.finish, 1U); } -GREATEST_SUITE(suite_basics) -{ - GREATEST_RUN_TEST(basics_start); - GREATEST_RUN_TEST(basics_handle); - GREATEST_RUN_TEST(basics_update); - GREATEST_RUN_TEST(basics_draw); - GREATEST_RUN_TEST(basics_end); - GREATEST_RUN_TEST(basics_finish); -} - -GREATEST_TEST -test_game_push(void) +RX_TEST_CASE(game, game_push, .fixture = basics_fixture) { static struct { struct invokes inv; @@ -243,14 +209,14 @@ /* 0 becomes active and should start. */ game_push(&states[0].state); - GREATEST_ASSERT_EQ(states[0].inv.start, 1U); - GREATEST_ASSERT_EQ(states[0].inv.handle, 0U); - GREATEST_ASSERT_EQ(states[0].inv.update, 0U); - GREATEST_ASSERT_EQ(states[0].inv.draw, 0U); - GREATEST_ASSERT_EQ(states[0].inv.suspend, 0U); - GREATEST_ASSERT_EQ(states[0].inv.resume, 0U); - GREATEST_ASSERT_EQ(states[0].inv.end, 0U); - GREATEST_ASSERT_EQ(states[0].inv.finish, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.update, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.suspend, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.resume, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.finish, 0U); /* Put some event, update and drawing. */ game_handle(&(union event) { .type = EVENT_QUIT }); @@ -259,117 +225,103 @@ game_draw(); game_draw(); game_draw(); - GREATEST_ASSERT_EQ(states[0].inv.start, 1U); - GREATEST_ASSERT_EQ(states[0].inv.handle, 1U); - GREATEST_ASSERT_EQ(states[0].inv.update, 2U); - GREATEST_ASSERT_EQ(states[0].inv.draw, 3U); - GREATEST_ASSERT_EQ(states[0].inv.suspend, 0U); - GREATEST_ASSERT_EQ(states[0].inv.resume, 0U); - GREATEST_ASSERT_EQ(states[0].inv.end, 0U); - GREATEST_ASSERT_EQ(states[0].inv.finish, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.handle, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.update, 2U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.draw, 3U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.suspend, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.resume, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.finish, 0U); /* Switch to state 1, 0 must be suspended. */ game_push(&states[1].state); - GREATEST_ASSERT_EQ(states[0].inv.start, 1U); - GREATEST_ASSERT_EQ(states[0].inv.handle, 1U); - GREATEST_ASSERT_EQ(states[0].inv.update, 2U); - GREATEST_ASSERT_EQ(states[0].inv.draw, 3U); - GREATEST_ASSERT_EQ(states[0].inv.suspend, 1U); - GREATEST_ASSERT_EQ(states[0].inv.resume, 0U); - GREATEST_ASSERT_EQ(states[0].inv.end, 0U); - GREATEST_ASSERT_EQ(states[0].inv.finish, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.handle, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.update, 2U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.draw, 3U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.suspend, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.resume, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.finish, 0U); - GREATEST_ASSERT_EQ(states[1].inv.start, 1U); - GREATEST_ASSERT_EQ(states[1].inv.handle, 0U); - GREATEST_ASSERT_EQ(states[1].inv.update, 0U); - GREATEST_ASSERT_EQ(states[1].inv.draw, 0U); - GREATEST_ASSERT_EQ(states[1].inv.suspend, 0U); - GREATEST_ASSERT_EQ(states[1].inv.resume, 0U); - GREATEST_ASSERT_EQ(states[1].inv.end, 0U); - GREATEST_ASSERT_EQ(states[1].inv.finish, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.update, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.suspend, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.resume, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.finish, 0U); /* Update a little this state. */ game_update(10); game_update(10); game_update(10); game_update(10); - GREATEST_ASSERT_EQ(states[0].inv.start, 1U); - GREATEST_ASSERT_EQ(states[0].inv.handle, 1U); - GREATEST_ASSERT_EQ(states[0].inv.update, 2U); - GREATEST_ASSERT_EQ(states[0].inv.draw, 3U); - GREATEST_ASSERT_EQ(states[0].inv.suspend, 1U); - GREATEST_ASSERT_EQ(states[0].inv.resume, 0U); - GREATEST_ASSERT_EQ(states[0].inv.end, 0U); - GREATEST_ASSERT_EQ(states[0].inv.finish, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.handle, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.update, 2U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.draw, 3U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.suspend, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.resume, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.finish, 0U); - GREATEST_ASSERT_EQ(states[1].inv.start, 1U); - GREATEST_ASSERT_EQ(states[1].inv.handle, 0U); - GREATEST_ASSERT_EQ(states[1].inv.update, 4U); - GREATEST_ASSERT_EQ(states[1].inv.draw, 0U); - GREATEST_ASSERT_EQ(states[1].inv.suspend, 0U); - GREATEST_ASSERT_EQ(states[1].inv.resume, 0U); - GREATEST_ASSERT_EQ(states[1].inv.end, 0U); - GREATEST_ASSERT_EQ(states[1].inv.finish, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.update, 4U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.suspend, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.resume, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.finish, 0U); /* Pop it, it should be finalized through end and finish. */ game_pop(); - GREATEST_ASSERT_EQ(states[0].inv.start, 1U); - GREATEST_ASSERT_EQ(states[0].inv.handle, 1U); - GREATEST_ASSERT_EQ(states[0].inv.update, 2U); - GREATEST_ASSERT_EQ(states[0].inv.draw, 3U); - GREATEST_ASSERT_EQ(states[0].inv.suspend, 1U); - GREATEST_ASSERT_EQ(states[0].inv.resume, 1U); - GREATEST_ASSERT_EQ(states[0].inv.end, 0U); - GREATEST_ASSERT_EQ(states[0].inv.finish, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.handle, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.update, 2U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.draw, 3U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.suspend, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.resume, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.end, 0U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.finish, 0U); - GREATEST_ASSERT_EQ(states[1].inv.start, 1U); - GREATEST_ASSERT_EQ(states[1].inv.handle, 0U); - GREATEST_ASSERT_EQ(states[1].inv.update, 4U); - GREATEST_ASSERT_EQ(states[1].inv.draw, 0U); - GREATEST_ASSERT_EQ(states[1].inv.suspend, 0U); - GREATEST_ASSERT_EQ(states[1].inv.resume, 0U); - GREATEST_ASSERT_EQ(states[1].inv.end, 1U); - GREATEST_ASSERT_EQ(states[1].inv.finish, 1U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.update, 4U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.suspend, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.resume, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.end, 1U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.finish, 1U); /* Pop this state as well. */ game_pop(); - GREATEST_ASSERT_EQ(states[0].inv.start, 1U); - GREATEST_ASSERT_EQ(states[0].inv.handle, 1U); - GREATEST_ASSERT_EQ(states[0].inv.update, 2U); - GREATEST_ASSERT_EQ(states[0].inv.draw, 3U); - GREATEST_ASSERT_EQ(states[0].inv.suspend, 1U); - GREATEST_ASSERT_EQ(states[0].inv.resume, 1U); - GREATEST_ASSERT_EQ(states[0].inv.end, 1U); - GREATEST_ASSERT_EQ(states[0].inv.finish, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.handle, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.update, 2U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.draw, 3U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.suspend, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.resume, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.end, 1U); + RX_UINT_REQUIRE_EQUAL(states[0].inv.finish, 1U); - GREATEST_ASSERT_EQ(states[1].inv.start, 1U); - GREATEST_ASSERT_EQ(states[1].inv.handle, 0U); - GREATEST_ASSERT_EQ(states[1].inv.update, 4U); - GREATEST_ASSERT_EQ(states[1].inv.draw, 0U); - GREATEST_ASSERT_EQ(states[1].inv.suspend, 0U); - GREATEST_ASSERT_EQ(states[1].inv.resume, 0U); - GREATEST_ASSERT_EQ(states[1].inv.end, 1U); - GREATEST_ASSERT_EQ(states[1].inv.finish, 1U); - - GREATEST_PASS(); + RX_UINT_REQUIRE_EQUAL(states[1].inv.start, 1U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.handle, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.update, 4U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.draw, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.suspend, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.resume, 0U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.end, 1U); + RX_UINT_REQUIRE_EQUAL(states[1].inv.finish, 1U); } -GREATEST_SUITE(suite_game) -{ - GREATEST_SET_SETUP_CB(setup, NULL); - GREATEST_SET_TEARDOWN_CB(cleanup, NULL); - GREATEST_RUN_TEST(test_game_push); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(suite_basics); - GREATEST_RUN_SUITE(suite_game); - GREATEST_MAIN_END(); + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-tileset.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-tileset.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,8 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/core.h> #include <core/window.h> @@ -25,102 +24,73 @@ #include <rpg/tileset-file.h> #include <rpg/tileset.h> -GREATEST_TEST -test_basics_sample(void) +RX_TEST_CASE(test, basics_sample) { struct tileset_file loader = {0}; struct tileset tileset; - GREATEST_ASSERT(tileset_file_open(&loader, &tileset, DIRECTORY "sample-tileset.tileset") == 0); - GREATEST_ASSERT_EQ(64U, tileset.sprite->cellw); - GREATEST_ASSERT_EQ(32U, tileset.sprite->cellh); + RX_REQUIRE(tileset_file_open(&loader, &tileset, DIRECTORY "sample-tileset.tileset") == 0); + RX_UINT_REQUIRE_EQUAL(tileset.sprite->cellw, 64U); + RX_UINT_REQUIRE_EQUAL(tileset.sprite->cellh, 32U); - GREATEST_ASSERT_EQ(4, tileset.tiledefsz); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefsz, 4U); - GREATEST_ASSERT_EQ(129, tileset.tiledefs[0].id); - GREATEST_ASSERT_EQ(8, tileset.tiledefs[0].x); - GREATEST_ASSERT_EQ(0, tileset.tiledefs[0].y); - GREATEST_ASSERT_EQ(56, tileset.tiledefs[0].w); - GREATEST_ASSERT_EQ(40, tileset.tiledefs[0].h); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].id, 129); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].x, 8); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].y, 0); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].w, 56); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].h, 40); - GREATEST_ASSERT_EQ(130, tileset.tiledefs[1].id); - GREATEST_ASSERT_EQ(0, tileset.tiledefs[1].x); - GREATEST_ASSERT_EQ(0, tileset.tiledefs[1].y); - GREATEST_ASSERT_EQ(62, tileset.tiledefs[1].w); - GREATEST_ASSERT_EQ(40, tileset.tiledefs[1].h); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].id, 130); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].x, 0); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].y, 0); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].w, 62); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].h, 40); - GREATEST_ASSERT_EQ(132, tileset.tiledefs[2].id); - GREATEST_ASSERT_EQ(0, tileset.tiledefs[2].x); - GREATEST_ASSERT_EQ(0, tileset.tiledefs[2].y); - GREATEST_ASSERT_EQ(64, tileset.tiledefs[2].w); - GREATEST_ASSERT_EQ(40, tileset.tiledefs[2].h); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].id, 132); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].x, 0); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].y, 0); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].w, 64); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].h, 40); - GREATEST_ASSERT_EQ(133, tileset.tiledefs[3].id); - GREATEST_ASSERT_EQ(0, tileset.tiledefs[3].x); - GREATEST_ASSERT_EQ(0, tileset.tiledefs[3].y); - GREATEST_ASSERT_EQ(58, tileset.tiledefs[3].w); - GREATEST_ASSERT_EQ(40, tileset.tiledefs[3].h); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].id, 133); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].x, 0); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].y, 0); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].w, 58); + RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].h, 40); tileset_file_finish(&loader); - - GREATEST_PASS(); } -GREATEST_SUITE(suite_basics) -{ - GREATEST_RUN_TEST(test_basics_sample); -} - -GREATEST_TEST -test_error_tilewidth(void) +RX_TEST_CASE(test, error_tilewidth) { struct tileset_file loader = {0}; struct tileset tileset = {0}; - GREATEST_ASSERT(tileset_file_open(&loader, &tileset, DIRECTORY "error-tilewidth.tileset") < 0); - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(tileset_file_open(&loader, &tileset, DIRECTORY "error-tilewidth.tileset"), -1); } -GREATEST_TEST -test_error_tileheight(void) -{ - struct tileset_file loader = {0}; - struct tileset tileset = {0}; - - GREATEST_ASSERT(tileset_file_open(&loader, &tileset, DIRECTORY "error-tileheight.tileset") < 0); - GREATEST_PASS(); -} - -GREATEST_TEST -test_error_image(void) +RX_TEST_CASE(test, error_tileheight) { struct tileset_file loader = {0}; struct tileset tileset = {0}; - GREATEST_ASSERT(tileset_file_open(&loader, &tileset, DIRECTORY "error-image.tileset") < 0); - GREATEST_PASS(); + RX_INT_REQUIRE_EQUAL(tileset_file_open(&loader, &tileset, DIRECTORY "error-tileheight.tileset"), -1); } -GREATEST_SUITE(suite_errors) +RX_TEST_CASE(test, error_image) { - GREATEST_RUN_TEST(test_error_tilewidth); - GREATEST_RUN_TEST(test_error_tileheight); - GREATEST_RUN_TEST(test_error_image); + struct tileset_file loader = {0}; + struct tileset tileset = {0}; + + RX_INT_REQUIRE_EQUAL(tileset_file_open(&loader, &tileset, DIRECTORY "error-image.tileset"), -1); } -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); + if (core_init("fr.malikania", "test") < 0 && window_open("test-tileset", 100, 100) < 0) + return 1; - if (core_init("fr.malikania", "test") == 0 && window_open("test-tileset", 100, 100)) { - GREATEST_RUN_SUITE(suite_basics); - GREATEST_RUN_SUITE(suite_errors); - } - - GREATEST_MAIN_END(); - - return 0; + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }
--- a/tests/test-util.c Wed Oct 13 15:58:02 2021 +0200 +++ b/tests/test-util.c Wed Oct 13 20:56:07 2021 +0200 @@ -16,48 +16,31 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <stdbool.h> - -#define GREATEST_USE_ABBREVS 0 -#include <greatest.h> +#include <rexo.h> #include <core/util.h> -GREATEST_TEST -nrand_simple(void) +RX_TEST_CASE(nrand, simple) { - bool found[10] = {false}; + int found[10] = {0}; /* Only try from [2..5], util_nrand does not include upper range. */ for (int i = 0; i < 100000; ++i) - found[util_nrand(2, 6)] = true; + found[util_nrand(2, 6)] = 1; - GREATEST_ASSERT_EQ(false, found[0]); - GREATEST_ASSERT_EQ(false, found[1]); - GREATEST_ASSERT_EQ(true, found[2]); - GREATEST_ASSERT_EQ(true, found[3]); - GREATEST_ASSERT_EQ(true, found[4]); - GREATEST_ASSERT_EQ(true, found[5]); - GREATEST_ASSERT_EQ(false, found[7]); - GREATEST_ASSERT_EQ(false, found[8]); - GREATEST_ASSERT_EQ(false, found[9]); - - GREATEST_PASS(); + RX_REQUIRE(!found[0]); + RX_REQUIRE(!found[1]); + RX_REQUIRE(found[2]); + RX_REQUIRE(found[3]); + RX_REQUIRE(found[4]); + RX_REQUIRE(found[5]); + RX_REQUIRE(!found[7]); + RX_REQUIRE(!found[8]); + RX_REQUIRE(!found[9]); } -GREATEST_SUITE(suite_nrand) -{ - GREATEST_RUN_TEST(nrand_simple); -} - -GREATEST_MAIN_DEFS(); - int main(int argc, char **argv) { - GREATEST_MAIN_BEGIN(); - GREATEST_RUN_SUITE(suite_nrand); - GREATEST_MAIN_END(); - - return 0; + return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1; }