diff --git a/test/component/be.file/threading/entry.cpp b/test/component/be.file/threading/entry.cpp index dbf6b6b4..86c43884 100644 --- a/test/component/be.file/threading/entry.cpp +++ b/test/component/be.file/threading/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.be.file.threading project. * * Created: 3rd July 2009 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -77,10 +77,10 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ diff --git a/test/component/bec.fprintf/entry.cpp b/test/component/bec.fprintf/entry.cpp index bdeb57e4..70e02434 100644 --- a/test/component/bec.fprintf/entry.cpp +++ b/test/component/bec.fprintf/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.bec.fprintf project. * * Created: 25th June 2020 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -21,7 +21,7 @@ #include /* xTests header files */ -#include +#include #include /* STLSoft header files */ @@ -54,10 +54,10 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ #define PAN_STR PANTHEIOS_LITERAL_STRING @@ -201,7 +201,7 @@ namespace { if (0 != r) { - XTESTS_TEST_FAIL_WITH_QUALIFIER("could not initialise bec.fprintf", stlsoft::t2a(pantheios::getStockSeverityString(r))); + TEST_FAIL_WITH_QUALIFIER("could not initialise bec.fprintf", stlsoft::t2a(pantheios::getStockSeverityString(r))); return std::make_pair(false, file_lines_t()); } @@ -225,7 +225,7 @@ namespace { { char buffer[21]; - XTESTS_TEST_FAIL_WITH_QUALIFIER("could not write to bec.fprintf", stlsoft::integer_to_decimal_string(&buffer[0], STLSOFT_NUM_ELEMENTS(buffer), r2)); + TEST_FAIL_WITH_QUALIFIER("could not write to bec.fprintf", stlsoft::integer_to_decimal_string(&buffer[0], STLSOFT_NUM_ELEMENTS(buffer), r2)); return std::make_pair(false, file_lines_t()); } @@ -257,8 +257,8 @@ static void test_NO_THREAD_ID_and_NO_DATETIME() { file_lines_t const& lines = r.second; - XTESTS_TEST_INTEGER_EQUAL(1u, lines.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL(("[test.component.bec.fprintf; Notice]: some message"), lines[0]); + TEST_INT_EQ(1u, lines.size()); + TEST_MS_EQ(("[test.component.bec.fprintf; Notice]: some message"), lines[0]); } } @@ -276,8 +276,8 @@ static void test_NO_THREAD_ID_and_NO_DATETIME_and_NO_PROCESS_ID() { file_lines_t const& lines = r.second; - XTESTS_TEST_INTEGER_EQUAL(1u, lines.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL(("[Notice]: some message"), lines[0]); + TEST_INT_EQ(1u, lines.size()); + TEST_MS_EQ(("[Notice]: some message"), lines[0]); } } @@ -295,8 +295,8 @@ static void test_NO_THREAD_ID_and_NO_DATETIME_and_NO_SEVERITY() { file_lines_t const& lines = r.second; - XTESTS_TEST_INTEGER_EQUAL(1u, lines.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL(("[test.component.bec.fprintf]: some message"), lines[0]); + TEST_INT_EQ(1u, lines.size()); + TEST_MS_EQ(("[test.component.bec.fprintf]: some message"), lines[0]); } } @@ -314,8 +314,8 @@ static void test_NO_THREAD_ID_and_NO_DATETIME_and_NUMERIC_SEVERITY() { file_lines_t const& lines = r.second; - XTESTS_TEST_INTEGER_EQUAL(1u, lines.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL(("[test.component.bec.fprintf; 5]: some message"), lines[0]); + TEST_INT_EQ(1u, lines.size()); + TEST_MS_EQ(("[test.component.bec.fprintf; 5]: some message"), lines[0]); } } #ifdef PANTHEIOS_HAS_SHWILD @@ -333,14 +333,14 @@ static void test_USE_UNIX_FORMAT_and_NO_THREAD_ID() { file_lines_t const& lines = r.second; - XTESTS_TEST_INTEGER_EQUAL(1u, lines.size()); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("\\[*\\]: *", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("*test.component.bec.fprintf,*", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("*" PATTERN_DATE_TIMEms "*", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("*Notice*", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("*test.component.bec.fprintf, " PATTERN_DATE_TIMEms "; Notice*", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("\\[test.component.bec.fprintf, " PATTERN_DATE_TIMEms "; Notice\\]: *", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("\\[test.component.bec.fprintf, " PATTERN_DATE_TIMEms "; Notice\\]: some message", lines[0]); + TEST_INT_EQ(1u, lines.size()); + TEST_MS_MATCHES("\\[*\\]: *", lines[0]); + TEST_MS_MATCHES("*test.component.bec.fprintf,*", lines[0]); + TEST_MS_MATCHES("*" PATTERN_DATE_TIMEms "*", lines[0]); + TEST_MS_MATCHES("*Notice*", lines[0]); + TEST_MS_MATCHES("*test.component.bec.fprintf, " PATTERN_DATE_TIMEms "; Notice*", lines[0]); + TEST_MS_MATCHES("\\[test.component.bec.fprintf, " PATTERN_DATE_TIMEms "; Notice\\]: *", lines[0]); + TEST_MS_MATCHES("\\[test.component.bec.fprintf, " PATTERN_DATE_TIMEms "; Notice\\]: some message", lines[0]); } } @@ -358,14 +358,14 @@ static void test_USE_UNIX_FORMAT_and_NO_THREAD_ID_and_HIGH_RESOLUTION() { file_lines_t const& lines = r.second; - XTESTS_TEST_INTEGER_EQUAL(1u, lines.size()); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("\\[*\\]: *", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("*test.component.bec.fprintf,*", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("*" PATTERN_DATE_TIMEus "*", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("*Notice*", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("*test.component.bec.fprintf, " PATTERN_DATE_TIMEus "; Notice*", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("\\[test.component.bec.fprintf, " PATTERN_DATE_TIMEus "; Notice\\]: *", lines[0]); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES("\\[test.component.bec.fprintf, " PATTERN_DATE_TIMEus "; Notice\\]: some message", lines[0]); + TEST_INT_EQ(1u, lines.size()); + TEST_MS_MATCHES("\\[*\\]: *", lines[0]); + TEST_MS_MATCHES("*test.component.bec.fprintf,*", lines[0]); + TEST_MS_MATCHES("*" PATTERN_DATE_TIMEus "*", lines[0]); + TEST_MS_MATCHES("*Notice*", lines[0]); + TEST_MS_MATCHES("*test.component.bec.fprintf, " PATTERN_DATE_TIMEus "; Notice*", lines[0]); + TEST_MS_MATCHES("\\[test.component.bec.fprintf, " PATTERN_DATE_TIMEus "; Notice\\]: *", lines[0]); + TEST_MS_MATCHES("\\[test.component.bec.fprintf, " PATTERN_DATE_TIMEus "; Notice\\]: some message", lines[0]); } } #endif /* PANTHEIOS_HAS_SHWILD */ diff --git a/test/component/core/getProcessIdentity/entry.c b/test/component/core/getProcessIdentity/entry.c index 7e24c6b7..c8b3671a 100644 --- a/test/component/core/getProcessIdentity/entry.c +++ b/test/component/core/getProcessIdentity/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.core.getProcessIdentity project. * * Created: 6th August 2012 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -21,7 +21,7 @@ */ /* xTests header files */ -#include +#include /* STLSoft header files */ #include @@ -72,10 +72,10 @@ int main(int argc, char **argv) #define PSTR PANTHEIOS_LITERAL_STRING #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -182,26 +182,26 @@ static void test_1_0(void) r = pantheios_init(); - XTESTS_TEST_INTEGER_EQUAL(1, s_numGPI); + TEST_INT_EQ(1, s_numGPI); if (r < 0) { - XTESTS_FAIL("could not initialise libraries"); + TEST_FAIL("could not initialise libraries"); } else { - XTESTS_TEST_INTEGER_EQUAL(1, s_numInits); - XTESTS_TEST_INTEGER_EQUAL(0, s_numUninits); - XTESTS_TEST_INTEGER_EQUAL(1, s_numGPI); + TEST_INT_EQ(1, s_numInits); + TEST_INT_EQ(0, s_numUninits); + TEST_INT_EQ(1, s_numGPI); - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING("test_1_0"), pantheios_getProcessIdentity()); - XTESTS_TEST_POINTER_NOT_EQUAL(pi, pantheios_getProcessIdentity()); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("test_1_0"), pantheios_getProcessIdentity()); + TEST_PTR_NE(pi, pantheios_getProcessIdentity()); pantheios_uninit(); - XTESTS_TEST_INTEGER_EQUAL(1, s_numInits); - XTESTS_TEST_INTEGER_EQUAL(1, s_numUninits); - XTESTS_TEST_INTEGER_EQUAL(1, s_numGPI); + TEST_INT_EQ(1, s_numInits); + TEST_INT_EQ(1, s_numUninits); + TEST_INT_EQ(1, s_numGPI); } } @@ -215,26 +215,26 @@ static void test_1_1(void) r = pantheios_init(); - XTESTS_TEST_INTEGER_EQUAL(2, s_numGPI); + TEST_INT_EQ(2, s_numGPI); if (r < 0) { - XTESTS_FAIL("could not initialise libraries"); + TEST_FAIL("could not initialise libraries"); } else { - XTESTS_TEST_INTEGER_EQUAL(1, s_numInits); - XTESTS_TEST_INTEGER_EQUAL(0, s_numUninits); - XTESTS_TEST_INTEGER_EQUAL(2, s_numGPI); + TEST_INT_EQ(1, s_numInits); + TEST_INT_EQ(0, s_numUninits); + TEST_INT_EQ(2, s_numGPI); - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING("test_1_1"), pantheios_getProcessIdentity()); - XTESTS_TEST_POINTER_EQUAL(pi, pantheios_getProcessIdentity()); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("test_1_1"), pantheios_getProcessIdentity()); + TEST_PTR_EQ(pi, pantheios_getProcessIdentity()); pantheios_uninit(); - XTESTS_TEST_INTEGER_EQUAL(1, s_numInits); - XTESTS_TEST_INTEGER_EQUAL(1, s_numUninits); - XTESTS_TEST_INTEGER_EQUAL(4, s_numGPI); + TEST_INT_EQ(1, s_numInits); + TEST_INT_EQ(1, s_numUninits); + TEST_INT_EQ(4, s_numGPI); } } diff --git a/test/component/core/initialisation_sequence/entry.c b/test/component/core/initialisation_sequence/entry.c index 0e9caf41..f77b703e 100644 --- a/test/component/core/initialisation_sequence/entry.c +++ b/test/component/core/initialisation_sequence/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.core.initialisation_sequence project. * * Created: 8th February 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -46,11 +46,11 @@ PANTHEIOS_CALL(int) pantheios_fe_init( void* reserved if (0 != s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end initialisation failed", "front-end has already been initialised"); + TEST_FAIL_WITH_QUALIFIER("front-end initialisation failed", "front-end has already been initialised"); } else if (0 != s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end initialisation failed", "back-end has already been initialised"); + TEST_FAIL_WITH_QUALIFIER("front-end initialisation failed", "back-end has already been initialised"); } else { @@ -68,19 +68,19 @@ PANTHEIOS_CALL(void) pantheios_fe_uninit(void* token) if (0 == s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end uninitialisation failed", "front-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("front-end uninitialisation failed", "front-end has not yet been initialised"); } else if (0 == s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end uninitialisation failed", "back-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("front-end uninitialisation failed", "back-end has not yet been initialised"); } else if (1 == s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end uninitialisation failed", "back-end has not yet been uninitialised"); + TEST_FAIL_WITH_QUALIFIER("front-end uninitialisation failed", "back-end has not yet been uninitialised"); } else if (2 != s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end uninitialisation failed", "back-end initialisation count suggests multiple initialisations"); + TEST_FAIL_WITH_QUALIFIER("front-end uninitialisation failed", "back-end initialisation count suggests multiple initialisations"); } else { @@ -94,15 +94,15 @@ PANTHEIOS_CALL(PAN_CHAR_T const*) pantheios_fe_getProcessIdentity(void* token) if (0 == s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end process identity interrogation", "front-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("front-end process identity interrogation", "front-end has not yet been initialised"); } else if (1 != s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end process identity interrogation", "front-end has been uninitialised"); + TEST_FAIL_WITH_QUALIFIER("front-end process identity interrogation", "front-end has been uninitialised"); } else if (0 != s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end process identity interrogation", "back-end has already been initialised"); + TEST_FAIL_WITH_QUALIFIER("front-end process identity interrogation", "back-end has already been initialised"); } return PANTHEIOS_LITERAL_STRING("test.component.core.initialisation_sequence"); @@ -118,19 +118,19 @@ PANTHEIOS_CALL(int) pantheios_fe_isSeverityLogged( void* token if (0 == s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end severity test", "front-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("front-end severity test", "front-end has not yet been initialised"); } else if (1 != s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end severity test", "front-end has been uninitialised"); + TEST_FAIL_WITH_QUALIFIER("front-end severity test", "front-end has been uninitialised"); } else if (0 == s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end severity test", "back-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("front-end severity test", "back-end has not yet been initialised"); } else if (1 != s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("front-end severity test", "back-end has been uninitialised"); + TEST_FAIL_WITH_QUALIFIER("front-end severity test", "back-end has been uninitialised"); } return 0; @@ -153,15 +153,15 @@ PANTHEIOS_CALL(int) pantheios_be_init( if (0 == s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end initialisation", "front-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("back-end initialisation", "front-end has not yet been initialised"); } else if (1 != s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end initialisation", "front-end has been uninitialised"); + TEST_FAIL_WITH_QUALIFIER("back-end initialisation", "front-end has been uninitialised"); } else if (0 != s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end initialisation", "back-end has already been initialised"); + TEST_FAIL_WITH_QUALIFIER("back-end initialisation", "back-end has already been initialised"); } else { @@ -179,15 +179,15 @@ PANTHEIOS_CALL(void) pantheios_be_uninit(void* token) if (0 == s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end uninitialisation failed", "front-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("back-end uninitialisation failed", "front-end has not yet been initialised"); } else if (0 == s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end uninitialisation failed", "back-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("back-end uninitialisation failed", "back-end has not yet been initialised"); } else if (1 != s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end uninitialisation failed", "back-end has already been uninitialised"); + TEST_FAIL_WITH_QUALIFIER("back-end uninitialisation failed", "back-end has already been uninitialised"); } else { @@ -210,19 +210,19 @@ PANTHEIOS_CALL(int) pantheios_be_logEntry( if (0 == s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end entry logging", "front-end has not yet been initialised"); + TEST_FAIL_WITH_QUALIFIER("back-end entry logging", "front-end has not yet been initialised"); } else if (1 != s_feInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end entry logging", "front-end has been uninitialised"); + TEST_FAIL_WITH_QUALIFIER("back-end entry logging", "front-end has been uninitialised"); } else if (0 == s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end entry logging", "back-end has not been initialised"); + TEST_FAIL_WITH_QUALIFIER("back-end entry logging", "back-end has not been initialised"); } else if (1 != s_beInitValue) { - XTESTS_FAIL_WITH_QUALIFIER("back-end entry logging", "back-end has been uninitialised"); + TEST_FAIL_WITH_QUALIFIER("back-end entry logging", "back-end has been uninitialised"); } return (int)cchEntry; @@ -246,24 +246,24 @@ int main(int argc, char* argv[]) { int r; - XTESTS_TEST_INTEGER_EQUAL(0, s_feInitValue); - XTESTS_TEST_INTEGER_EQUAL(0, s_beInitValue); + TEST_INT_EQ(0, s_feInitValue); + TEST_INT_EQ(0, s_beInitValue); r = pantheios_init(); if (r < 0) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise Pantheios", pantheios_getInitCodeString(r)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise Pantheios", pantheios_getInitCodeString(r)); } else { - XTESTS_TEST_INTEGER_EQUAL(1, s_feInitValue); - XTESTS_TEST_INTEGER_EQUAL(1, s_beInitValue); + TEST_INT_EQ(1, s_feInitValue); + TEST_INT_EQ(1, s_beInitValue); pantheios_uninit(); - XTESTS_TEST_INTEGER_EQUAL(2, s_feInitValue); - XTESTS_TEST_INTEGER_EQUAL(2, s_beInitValue); + TEST_INT_EQ(2, s_feInitValue); + TEST_INT_EQ(2, s_beInitValue); } XTESTS_CASE_END("Pantheios initialisation sequence"); diff --git a/test/component/core/pantheios_logprintf/entry.cpp b/test/component/core/pantheios_logprintf/entry.cpp index ec0ade29..aa4de6c5 100644 --- a/test/component/core/pantheios_logprintf/entry.cpp +++ b/test/component/core/pantheios_logprintf/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.core.pantheios_logprintf project. * * Created: 31st October 2005 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -32,7 +32,7 @@ * macros */ -#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) XTESTS_TEST_INTEGER_EQUAL(static_cast(x), static_cast(y)) +#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) TEST_INT_EQ(static_cast(x), static_cast(y)) /* ////////////////////////////////////////////////////////////////////// */ @@ -46,10 +46,10 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -130,9 +130,9 @@ static void test_1_01() if (!results.empty()) // Do test here, so will work with any back-end { - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); + TEST_INT_EQ(1, results.size()); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[0].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); } }} } @@ -153,10 +153,10 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); PANTHEIOS_SEV_LEVELS_EQUAL(PANTHEIOS_SEV_ERROR | (1 << 4), results[0].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); } static void test_1_03() @@ -175,10 +175,10 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); PANTHEIOS_SEV_LEVELS_EQUAL(PANTHEIOS_SEV_ERROR | (0x01234567 << 4), results[0].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); } static void test_1_04() @@ -206,19 +206,19 @@ static void test_1_04() if (!results.empty()) // Do test here, so will work with any back-end { - XTESTS_TEST_INTEGER_EQUAL(4, results.size()); + TEST_INT_EQ(4, results.size()); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[0].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[1].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("def"), results[1].statement); + TEST_STRING_EQ(PSTR("def"), results[1].statement); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[2].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("int=10, char=c"), results[2].statement); + TEST_STRING_EQ(PSTR("int=10, char=c"), results[2].statement); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[3].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("int=-10, char=%"), results[3].statement); + TEST_STRING_EQ(PSTR("int=-10, char=%"), results[3].statement); } }} } diff --git a/test/component/core/pantheios_logputs/entry.cpp b/test/component/core/pantheios_logputs/entry.cpp index 348f0cbb..c276b078 100644 --- a/test/component/core/pantheios_logputs/entry.cpp +++ b/test/component/core/pantheios_logputs/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.core.pantheios_logputs project. * * Created: 19th November 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -32,7 +32,7 @@ * macros */ -#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) XTESTS_TEST_INTEGER_EQUAL(static_cast(x), static_cast(y)) +#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) TEST_INT_EQ(static_cast(x), static_cast(y)) /* ///////////////////////////////////////////////////////////////////////// @@ -43,10 +43,10 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -127,9 +127,9 @@ static void test_1_01() if (!results.empty()) // Do test here, so will work with any back-end { - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); + TEST_INT_EQ(1, results.size()); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[0].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); } }} } @@ -150,10 +150,10 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); PANTHEIOS_SEV_LEVELS_EQUAL(PANTHEIOS_SEV_ERROR | (1 << 4), results[0].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); } static void test_1_03() @@ -172,10 +172,10 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); PANTHEIOS_SEV_LEVELS_EQUAL(PANTHEIOS_SEV_ERROR | (0x01234567 << 4), results[0].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); } static void test_1_04() @@ -203,19 +203,19 @@ static void test_1_04() if (!results.empty()) // Do test here, so will work with any back-end { - XTESTS_TEST_INTEGER_EQUAL(4, results.size()); + TEST_INT_EQ(4, results.size()); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[0].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[1].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("def"), results[1].statement); + TEST_STRING_EQ(PSTR("def"), results[1].statement); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[2].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abcdefghijklmnopqrstuvwxyz"), results[2].statement); + TEST_STRING_EQ(PSTR("abcdefghijklmnopqrstuvwxyz"), results[2].statement); PANTHEIOS_SEV_LEVELS_EQUAL(severity, results[3].severity); - XTESTS_TEST_STRING_EQUAL(PSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"), results[3].statement); + TEST_STRING_EQ(PSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"), results[3].statement); } }} } diff --git a/test/component/custom_severity/entry.cpp b/test/component/custom_severity/entry.cpp index 1148a011..7ce801bc 100644 --- a/test/component/custom_severity/entry.cpp +++ b/test/component/custom_severity/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.custom_severity project. * * Created: 31st October 2005 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -32,7 +32,7 @@ * macros */ -#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) XTESTS_TEST_INTEGER_EQUAL(static_cast(x), static_cast(y)) +#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) TEST_INT_EQ(static_cast(x), static_cast(y)) /* ///////////////////////////////////////////////////////////////////////// @@ -43,10 +43,10 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -107,9 +107,9 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); PANTHEIOS_SEV_LEVELS_EQUAL(PANTHEIOS_SEV_NOTICE, results[0].severity); } @@ -129,9 +129,9 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); PANTHEIOS_SEV_LEVELS_EQUAL(PANTHEIOS_SEV_NOTICE | (1 << 4), results[0].severity); } @@ -151,9 +151,9 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); PANTHEIOS_SEV_LEVELS_EQUAL(PANTHEIOS_SEV_NOTICE | (0x01234567 << 4), results[0].severity); } diff --git a/test/component/details/entry.cpp b/test/component/details/entry.cpp index 36b46487..809ca42a 100644 --- a/test/component/details/entry.cpp +++ b/test/component/details/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Component test of details permutations. * * Created: 27th October 2024 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -37,10 +37,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -101,8 +101,8 @@ static void test_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_BOOLEAN_TRUE(results.empty()); - XTESTS_TEST_INTEGER_EQUAL(0u, results.size()); + TEST_BOOLEAN_TRUE(results.empty()); + TEST_INT_EQ(0u, results.size()); } static void test_02() @@ -121,10 +121,10 @@ static void test_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_BOOLEAN_FALSE(results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("the message details"), results[0].statement); - XTESTS_TEST(pantheios::notice == results[0].severity); + TEST_BOOLEAN_FALSE(results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("the message details"), results[0].statement); + TEST(pantheios::notice == results[0].severity); } diff --git a/test/component/inserters/args/entry.cpp b/test/component/inserters/args/entry.cpp index 8447f198..f794add9 100644 --- a/test/component/inserters/args/entry.cpp +++ b/test/component/inserters/args/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.args project. * * Created: 19th October 2006 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -119,9 +119,9 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_1_02() @@ -145,9 +145,9 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc", results[0].statement); } static void test_1_03() @@ -172,9 +172,9 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc, def", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc, def", results[0].statement); } static void test_1_04() @@ -201,9 +201,9 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc, def, ghi, jkl", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc, def, ghi, jkl", results[0].statement); } static void test_1_05() @@ -230,9 +230,9 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("\"abc\", \"def\", \"ghi\", \"jkl\"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("\"abc\", \"def\", \"ghi\", \"jkl\"", results[0].statement); } static void test_1_06() @@ -258,9 +258,9 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc, def ghi, jkl", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc, def ghi, jkl", results[0].statement); } static void test_1_07() @@ -286,9 +286,9 @@ static void test_1_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc, \"def ghi\", jkl", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc, \"def ghi\", jkl", results[0].statement); } static void test_1_08() @@ -314,9 +314,9 @@ static void test_1_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("\"abc\", \"def ghi\", \"jkl\"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("\"abc\", \"def ghi\", \"jkl\"", results[0].statement); } @@ -336,9 +336,9 @@ static void test_1_11() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_1_12() @@ -362,9 +362,9 @@ static void test_1_12() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc", results[0].statement); } static void test_1_13() @@ -389,9 +389,9 @@ static void test_1_13() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc|def", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc|def", results[0].statement); } static void test_1_14() @@ -418,9 +418,9 @@ static void test_1_14() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc|def|ghi|jkl", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc|def|ghi|jkl", results[0].statement); } static void test_1_15() @@ -447,9 +447,9 @@ static void test_1_15() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("\"abc\"|\"def\"|\"ghi\"|\"jkl\"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("\"abc\"|\"def\"|\"ghi\"|\"jkl\"", results[0].statement); } static void test_1_16() @@ -475,9 +475,9 @@ static void test_1_16() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc|def ghi|jkl", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc|def ghi|jkl", results[0].statement); } static void test_1_17() @@ -503,9 +503,9 @@ static void test_1_17() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc|\"def ghi\"|jkl", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("abc|\"def ghi\"|jkl", results[0].statement); } static void test_1_18() @@ -531,9 +531,9 @@ static void test_1_18() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("\"abc\"|\"def ghi\"|\"jkl\"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST_MS_EQ("\"abc\"|\"def ghi\"|\"jkl\"", results[0].statement); } diff --git a/test/component/inserters/b64/entry.cpp b/test/component/inserters/b64/entry.cpp index f55cde12..7da71f31 100644 --- a/test/component/inserters/b64/entry.cpp +++ b/test/component/inserters/b64/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.b64 project. * * Created: 31st July 2006 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* b64 header files */ #include @@ -66,10 +66,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -126,9 +126,9 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("AA=="), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("AA=="), results[0].statement); } static void test_1_02() @@ -149,9 +149,9 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("AQ=="), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("AQ=="), results[0].statement); } static void test_1_03() @@ -172,9 +172,9 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("Cg=="), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("Cg=="), results[0].statement); } static void test_1_04() @@ -195,9 +195,9 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("ZA=="), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("ZA=="), results[0].statement); } static void test_1_05() @@ -218,9 +218,9 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("gA=="), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("gA=="), results[0].statement); } static void test_1_06() @@ -241,9 +241,9 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("/w=="), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("/w=="), results[0].statement); } static void test_1_07() @@ -262,9 +262,9 @@ static void test_1_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("VGhpcyBpcyBhIHRlc3Qgc3RyaW5n"), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("VGhpcyBpcyBhIHRlc3Qgc3RyaW5n"), results[0].statement); } @@ -286,9 +286,9 @@ static void test_1_12() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("BwYFBAMCAQD//v38+/r5"), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("BwYFBAMCAQD//v38+/r5"), results[0].statement); } @@ -312,9 +312,9 @@ static void test_1_14() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL( + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ( PSTR("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r\n") PSTR("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r\n") PSTR("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r\n") @@ -342,9 +342,9 @@ static void test_1_15() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), results[0].statement); } static void test_1_16() @@ -367,9 +367,9 @@ static void test_1_16() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), results[0].statement); } diff --git a/test/component/inserters/boolean/entry.cpp b/test/component/inserters/boolean/entry.cpp index bcbfaedc..147989af 100644 --- a/test/component/inserters/boolean/entry.cpp +++ b/test/component/inserters/boolean/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.boolean project. * * Created: 7th August 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -60,10 +60,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -116,10 +116,10 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(2u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{false}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{true}"), results[1].statement); + TEST(!results.empty()); + TEST_INT_EQ(2u, results.size()); + TEST_STRING_EQ(PSTR("{false}"), results[0].statement); + TEST_STRING_EQ(PSTR("{true}"), results[1].statement); } static void test_1_02() @@ -141,10 +141,10 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(2u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{false}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{true}"), results[1].statement); + TEST(!results.empty()); + TEST_INT_EQ(2u, results.size()); + TEST_STRING_EQ(PSTR("{false}"), results[0].statement); + TEST_STRING_EQ(PSTR("{true}"), results[1].statement); } static void test_1_03() @@ -166,10 +166,10 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(2u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{FALSE}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{TRUE}"), results[1].statement); + TEST(!results.empty()); + TEST_INT_EQ(2u, results.size()); + TEST_STRING_EQ(PSTR("{FALSE}"), results[0].statement); + TEST_STRING_EQ(PSTR("{TRUE}"), results[1].statement); } static void test_1_04() @@ -196,12 +196,12 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(4u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{FALSE}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{TRUE}"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{false}"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{true}"), results[3].statement); + TEST(!results.empty()); + TEST_INT_EQ(4u, results.size()); + TEST_STRING_EQ(PSTR("{FALSE}"), results[0].statement); + TEST_STRING_EQ(PSTR("{TRUE}"), results[1].statement); + TEST_STRING_EQ(PSTR("{false}"), results[2].statement); + TEST_STRING_EQ(PSTR("{true}"), results[3].statement); } static void test_1_05() @@ -228,12 +228,12 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(4u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{T}"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{false}"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{true}"), results[3].statement); + TEST(!results.empty()); + TEST_INT_EQ(4u, results.size()); + TEST_STRING_EQ(PSTR("{ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff}"), results[0].statement); + TEST_STRING_EQ(PSTR("{T}"), results[1].statement); + TEST_STRING_EQ(PSTR("{false}"), results[2].statement); + TEST_STRING_EQ(PSTR("{true}"), results[3].statement); } static void test_1_06() @@ -265,14 +265,14 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(6u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{FALSE}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{TRUE}"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{false}"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{true}"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{FALSE}"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{TRUE}"), results[5].statement); + TEST(!results.empty()); + TEST_INT_EQ(6u, results.size()); + TEST_STRING_EQ(PSTR("{FALSE}"), results[0].statement); + TEST_STRING_EQ(PSTR("{TRUE}"), results[1].statement); + TEST_STRING_EQ(PSTR("{false}"), results[2].statement); + TEST_STRING_EQ(PSTR("{true}"), results[3].statement); + TEST_STRING_EQ(PSTR("{FALSE}"), results[4].statement); + TEST_STRING_EQ(PSTR("{TRUE}"), results[5].statement); } static void test_1_07() @@ -304,14 +304,14 @@ static void test_1_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(6u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{FALSE}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{TRUE}"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{false}"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{true}"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{F}"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{T}"), results[5].statement); + TEST(!results.empty()); + TEST_INT_EQ(6u, results.size()); + TEST_STRING_EQ(PSTR("{FALSE}"), results[0].statement); + TEST_STRING_EQ(PSTR("{TRUE}"), results[1].statement); + TEST_STRING_EQ(PSTR("{false}"), results[2].statement); + TEST_STRING_EQ(PSTR("{true}"), results[3].statement); + TEST_STRING_EQ(PSTR("{F}"), results[4].statement); + TEST_STRING_EQ(PSTR("{T}"), results[5].statement); } static void test_1_08() @@ -348,16 +348,16 @@ static void test_1_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(8u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{FALSE}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{TRUE}"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{false}"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{true}"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{F}"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{T}"), results[5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{false}"), results[6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{true}"), results[7].statement); + TEST(!results.empty()); + TEST_INT_EQ(8u, results.size()); + TEST_STRING_EQ(PSTR("{FALSE}"), results[0].statement); + TEST_STRING_EQ(PSTR("{TRUE}"), results[1].statement); + TEST_STRING_EQ(PSTR("{false}"), results[2].statement); + TEST_STRING_EQ(PSTR("{true}"), results[3].statement); + TEST_STRING_EQ(PSTR("{F}"), results[4].statement); + TEST_STRING_EQ(PSTR("{T}"), results[5].statement); + TEST_STRING_EQ(PSTR("{false}"), results[6].statement); + TEST_STRING_EQ(PSTR("{true}"), results[7].statement); } diff --git a/test/component/inserters/hostid/entry.cpp b/test/component/inserters/hostid/entry.cpp index 10dc12dd..05827d14 100644 --- a/test/component/inserters/hostid/entry.cpp +++ b/test/component/inserters/hostid/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.hostid project. * * Created: 14th April 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -71,11 +71,11 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS # define pantheios_GetComputerName_ ::GetComputerNameW -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ # define pantheios_GetComputerName_ ::GetComputerNameA -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -126,10 +126,10 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(2, results.size()); - XTESTS_TEST_STRING_EQUAL(hid, results[0].statement); - XTESTS_TEST_STRING_EQUAL(stmt, results[1].statement); + TEST(!results.empty()); + TEST_INT_EQ(2, results.size()); + TEST_STRING_EQ(hid, results[0].statement); + TEST_STRING_EQ(stmt, results[1].statement); } static string_t pan_get_hid_() diff --git a/test/component/inserters/integer/entry.cpp b/test/component/inserters/integer/entry.cpp index 7a31b6dd..a00966bf 100644 --- a/test/component/inserters/integer/entry.cpp +++ b/test/component/inserters/integer/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.integer project. * * Created: 19th October 2006 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -14,7 +14,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #define PANTHEIOS_NO_INCLUDE_OS_AND_3PTYLIB_STRING_ACCESS @@ -77,10 +77,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -225,11 +225,11 @@ static void test_1_00() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(n, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(n, results.size())); { for (size_t i = 0; i != n; ++i) { - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[i].statement); + TEST_STRING_EQ(PSTR("0"), results[i].statement); }} } @@ -258,17 +258,17 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(8u, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[5].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(8u, results.size())); + TEST_STRING_EQ(PSTR("0"), results[0].statement); + TEST_STRING_EQ(PSTR("0"), results[1].statement); + TEST_STRING_EQ(PSTR("0"), results[2].statement); + TEST_STRING_EQ(PSTR("0"), results[3].statement); + TEST_STRING_EQ(PSTR("0"), results[4].statement); + TEST_STRING_EQ(PSTR("0"), results[5].statement); #ifdef STLSOFT_CF_64BIT_INT_SUPPORT - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[7].statement); + TEST_STRING_EQ(PSTR("0"), results[6].statement); + TEST_STRING_EQ(PSTR("0"), results[7].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -290,11 +290,11 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(3u, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1"), results[2].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(3u, results.size())); + TEST_STRING_EQ(PSTR("0"), results[0].statement); + TEST_STRING_EQ(PSTR("1"), results[1].statement); + TEST_STRING_EQ(PSTR("-1"), results[2].statement); } static void test_1_03() @@ -315,11 +315,11 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(3u, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1"), results[2].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(3u, results.size())); + TEST_STRING_EQ(PSTR(" 0"), results[0].statement); + TEST_STRING_EQ(PSTR(" 1"), results[1].statement); + TEST_STRING_EQ(PSTR(" -1"), results[2].statement); } static void test_1_04() @@ -380,54 +380,54 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(33u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(33u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x01"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x01"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x08421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x08421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x008421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x008421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0008421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0008421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00008421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00008421"), results[n++].statement); } static void test_1_05() @@ -448,11 +448,11 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(3u, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[2].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(3u, results.size())); + TEST_STRING_EQ(PSTR("0 "), results[0].statement); + TEST_STRING_EQ(PSTR("1 "), results[1].statement); + TEST_STRING_EQ(PSTR("-1 "), results[2].statement); } static void test_1_06() @@ -505,46 +505,46 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x8421"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x8421"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x8421"), results[n++].statement); } static void test_1_07() @@ -658,102 +658,102 @@ static void test_1_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x01"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x01"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x01234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x01234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x001234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x001234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0001234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0001234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00001234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00001234567812345678"), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -867,102 +867,102 @@ static void test_1_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x01"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x01"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x01234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x01234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x001234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x000000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x001234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0001234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0000000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0001234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000000000"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00000000000000000001"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00001234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000000000"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00000000000000000001"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x00001234567812345678"), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -1077,102 +1077,102 @@ static void test_1_09() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0x1234567812345678"), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -1287,102 +1287,102 @@ static void test_1_10() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0x1234567812345678 "), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -1497,102 +1497,102 @@ static void test_1_11() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0"), results[n++].statement); + TEST_STRING_EQ(PSTR("1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0"), results[n++].statement); + TEST_STRING_EQ(PSTR("1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678 "), results[n++].statement); + TEST_STRING_EQ(PSTR("0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678 "), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -1707,102 +1707,102 @@ static void test_1_12() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0"), results[n++].statement); + TEST_STRING_EQ(PSTR("1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0"), results[n++].statement); + TEST_STRING_EQ(PSTR("1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1234567812345678"), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -1917,102 +1917,102 @@ static void test_1_13() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0"), results[n++].statement); + TEST_STRING_EQ(PSTR("1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("0"), results[n++].statement); + TEST_STRING_EQ(PSTR("1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" 1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -2176,158 +2176,158 @@ static void test_1_14() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(112u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(112u, results.size())); size_t base = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("-127"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("11"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-300"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-100000"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("123456"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("-127"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("11"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("-300"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("-100000"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("123456"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR(" -127"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 11"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -300"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -100000"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 123456"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[base + 7].statement); + TEST_STRING_EQ(PSTR(" -127"), results[base + 0].statement); + TEST_STRING_EQ(PSTR(" 11"), results[base + 1].statement); + TEST_STRING_EQ(PSTR(" -300"), results[base + 2].statement); + TEST_STRING_EQ(PSTR(" 0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR(" -100000"), results[base + 4].statement); + TEST_STRING_EQ(PSTR(" 123456"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("-127 "), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("11 "), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-300 "), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-100000 "), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("123456 "), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("-127 "), results[base + 0].statement); + TEST_STRING_EQ(PSTR("11 "), results[base + 1].statement); + TEST_STRING_EQ(PSTR("-300 "), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0 "), results[base + 3].statement); + TEST_STRING_EQ(PSTR("-100000 "), results[base + 4].statement); + TEST_STRING_EQ(PSTR("123456 "), results[base + 5].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("1234567812345678"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR(" -127"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 11"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -300"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -100000"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 123456"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234567812345678"), results[base + 7].statement); + TEST_STRING_EQ(PSTR(" -127"), results[base + 0].statement); + TEST_STRING_EQ(PSTR(" 11"), results[base + 1].statement); + TEST_STRING_EQ(PSTR(" -300"), results[base + 2].statement); + TEST_STRING_EQ(PSTR(" 0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR(" -100000"), results[base + 4].statement); + TEST_STRING_EQ(PSTR(" 123456"), results[base + 5].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[base + 6].statement); + TEST_STRING_EQ(PSTR(" 1234567812345678"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("-127 "), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("11 "), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-300 "), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0 "), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-100000 "), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("123456 "), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678 "), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234567812345678 "), results[base + 7].statement); + TEST_STRING_EQ(PSTR("-127 "), results[base + 0].statement); + TEST_STRING_EQ(PSTR("11 "), results[base + 1].statement); + TEST_STRING_EQ(PSTR("-300 "), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0 "), results[base + 3].statement); + TEST_STRING_EQ(PSTR("-100000 "), results[base + 4].statement); + TEST_STRING_EQ(PSTR("123456 "), results[base + 5].statement); + TEST_STRING_EQ(PSTR("-1234567812345678 "), results[base + 6].statement); + TEST_STRING_EQ(PSTR("1234567812345678 "), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("fed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("fffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("fed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("fffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0000"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0001e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("000462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("fed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0000"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("fffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0001e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("000462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xb"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0xb"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0x0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0x1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("0x462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xb"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0xb"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR(" 0x1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR(" 0x462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0xb"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR(" 0xb"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR(" 0x1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR(" 0x462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0000"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0001e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("000462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("fed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0000"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("fffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0001e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("000462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xb"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x01e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0xb"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0x00"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0x01e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("0x0462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0001e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0x0b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0x0000"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0x0001e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("0x000462d537e7ef4e"), results[base + 7].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -2404,70 +2404,70 @@ static void test_1_15() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); -// XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(80u, results.size())); + TEST(!results.empty()); +// REQUIRE(TEST_INT_EQ(80u, results.size())); size_t base = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-15"), results[base++].statement); + TEST_STRING_EQ(PSTR("15"), results[base++].statement); + TEST_STRING_EQ(PSTR("-15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-15"), results[base++].statement); + TEST_STRING_EQ(PSTR("15"), results[base++].statement); + TEST_STRING_EQ(PSTR("-15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-15"), results[base++].statement); + TEST_STRING_EQ(PSTR("15"), results[base++].statement); + TEST_STRING_EQ(PSTR("-15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-15"), results[base++].statement); + TEST_STRING_EQ(PSTR("15"), results[base++].statement); + TEST_STRING_EQ(PSTR("-15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-15"), results[base++].statement); + TEST_STRING_EQ(PSTR(" 15"), results[base++].statement); + TEST_STRING_EQ(PSTR("-15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("15 "), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-15"), results[base++].statement); + TEST_STRING_EQ(PSTR("15 "), results[base++].statement); + TEST_STRING_EQ(PSTR("-15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -15"), results[base++].statement); + TEST_STRING_EQ(PSTR(" 15"), results[base++].statement); + TEST_STRING_EQ(PSTR(" -15"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("15 "), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-15 "), results[base++].statement); + TEST_STRING_EQ(PSTR("15 "), results[base++].statement); + TEST_STRING_EQ(PSTR("-15 "), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0015"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-015"), results[base++].statement); + TEST_STRING_EQ(PSTR("0015"), results[base++].statement); + TEST_STRING_EQ(PSTR("-015"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("15 "), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-15 "), results[base++].statement); + TEST_STRING_EQ(PSTR("15 "), results[base++].statement); + TEST_STRING_EQ(PSTR("-15 "), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("f"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("f1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffffffffffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("f"), results[base++].statement); + TEST_STRING_EQ(PSTR("f1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fffffffffffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" f"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("f1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffffffffffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR(" f"), results[base++].statement); + TEST_STRING_EQ(PSTR("f1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fffffffffffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" f"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("f1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffffffffffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR(" f"), results[base++].statement); + TEST_STRING_EQ(PSTR("f1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fffffffffffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" f"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" f1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" fff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" fffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffffffffffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR(" f"), results[base++].statement); + TEST_STRING_EQ(PSTR(" f1"), results[base++].statement); + TEST_STRING_EQ(PSTR(" fff1"), results[base++].statement); + TEST_STRING_EQ(PSTR(" fffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fffffffffffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("000000000000000f"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("00000000000000f1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("000000000000fff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("00000000fffffff1"), results[base++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffffffffffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("000000000000000f"), results[base++].statement); + TEST_STRING_EQ(PSTR("00000000000000f1"), results[base++].statement); + TEST_STRING_EQ(PSTR("000000000000fff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("00000000fffffff1"), results[base++].statement); + TEST_STRING_EQ(PSTR("fffffffffffffff1"), results[base++].statement); } @@ -2612,128 +2612,128 @@ static void test_1_21() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(92u, results.size()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_GREATER_OR_EQUAL(92u, results.size())); + TEST(!results.empty()); + TEST_INT_EQ(92u, results.size()); + REQUIRE(TEST_INT_GE(92u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678 "), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678 "), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678 "), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678 "), results[n++].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1 "), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678 "), results[n++].statement); - - XTESTS_TEST_INTEGER_EQUAL(results.size(), n); + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678 "), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678 "), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678 "), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678 "), results[n++].statement); + + TEST_STRING_EQ(PSTR("+0 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("-1 "), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678 "), results[n++].statement); + + TEST_INT_EQ(results.size(), n); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -2848,102 +2848,102 @@ static void test_1_22() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1234567812345678"), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -3058,102 +3058,102 @@ static void test_1_23() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(69u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(69u, results.size())); size_t n = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR("+0"), results[n++].statement); + TEST_STRING_EQ(PSTR("+1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1"), results[n++].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +0"), results[n++].statement); + TEST_STRING_EQ(PSTR(" +1"), results[n++].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[n++].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } @@ -3317,158 +3317,158 @@ static void test_1_24() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(112u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(112u, results.size())); size_t base = 0; - XTESTS_TEST_STRING_EQUAL(PSTR("-127"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+11"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-300"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-100000"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+123456"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("-127"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("+11"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("-300"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("+0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("-100000"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("+123456"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR(" -127"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +11"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -300"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -100000"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +123456"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[base + 7].statement); + TEST_STRING_EQ(PSTR(" -127"), results[base + 0].statement); + TEST_STRING_EQ(PSTR(" +11"), results[base + 1].statement); + TEST_STRING_EQ(PSTR(" -300"), results[base + 2].statement); + TEST_STRING_EQ(PSTR(" +0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR(" -100000"), results[base + 4].statement); + TEST_STRING_EQ(PSTR(" +123456"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("-127 "), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+11 "), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-300 "), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-100000 "), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+123456 "), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("-127 "), results[base + 0].statement); + TEST_STRING_EQ(PSTR("+11 "), results[base + 1].statement); + TEST_STRING_EQ(PSTR("-300 "), results[base + 2].statement); + TEST_STRING_EQ(PSTR("+0 "), results[base + 3].statement); + TEST_STRING_EQ(PSTR("-100000 "), results[base + 4].statement); + TEST_STRING_EQ(PSTR("+123456 "), results[base + 5].statement); + TEST_STRING_EQ(PSTR("-1234567812345678"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("+1234567812345678"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR(" -127"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +11"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -300"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -100000"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +123456"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" -1234567812345678"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" +1234567812345678"), results[base + 7].statement); + TEST_STRING_EQ(PSTR(" -127"), results[base + 0].statement); + TEST_STRING_EQ(PSTR(" +11"), results[base + 1].statement); + TEST_STRING_EQ(PSTR(" -300"), results[base + 2].statement); + TEST_STRING_EQ(PSTR(" +0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR(" -100000"), results[base + 4].statement); + TEST_STRING_EQ(PSTR(" +123456"), results[base + 5].statement); + TEST_STRING_EQ(PSTR(" -1234567812345678"), results[base + 6].statement); + TEST_STRING_EQ(PSTR(" +1234567812345678"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("-127 "), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+11 "), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-300 "), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+0 "), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-100000 "), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+123456 "), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1234567812345678 "), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("+1234567812345678 "), results[base + 7].statement); + TEST_STRING_EQ(PSTR("-127 "), results[base + 0].statement); + TEST_STRING_EQ(PSTR("+11 "), results[base + 1].statement); + TEST_STRING_EQ(PSTR("-300 "), results[base + 2].statement); + TEST_STRING_EQ(PSTR("+0 "), results[base + 3].statement); + TEST_STRING_EQ(PSTR("-100000 "), results[base + 4].statement); + TEST_STRING_EQ(PSTR("+123456 "), results[base + 5].statement); + TEST_STRING_EQ(PSTR("-1234567812345678 "), results[base + 6].statement); + TEST_STRING_EQ(PSTR("+1234567812345678 "), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("fed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("fffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("fed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("fffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0000"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0001e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("000462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("fed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0000"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("fffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0001e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("000462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xb"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0xb"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0x0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0x1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("0x462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xb"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0xb"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR(" 0x1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR(" 0x462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0xb"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x0"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR(" 0xb"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR(" 0x0"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR(" 0x1e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR(" 0x462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0000"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0001e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("000462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("fed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0000"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("fffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0001e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("fffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("000462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xb"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x01e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0xb"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0x00"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0x01e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("0x0462d537e7ef4e"), results[base + 7].statement); base += 8; - XTESTS_TEST_STRING_EQUAL(PSTR("0x81"), results[base + 0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0b"), results[base + 1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfed4"), results[base + 2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0000"), results[base + 3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffe7960"), results[base + 4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x0001e240"), results[base + 5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x000462d537e7ef4e"), results[base + 7].statement); + TEST_STRING_EQ(PSTR("0x81"), results[base + 0].statement); + TEST_STRING_EQ(PSTR("0x0b"), results[base + 1].statement); + TEST_STRING_EQ(PSTR("0xfed4"), results[base + 2].statement); + TEST_STRING_EQ(PSTR("0x0000"), results[base + 3].statement); + TEST_STRING_EQ(PSTR("0xfffe7960"), results[base + 4].statement); + TEST_STRING_EQ(PSTR("0x0001e240"), results[base + 5].statement); + TEST_STRING_EQ(PSTR("0xfffb9d2ac81810b2"), results[base + 6].statement); + TEST_STRING_EQ(PSTR("0x000462d537e7ef4e"), results[base + 7].statement); #endif /* STLSOFT_CF_64BIT_INT_SUPPORT */ } diff --git a/test/component/inserters/m2w/entry.cpp b/test/component/inserters/m2w/entry.cpp index 2d559f25..a31dfc30 100644 --- a/test/component/inserters/m2w/entry.cpp +++ b/test/component/inserters/m2w/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.m2w project. * * Created: 22nd November 2010 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -14,7 +14,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -149,9 +149,9 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_1_02() @@ -170,9 +170,9 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"a", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"a", results[0].statement); } static void test_1_03() @@ -191,9 +191,9 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"[abc]", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"[abc]", results[0].statement); } static void test_1_04() @@ -212,9 +212,9 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_1_05() @@ -233,9 +233,9 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_1_06() @@ -254,9 +254,9 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_1_07() @@ -275,9 +275,9 @@ static void test_1_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_1_08() @@ -296,9 +296,9 @@ static void test_1_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_1_09() @@ -317,9 +317,9 @@ static void test_1_09() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_2_01() @@ -338,9 +338,9 @@ static void test_2_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_2_02() @@ -359,9 +359,9 @@ static void test_2_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"a", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"a", results[0].statement); } static void test_2_03() @@ -380,9 +380,9 @@ static void test_2_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"[abc]", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"[abc]", results[0].statement); } static void test_2_04() @@ -401,9 +401,9 @@ static void test_2_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_2_05() @@ -422,9 +422,9 @@ static void test_2_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_2_06() @@ -443,9 +443,9 @@ static void test_2_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_2_07() @@ -464,9 +464,9 @@ static void test_2_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_2_08() @@ -485,9 +485,9 @@ static void test_2_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_2_09() @@ -506,9 +506,9 @@ static void test_2_09() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_3_01() @@ -527,9 +527,9 @@ static void test_3_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_3_02() @@ -548,9 +548,9 @@ static void test_3_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"a", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"a", results[0].statement); } static void test_3_03() @@ -569,9 +569,9 @@ static void test_3_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"[abc]", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"[abc]", results[0].statement); } static void test_3_04() @@ -590,9 +590,9 @@ static void test_3_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_3_05() @@ -611,9 +611,9 @@ static void test_3_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_3_06() @@ -632,9 +632,9 @@ static void test_3_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_3_07() @@ -653,9 +653,9 @@ static void test_3_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_3_08() @@ -674,9 +674,9 @@ static void test_3_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } static void test_3_09() @@ -695,9 +695,9 @@ static void test_3_09() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_WIDE_STRING_EQUAL(L"", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_WS_EQ(L"", results[0].statement); } /* ///////////////////////////// end of file //////////////////////////// */ diff --git a/test/component/inserters/pad/entry.cpp b/test/component/inserters/pad/entry.cpp index ab312be2..6680a200 100644 --- a/test/component/inserters/pad/entry.cpp +++ b/test/component/inserters/pad/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.pad project. * * Created: 29th June 2009 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -59,10 +59,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -116,10 +116,10 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_INTEGER_EQUAL(i, results[0].statement.size()); - XTESTS_TEST_STRING_EQUAL(string_t(i, ' '), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_INT_EQ(i, results[0].statement.size()); + TEST_STRING_EQ(string_t(i, ' '), results[0].statement); }} } @@ -141,10 +141,10 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_INTEGER_EQUAL(i, results[0].statement.size()); - XTESTS_TEST_STRING_EQUAL(string_t(i, ' '), results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_INT_EQ(i, results[0].statement.size()); + TEST_STRING_EQ(string_t(i, ' '), results[0].statement); }} } @@ -166,17 +166,17 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); if (i <= 1) { - XTESTS_TEST_INTEGER_EQUAL(0u, results[0].statement.size()); - XTESTS_TEST_STRING_EQUAL(PSTR(""), results[0].statement); + TEST_INT_EQ(0u, results[0].statement.size()); + TEST_STRING_EQ(PSTR(""), results[0].statement); } else { - XTESTS_TEST_INTEGER_EQUAL(i - 1u, results[0].statement.size()); - XTESTS_TEST_STRING_EQUAL(string_t(i - 1u, ' '), results[0].statement); + TEST_INT_EQ(i - 1u, results[0].statement.size()); + TEST_STRING_EQ(string_t(i - 1u, ' '), results[0].statement); } }} } @@ -205,22 +205,22 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); if (i < j) { /* Some padding */ const string_t stmt = string_t(j - i, ' ') + value; - XTESTS_TEST_INTEGER_EQUAL(stmt.size(), results[0].statement.size()); - XTESTS_TEST_STRING_EQUAL(stmt, results[0].statement); + TEST_INT_EQ(stmt.size(), results[0].statement.size()); + TEST_STRING_EQ(stmt, results[0].statement); } else { /* No padding */ - XTESTS_TEST_INTEGER_EQUAL(value.size(), results[0].statement.size()); - XTESTS_TEST_STRING_EQUAL(value, results[0].statement); + TEST_INT_EQ(value.size(), results[0].statement.size()); + TEST_STRING_EQ(value, results[0].statement); } }} }} diff --git a/test/component/inserters/pointer/entry.cpp b/test/component/inserters/pointer/entry.cpp index 47d0d68c..a0e5b0ae 100644 --- a/test/component/inserters/pointer/entry.cpp +++ b/test/component/inserters/pointer/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.pointer project. * * Created: 19th October 2006 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -63,10 +63,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -127,12 +127,12 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(4u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("(null)"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("(null)"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("(null)"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("(null)"), results[3].statement); + TEST(!results.empty()); + TEST_INT_EQ(4u, results.size()); + TEST_STRING_EQ(PSTR("(null)"), results[0].statement); + TEST_STRING_EQ(PSTR("(null)"), results[1].statement); + TEST_STRING_EQ(PSTR("(null)"), results[2].statement); + TEST_STRING_EQ(PSTR("(null)"), results[3].statement); } static void test_1_02() @@ -152,10 +152,10 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(2u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("(null)"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("(null)"), results[1].statement); + TEST(!results.empty()); + TEST_INT_EQ(2u, results.size()); + TEST_STRING_EQ(PSTR("(null)"), results[0].statement); + TEST_STRING_EQ(PSTR("(null)"), results[1].statement); } static void test_1_03() @@ -178,11 +178,11 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(3u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234"), results[2].statement); + TEST(!results.empty()); + TEST_INT_EQ(3u, results.size()); + TEST_STRING_EQ(PSTR("1234"), results[0].statement); + TEST_STRING_EQ(PSTR("12345678"), results[1].statement); + TEST_STRING_EQ(PSTR(" 1234"), results[2].statement); } static void test_1_04() @@ -205,11 +205,11 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(3u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234"), results[2].statement); + TEST(!results.empty()); + TEST_INT_EQ(3u, results.size()); + TEST_STRING_EQ(PSTR("1234"), results[0].statement); + TEST_STRING_EQ(PSTR("12345678"), results[1].statement); + TEST_STRING_EQ(PSTR(" 1234"), results[2].statement); } static void test_1_05() @@ -232,11 +232,11 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(3u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x12345678"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00001234"), results[2].statement); + TEST(!results.empty()); + TEST_INT_EQ(3u, results.size()); + TEST_STRING_EQ(PSTR("0x1234"), results[0].statement); + TEST_STRING_EQ(PSTR("0x12345678"), results[1].statement); + TEST_STRING_EQ(PSTR("0x00001234"), results[2].statement); } static void test_1_06() @@ -259,11 +259,11 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(3u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("00001234"), results[2].statement); + TEST(!results.empty()); + TEST_INT_EQ(3u, results.size()); + TEST_STRING_EQ(PSTR("1234"), results[0].statement); + TEST_STRING_EQ(PSTR("12345678"), results[1].statement); + TEST_STRING_EQ(PSTR("00001234"), results[2].statement); } static void test_1_07() @@ -286,11 +286,11 @@ static void test_1_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(3u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x12345678"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00001234"), results[2].statement); + TEST(!results.empty()); + TEST_INT_EQ(3u, results.size()); + TEST_STRING_EQ(PSTR("0x1234"), results[0].statement); + TEST_STRING_EQ(PSTR("0x12345678"), results[1].statement); + TEST_STRING_EQ(PSTR("0x00001234"), results[2].statement); } static void test_1_08() @@ -313,11 +313,11 @@ static void test_1_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(3u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x12345678"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x00001234"), results[2].statement); + TEST(!results.empty()); + TEST_INT_EQ(3u, results.size()); + TEST_STRING_EQ(PSTR("0x1234"), results[0].statement); + TEST_STRING_EQ(PSTR("0x12345678"), results[1].statement); + TEST_STRING_EQ(PSTR("0x00001234"), results[2].statement); } static void test_1_09() @@ -343,14 +343,14 @@ static void test_1_09() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(6u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 12345678"), results[5].statement); + TEST(!results.empty()); + TEST_INT_EQ(6u, results.size()); + TEST_STRING_EQ(PSTR("1234"), results[0].statement); + TEST_STRING_EQ(PSTR(" 1234"), results[1].statement); + TEST_STRING_EQ(PSTR(" 1234"), results[2].statement); + TEST_STRING_EQ(PSTR("12345678"), results[3].statement); + TEST_STRING_EQ(PSTR("12345678"), results[4].statement); + TEST_STRING_EQ(PSTR(" 12345678"), results[5].statement); } static void test_1_10() @@ -376,14 +376,14 @@ static void test_1_10() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(6u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 1234"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 12345678"), results[5].statement); + TEST(!results.empty()); + TEST_INT_EQ(6u, results.size()); + TEST_STRING_EQ(PSTR("1234"), results[0].statement); + TEST_STRING_EQ(PSTR(" 1234"), results[1].statement); + TEST_STRING_EQ(PSTR(" 1234"), results[2].statement); + TEST_STRING_EQ(PSTR("12345678"), results[3].statement); + TEST_STRING_EQ(PSTR("12345678"), results[4].statement); + TEST_STRING_EQ(PSTR(" 12345678"), results[5].statement); } static void test_1_11() @@ -409,14 +409,14 @@ static void test_1_11() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(6u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234 "), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("1234 "), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("12345678 "), results[5].statement); + TEST(!results.empty()); + TEST_INT_EQ(6u, results.size()); + TEST_STRING_EQ(PSTR("1234"), results[0].statement); + TEST_STRING_EQ(PSTR("1234 "), results[1].statement); + TEST_STRING_EQ(PSTR("1234 "), results[2].statement); + TEST_STRING_EQ(PSTR("12345678"), results[3].statement); + TEST_STRING_EQ(PSTR("12345678"), results[4].statement); + TEST_STRING_EQ(PSTR("12345678 "), results[5].statement); } static void test_1_12() @@ -442,14 +442,14 @@ static void test_1_12() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(6u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1234"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x1234"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x12345678"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x12345678"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR(" 0x12345678"), results[5].statement); + TEST(!results.empty()); + TEST_INT_EQ(6u, results.size()); + TEST_STRING_EQ(PSTR("0x1234"), results[0].statement); + TEST_STRING_EQ(PSTR(" 0x1234"), results[1].statement); + TEST_STRING_EQ(PSTR(" 0x1234"), results[2].statement); + TEST_STRING_EQ(PSTR("0x12345678"), results[3].statement); + TEST_STRING_EQ(PSTR("0x12345678"), results[4].statement); + TEST_STRING_EQ(PSTR(" 0x12345678"), results[5].statement); } static void test_1_13() @@ -475,14 +475,14 @@ static void test_1_13() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(6u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234 "), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x1234 "), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x12345678"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x12345678"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0x12345678 "), results[5].statement); + TEST(!results.empty()); + TEST_INT_EQ(6u, results.size()); + TEST_STRING_EQ(PSTR("0x1234"), results[0].statement); + TEST_STRING_EQ(PSTR("0x1234 "), results[1].statement); + TEST_STRING_EQ(PSTR("0x1234 "), results[2].statement); + TEST_STRING_EQ(PSTR("0x12345678"), results[3].statement); + TEST_STRING_EQ(PSTR("0x12345678"), results[4].statement); + TEST_STRING_EQ(PSTR("0x12345678 "), results[5].statement); } diff --git a/test/component/inserters/processid/entry.cpp b/test/component/inserters/processid/entry.cpp index cd640bd8..56743254 100644 --- a/test/component/inserters/processid/entry.cpp +++ b/test/component/inserters/processid/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.processid project. * * Created: 17th October 2006 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -62,10 +62,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -121,10 +121,10 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_BOOLEAN_FALSE(results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(2u, results.size())); - XTESTS_TEST_STRING_EQUAL(pid, results[0].statement); - XTESTS_TEST_STRING_EQUAL(stmt, results[1].statement); + TEST_BOOLEAN_FALSE(results.empty()); + REQUIRE(TEST_INT_EQ(2u, results.size())); + TEST_STRING_EQ(pid, results[0].statement); + TEST_STRING_EQ(stmt, results[1].statement); } static int pan_get_pid_() diff --git a/test/component/inserters/real/entry.cpp b/test/component/inserters/real/entry.cpp index 39e84851..07c50fee 100644 --- a/test/component/inserters/real/entry.cpp +++ b/test/component/inserters/real/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.real project. * * Created: 19th October 2006 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -50,10 +50,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -101,11 +101,11 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(3, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("0"), results[2].statement); + TEST(!results.empty()); + TEST_INT_EQ(3, results.size()); + TEST_STRING_EQ(PSTR("0"), results[0].statement); + TEST_STRING_EQ(PSTR("0"), results[1].statement); + TEST_STRING_EQ(PSTR("0"), results[2].statement); } static void test_1_02() @@ -127,12 +127,12 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(4, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("1.1"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("-1.1"), results[1].statement); -// XTESTS_TEST_STRING_EQUAL(PSTR("0.0000001"), results[2].statement); -// XTESTS_TEST_STRING_EQUAL(PSTR("-0.0000001"), results[3].statement); + TEST(!results.empty()); + TEST_INT_EQ(4, results.size()); + TEST_STRING_EQ(PSTR("1.1"), results[0].statement); + TEST_STRING_EQ(PSTR("-1.1"), results[1].statement); +// TEST_STRING_EQ(PSTR("0.0000001"), results[2].statement); +// TEST_STRING_EQ(PSTR("-0.0000001"), results[3].statement); } diff --git a/test/component/inserters/slice/entry.cpp b/test/component/inserters/slice/entry.cpp index ef2060e8..2f9b4bf7 100644 --- a/test/component/inserters/slice/entry.cpp +++ b/test/component/inserters/slice/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.slice project. * * Created: 14th February 2010 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -64,9 +64,9 @@ const pan_char_t alphabet[] = PANTHEIOS_LITERAL_STRING("abcdefghijklmnopqrstuvwx */ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRINGS_EQUAL_ XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else -# define XTESTS_TEST_STRINGS_EQUAL_ XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif @@ -124,11 +124,11 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(alphabet); ++i) { - XTESTS_TEST_STRINGS_EQUAL_(string_t(alphabet, i), results[i].statement); + TEST_STRING_EQ(string_t(alphabet, i), results[i].statement); }} } @@ -151,11 +151,11 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(alphabet); ++i) { - XTESTS_TEST_STRINGS_EQUAL_(PANTHEIOS_LITERAL_STRING("str=") + string_t(alphabet, i), results[i].statement); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("str=") + string_t(alphabet, i), results[i].statement); }} } @@ -178,11 +178,11 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(alphabet); ++i) { - XTESTS_TEST_STRINGS_EQUAL_(PANTHEIOS_LITERAL_STRING("str:") + string_t(alphabet, i), results[i].statement); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("str:") + string_t(alphabet, i), results[i].statement); }} } @@ -205,13 +205,13 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(alphabet); ++i) { pan_char_t num[21]; - XTESTS_TEST_STRINGS_EQUAL_(PANTHEIOS_LITERAL_STRING("str=") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING(", len=") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("str=") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING(", len=") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); }} } @@ -234,13 +234,13 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(alphabet); ++i) { pan_char_t num[21]; - XTESTS_TEST_STRINGS_EQUAL_(PANTHEIOS_LITERAL_STRING("str:") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING(", len:") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("str:") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING(", len:") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); }} } @@ -263,13 +263,13 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(alphabet); ++i) { pan_char_t num[21]; - XTESTS_TEST_STRINGS_EQUAL_(PANTHEIOS_LITERAL_STRING("str:") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING("; len:") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("str:") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING("; len:") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); }} } @@ -292,13 +292,13 @@ static void test_1_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(alphabet); ++i) { pan_char_t num[21]; - XTESTS_TEST_STRINGS_EQUAL_(PANTHEIOS_LITERAL_STRING("str:") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING(";len:") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("str:") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING(";len:") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); }} } @@ -321,13 +321,13 @@ static void test_1_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(27u, results.size())); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(27u, results.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(alphabet); ++i) { pan_char_t num[21]; - XTESTS_TEST_STRINGS_EQUAL_(PANTHEIOS_LITERAL_STRING("str=") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING(";len=") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("str=") + string_t(alphabet, i) + PANTHEIOS_LITERAL_STRING(";len=") + stlsoft::integer_to_string(num, STLSOFT_NUM_ELEMENTS(num), i), results[i].statement); }} } diff --git a/test/component/inserters/stream_character/entry.cpp b/test/component/inserters/stream_character/entry.cpp index 76055463..dcc528d4 100644 --- a/test/component/inserters/stream_character/entry.cpp +++ b/test/component/inserters/stream_character/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.stream_character project. * * Created: 9th May 2014 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -57,10 +57,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -111,15 +111,15 @@ static void test_plain_characters() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(plain_characters) - 1, results.size()); + TEST(!results.empty()); + TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(plain_characters) - 1, results.size()); { for (size_t i = 0; STLSOFT_NUM_ELEMENTS(plain_characters) - 1 != i; ++i) { PAN_CHAR_T const ch = plain_characters[i]; PAN_CHAR_T sz[4] = { '{', ch, '}', '\0' }; - XTESTS_TEST_STRING_EQUAL(sz, results[i].statement); + TEST_STRING_EQ(sz, results[i].statement); }} } @@ -172,43 +172,43 @@ static void test_special_characters_1() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(33u, results.size()); - - XTESTS_TEST_STRING_EQUAL(PSTR("{NUL}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{SOH}"), results[1].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{STX}"), results[2].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{ETX}"), results[3].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{EOT}"), results[4].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{ENQ}"), results[5].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{ACK}"), results[6].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{BEL}"), results[7].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{BS}"), results[8].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{HT}"), results[9].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{LF}"), results[10].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{VT}"), results[11].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{FF}"), results[12].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{CR}"), results[13].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{SO}"), results[14].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{SI}"), results[15].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{DLE}"), results[16].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{DC1}"), results[17].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{DC2}"), results[18].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{DC3}"), results[19].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{DC4}"), results[20].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{NAK}"), results[21].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{SYN}"), results[22].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{ETB}"), results[23].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{CAN}"), results[24].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{EM}"), results[25].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{SUB}"), results[26].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{ESC}"), results[27].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{FS}"), results[28].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{GS}"), results[29].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{RS}"), results[30].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{US}"), results[31].statement); - - XTESTS_TEST_STRING_EQUAL(PSTR("{DEL}"), results[32].statement); + TEST(!results.empty()); + TEST_INT_EQ(33u, results.size()); + + TEST_STRING_EQ(PSTR("{NUL}"), results[0].statement); + TEST_STRING_EQ(PSTR("{SOH}"), results[1].statement); + TEST_STRING_EQ(PSTR("{STX}"), results[2].statement); + TEST_STRING_EQ(PSTR("{ETX}"), results[3].statement); + TEST_STRING_EQ(PSTR("{EOT}"), results[4].statement); + TEST_STRING_EQ(PSTR("{ENQ}"), results[5].statement); + TEST_STRING_EQ(PSTR("{ACK}"), results[6].statement); + TEST_STRING_EQ(PSTR("{BEL}"), results[7].statement); + TEST_STRING_EQ(PSTR("{BS}"), results[8].statement); + TEST_STRING_EQ(PSTR("{HT}"), results[9].statement); + TEST_STRING_EQ(PSTR("{LF}"), results[10].statement); + TEST_STRING_EQ(PSTR("{VT}"), results[11].statement); + TEST_STRING_EQ(PSTR("{FF}"), results[12].statement); + TEST_STRING_EQ(PSTR("{CR}"), results[13].statement); + TEST_STRING_EQ(PSTR("{SO}"), results[14].statement); + TEST_STRING_EQ(PSTR("{SI}"), results[15].statement); + TEST_STRING_EQ(PSTR("{DLE}"), results[16].statement); + TEST_STRING_EQ(PSTR("{DC1}"), results[17].statement); + TEST_STRING_EQ(PSTR("{DC2}"), results[18].statement); + TEST_STRING_EQ(PSTR("{DC3}"), results[19].statement); + TEST_STRING_EQ(PSTR("{DC4}"), results[20].statement); + TEST_STRING_EQ(PSTR("{NAK}"), results[21].statement); + TEST_STRING_EQ(PSTR("{SYN}"), results[22].statement); + TEST_STRING_EQ(PSTR("{ETB}"), results[23].statement); + TEST_STRING_EQ(PSTR("{CAN}"), results[24].statement); + TEST_STRING_EQ(PSTR("{EM}"), results[25].statement); + TEST_STRING_EQ(PSTR("{SUB}"), results[26].statement); + TEST_STRING_EQ(PSTR("{ESC}"), results[27].statement); + TEST_STRING_EQ(PSTR("{FS}"), results[28].statement); + TEST_STRING_EQ(PSTR("{GS}"), results[29].statement); + TEST_STRING_EQ(PSTR("{RS}"), results[30].statement); + TEST_STRING_EQ(PSTR("{US}"), results[31].statement); + + TEST_STRING_EQ(PSTR("{DEL}"), results[32].statement); } diff --git a/test/component/inserters/threadid/entry.cpp b/test/component/inserters/threadid/entry.cpp index bb2a7bd0..266a5d26 100644 --- a/test/component/inserters/threadid/entry.cpp +++ b/test/component/inserters/threadid/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.threadid project. * * Created: 17th October 2006 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -71,10 +71,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -130,10 +130,10 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(2, results.size()); - XTESTS_TEST_STRING_EQUAL(tid, results[0].statement); - XTESTS_TEST_STRING_EQUAL(stmt, results[1].statement); + TEST(!results.empty()); + TEST_INT_EQ(2, results.size()); + TEST_STRING_EQ(tid, results[0].statement); + TEST_STRING_EQ(stmt, results[1].statement); } static pantheios::sint64_t pan_get_tid_() diff --git a/test/component/inserters/variant_bool/entry.cpp b/test/component/inserters/variant_bool/entry.cpp index dffeb442..d1aa381f 100644 --- a/test/component/inserters/variant_bool/entry.cpp +++ b/test/component/inserters/variant_bool/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.variant_bool project. * * Created: 18th June 2012 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -53,10 +53,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -100,10 +100,10 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(2u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("{VARIANT_FALSE}"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("{VARIANT_TRUE}"), results[1].statement); + TEST(!results.empty()); + TEST_INT_EQ(2u, results.size()); + TEST_STRING_EQ(PSTR("{VARIANT_FALSE}"), results[0].statement); + TEST_STRING_EQ(PSTR("{VARIANT_TRUE}"), results[1].statement); } diff --git a/test/component/inserters/w2m/entry.cpp b/test/component/inserters/w2m/entry.cpp index ed7c19d3..a095cabc 100644 --- a/test/component/inserters/w2m/entry.cpp +++ b/test/component/inserters/w2m/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.w2m project. * * Created: 19th October 2006 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -154,9 +154,9 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_1_02() @@ -175,9 +175,9 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("a", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("a", results[0].statement); } static void test_1_03() @@ -196,9 +196,9 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("[abc]", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("[abc]", results[0].statement); } static void test_1_04() @@ -217,9 +217,9 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_1_05() @@ -238,9 +238,9 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_1_06() @@ -259,9 +259,9 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_1_07() @@ -280,9 +280,9 @@ static void test_1_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_1_08() @@ -301,9 +301,9 @@ static void test_1_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_1_09() @@ -322,9 +322,9 @@ static void test_1_09() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_2_01() @@ -343,9 +343,9 @@ static void test_2_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_2_02() @@ -364,9 +364,9 @@ static void test_2_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("a", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("a", results[0].statement); } static void test_2_03() @@ -385,9 +385,9 @@ static void test_2_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("[abc]", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("[abc]", results[0].statement); } static void test_2_04() @@ -406,9 +406,9 @@ static void test_2_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_2_05() @@ -427,9 +427,9 @@ static void test_2_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_2_06() @@ -448,9 +448,9 @@ static void test_2_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_2_07() @@ -469,9 +469,9 @@ static void test_2_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_2_08() @@ -490,9 +490,9 @@ static void test_2_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_2_09() @@ -511,9 +511,9 @@ static void test_2_09() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_3_01() @@ -532,9 +532,9 @@ static void test_3_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_3_02() @@ -553,9 +553,9 @@ static void test_3_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("a", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("a", results[0].statement); } static void test_3_03() @@ -574,9 +574,9 @@ static void test_3_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("[abc]", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("[abc]", results[0].statement); } static void test_3_04() @@ -595,9 +595,9 @@ static void test_3_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_3_05() @@ -616,9 +616,9 @@ static void test_3_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_3_06() @@ -637,9 +637,9 @@ static void test_3_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_3_07() @@ -658,9 +658,9 @@ static void test_3_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_3_08() @@ -679,9 +679,9 @@ static void test_3_08() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } static void test_3_09() @@ -700,9 +700,9 @@ static void test_3_09() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("", results[0].statement); + TEST(!results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_MS_EQ("", results[0].statement); } #endif /* !PANTHEIOS_USE_WIDE_STRINGS */ diff --git a/test/component/inserters/windows/hive/entry.cpp b/test/component/inserters/windows/hive/entry.cpp index a219425f..1446109a 100644 --- a/test/component/inserters/windows/hive/entry.cpp +++ b/test/component/inserters/windows/hive/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.inserters.windows.hive project. * * Created: 26th January 2017 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -60,10 +60,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -116,9 +116,9 @@ static void test_1_00() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(n, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("hive is HKEY_CLASSES_ROOT"), results[0].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(n, results.size())); + TEST_STRING_EQ(PSTR("hive is HKEY_CLASSES_ROOT"), results[0].statement); } static void test_1_01() @@ -139,9 +139,9 @@ static void test_1_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(n, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("hive is HKEY_CURRENT_USER"), results[0].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(n, results.size())); + TEST_STRING_EQ(PSTR("hive is HKEY_CURRENT_USER"), results[0].statement); } static void test_1_02() @@ -162,9 +162,9 @@ static void test_1_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(n, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("hive is HKEY_LOCAL_MACHINE"), results[0].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(n, results.size())); + TEST_STRING_EQ(PSTR("hive is HKEY_LOCAL_MACHINE"), results[0].statement); } static void test_1_03() @@ -185,9 +185,9 @@ static void test_1_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(n, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("hive is HKEY_USERS"), results[0].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(n, results.size())); + TEST_STRING_EQ(PSTR("hive is HKEY_USERS"), results[0].statement); } static void test_1_04() @@ -209,9 +209,9 @@ static void test_1_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(n, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("hive is HKEY_PERFORMANCE_DATA"), results[0].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(n, results.size())); + TEST_STRING_EQ(PSTR("hive is HKEY_PERFORMANCE_DATA"), results[0].statement); #endif } @@ -234,9 +234,9 @@ static void test_1_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(n, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("hive is HKEY_CURRENT_CONFIG"), results[0].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(n, results.size())); + TEST_STRING_EQ(PSTR("hive is HKEY_CURRENT_CONFIG"), results[0].statement); #endif } @@ -259,9 +259,9 @@ static void test_1_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(n, results.size())); - XTESTS_TEST_STRING_EQUAL(PSTR("hive is HKEY_DYN_DATA"), results[0].statement); + TEST(!results.empty()); + REQUIRE(TEST_INT_EQ(n, results.size())); + TEST_STRING_EQ(PSTR("hive is HKEY_DYN_DATA"), results[0].statement); #endif } diff --git a/test/component/log/1/entry.cpp b/test/component/log/1/entry.cpp index 985d74e6..0c67ae3d 100644 --- a/test/component/log/1/entry.cpp +++ b/test/component/log/1/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.log.1 project. * * Created: 25th November 2007 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -34,10 +34,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -116,8 +116,8 @@ static void test_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_BOOLEAN_TRUE(results.empty()); - XTESTS_TEST_INTEGER_EQUAL(0u, results.size()); + TEST_BOOLEAN_TRUE(results.empty()); + TEST_INT_EQ(0u, results.size()); } static void test_02() @@ -136,10 +136,10 @@ static void test_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_BOOLEAN_FALSE(results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR(""), results[0].statement); - XTESTS_TEST(pantheios::notice == results[0].severity); + TEST_BOOLEAN_FALSE(results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR(""), results[0].statement); + TEST(pantheios::notice == results[0].severity); } static void test_03() @@ -158,10 +158,10 @@ static void test_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_BOOLEAN_FALSE(results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abc"), results[0].statement); - XTESTS_TEST(pantheios::notice == results[0].severity); + TEST_BOOLEAN_FALSE(results.empty()); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("abc"), results[0].statement); + TEST(pantheios::notice == results[0].severity); } static void test_04() @@ -180,9 +180,9 @@ static void test_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abcdef"), results[0].statement); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("abcdef"), results[0].statement); + TEST(pantheios::informational == results[0].severity); } static void test_05() @@ -201,9 +201,9 @@ static void test_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abcdefghi"), results[0].statement); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("abcdefghi"), results[0].statement); + TEST(pantheios::informational == results[0].severity); } static void test_06() @@ -222,9 +222,9 @@ static void test_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abcdefghijklmnopqrstuvwxyz"), results[0].statement); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("abcdefghijklmnopqrstuvwxyz"), results[0].statement); + TEST(pantheios::informational == results[0].severity); } static void test_07() @@ -243,9 +243,9 @@ static void test_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abcdefghijklmnopqrstuvwxyz"), results[0].statement); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(PSTR("abcdefghijklmnopqrstuvwxyz"), results[0].statement); + TEST(pantheios::informational == results[0].severity); } @@ -266,9 +266,9 @@ static void test_10() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(2u, results.size()); - XTESTS_TEST_STRING_EQUAL(PSTR("abcdefghijklmnopqrstuvwxyz"), results[0].statement); - XTESTS_TEST_STRING_EQUAL(PSTR("ABCDEFGHIJKLMNOPQRSTUVWXYZ"), results[1].statement); + TEST_INT_EQ(2u, results.size()); + TEST_STRING_EQ(PSTR("abcdefghijklmnopqrstuvwxyz"), results[0].statement); + TEST_STRING_EQ(PSTR("ABCDEFGHIJKLMNOPQRSTUVWXYZ"), results[1].statement); } static void test_11() @@ -298,16 +298,16 @@ static void test_11() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(numEntries, results.size()); + TEST_INT_EQ(numEntries, results.size()); { for (size_t i = 0; i < numEntries; ++i) { if (0 == (i % 2)) { - XTESTS_TEST_STRING_EQUAL(PSTR("abcdefghijklmnopqrstuvwxyz"), results[i].statement); + TEST_STRING_EQ(PSTR("abcdefghijklmnopqrstuvwxyz"), results[i].statement); } else { - XTESTS_TEST_STRING_EQUAL(PSTR("ABCDEFGHIJKLMNOPQRSTUVWXYZ"), results[i].statement); + TEST_STRING_EQ(PSTR("ABCDEFGHIJKLMNOPQRSTUVWXYZ"), results[i].statement); } }} } @@ -333,9 +333,9 @@ static void test_21() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(msgEl1 + msgEl2, results[0].statement); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(msgEl1 + msgEl2, results[0].statement); + TEST(pantheios::informational == results[0].severity); } static void test_22() @@ -357,9 +357,9 @@ static void test_22() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1u, results.size()); - XTESTS_TEST_STRING_EQUAL(msgEl1 + msgEl2, results[0].statement); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1u, results.size()); + TEST_STRING_EQ(msgEl1 + msgEl2, results[0].statement); + TEST(pantheios::informational == results[0].severity); } diff --git a/test/component/trace/1/entry.cpp b/test/component/trace/1/entry.cpp index 5bd5f35f..7ec89814 100644 --- a/test/component/trace/1/entry.cpp +++ b/test/component/trace/1/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.component.trace.1 project. * * Created: 25th November 2007 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include @@ -33,7 +33,7 @@ * macros */ -#define PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(s1, s2) XTESTS_TEST_MULTIBYTE_STRING_EQUAL((s1), (s2)) +#define PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(s1, s2) TEST_MS_EQ((s1), (s2)) /* ////////////////////////////////////////////////////////////////////// */ @@ -125,8 +125,8 @@ static void test_01() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(results.empty()); - XTESTS_TEST_INTEGER_EQUAL(0, results.size()); + TEST(results.empty()); + TEST_INT_EQ(0, results.size()); } static void test_02() @@ -145,9 +145,9 @@ static void test_02() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST(pantheios::notice == results[0].severity); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST(pantheios::notice == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("", LINE), results[0].statement); } @@ -167,9 +167,9 @@ static void test_03() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST(!results.empty()); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST(pantheios::notice == results[0].severity); + TEST(!results.empty()); + TEST_INT_EQ(1, results.size()); + TEST(pantheios::notice == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("abc", LINE), results[0].statement); } @@ -189,8 +189,8 @@ static void test_04() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1, results.size()); + TEST(pantheios::informational == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("abcdef", LINE), results[0].statement); } @@ -210,8 +210,8 @@ static void test_05() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1, results.size()); + TEST(pantheios::informational == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("abcdefghi", LINE), results[0].statement); } @@ -231,8 +231,8 @@ static void test_06() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1, results.size()); + TEST(pantheios::informational == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("abcdefghijklmnopqrstuvwxyz", LINE), results[0].statement); } @@ -252,8 +252,8 @@ static void test_07() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1, results.size()); + TEST(pantheios::informational == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("abcdefghijklmnopqrstuvwxyz", LINE), results[0].statement); } @@ -275,10 +275,10 @@ static void test_10() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(2, results.size()); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(2, results.size()); + TEST(pantheios::informational == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("abcdefghijklmnopqrstuvwxyz", LINE1), results[0].statement); - XTESTS_TEST(pantheios::informational == results[1].severity); + TEST(pantheios::informational == results[1].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("ABCDEFGHIJKLMNOPQRSTUVWXYZ", LINE2), results[1].statement); } @@ -311,10 +311,10 @@ static void test_11() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(numEntries, results.size()); + TEST_INT_EQ(numEntries, results.size()); { for (size_t i = 0; i < numEntries; ++i) { - XTESTS_TEST(pantheios::informational == results[i].severity); + TEST(pantheios::informational == results[i].severity); if (0 == (i % 2)) { PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_("abcdefghijklmnopqrstuvwxyz", LINE1), results[i].statement); @@ -347,8 +347,8 @@ static void test_21() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1, results.size()); + TEST(pantheios::informational == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_((msgEl1 + msgEl2).c_str(), LINE), results[0].statement); } @@ -371,8 +371,8 @@ static void test_22() pantheios::be::test::Results results = pantheios::be::test::results(); - XTESTS_TEST_INTEGER_EQUAL(1, results.size()); - XTESTS_TEST(pantheios::informational == results[0].severity); + TEST_INT_EQ(1, results.size()); + TEST(pantheios::informational == results[0].severity); PANTHEIOS_TEST_STRING_OBJECTS_EQUAL(fileline_stmt_((msgEl1 + msgEl2).c_str(), LINE), results[0].statement); } diff --git a/test/performance/inserters/w2m/main.cpp b/test/performance/inserters/w2m/main.cpp index d0741250..f5034df2 100644 --- a/test/performance/inserters/w2m/main.cpp +++ b/test/performance/inserters/w2m/main.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.performance.inserters.w2m project. * * Created: 2nd September 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -62,14 +62,6 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEI #define PSTR(x) PANTHEIOS_LITERAL_STRING(x) -#ifdef PANTHEIOS_USE_WIDE_STRINGS - -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL -#else /* ? PANTHEIOS_USE_WIDE_STRINGS */ - -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL -#endif /* PANTHEIOS_USE_WIDE_STRINGS */ - /* ///////////////////////////////////////////////////////////////////////// * typedefs diff --git a/test/performance/util/date_elements_to_string/main.cpp b/test/performance/util/date_elements_to_string/main.cpp index e5034d8c..24418e85 100644 --- a/test/performance/util/date_elements_to_string/main.cpp +++ b/test/performance/util/date_elements_to_string/main.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.performance.util.date_elements_to_string project. * * Created: 13th November 2016 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -67,11 +67,9 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL # define P_strcmp ::wcscmp #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL # define P_strcmp ::strcmp #endif /* PANTHEIOS_USE_WIDE_STRINGS */ diff --git a/test/unit/be.N/entry.c b/test/unit/be.N/entry.c index 87eaf580..cf90a7ee 100644 --- a/test/unit/be.N/entry.c +++ b/test/unit/be.N/entry.c @@ -4,7 +4,7 @@ * Purpose: Unit test of be.N backend. * * Created: 29th January 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -179,12 +179,12 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[1]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[2]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[3]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[4]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[5]); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(1, s_initCounts[1]); + TEST_INT_EQ(1, s_initCounts[2]); + TEST_INT_EQ(1, s_initCounts[3]); + TEST_INT_EQ(1, s_initCounts[4]); + TEST_INT_EQ(0, s_initCounts[5]); pantheios_be_uninit(token); @@ -204,12 +204,12 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_FE_INIT_RC_INTENDED_FAILURE, res); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[1]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[2]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[3]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[4]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[5]); + TEST_INT_EQ(PANTHEIOS_FE_INIT_RC_INTENDED_FAILURE, res); + TEST_INT_EQ(0, s_initCounts[1]); + TEST_INT_EQ(0, s_initCounts[2]); + TEST_INT_EQ(0, s_initCounts[3]); + TEST_INT_EQ(0, s_initCounts[4]); + TEST_INT_EQ(0, s_initCounts[5]); /* pantheios_be_uninit(token); */ @@ -229,12 +229,12 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[1]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[2]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[3]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[4]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[5]); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(1, s_initCounts[1]); + TEST_INT_EQ(0, s_initCounts[2]); + TEST_INT_EQ(1, s_initCounts[3]); + TEST_INT_EQ(1, s_initCounts[4]); + TEST_INT_EQ(0, s_initCounts[5]); pantheios_be_uninit(token); @@ -264,12 +264,12 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[1]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[2]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[3]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[4]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[5]); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(0, s_initCounts[1]); + TEST_INT_EQ(0, s_initCounts[2]); + TEST_INT_EQ(0, s_initCounts[3]); + TEST_INT_EQ(0, s_initCounts[4]); + TEST_INT_EQ(1, s_initCounts[5]); pantheios_be_uninit(token); @@ -299,12 +299,12 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_BE_INIT_RC_ALL_BACKEND_INITS_FAILED, res); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[1]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[2]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[3]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[4]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[5]); + TEST_INT_EQ(PANTHEIOS_BE_INIT_RC_ALL_BACKEND_INITS_FAILED, res); + TEST_INT_EQ(0, s_initCounts[1]); + TEST_INT_EQ(0, s_initCounts[2]); + TEST_INT_EQ(0, s_initCounts[3]); + TEST_INT_EQ(0, s_initCounts[4]); + TEST_INT_EQ(0, s_initCounts[5]); pantheios_be_uninit(token); @@ -323,27 +323,27 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[1]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[2]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[3]); - XTESTS_TEST_INTEGER_EQUAL(1, s_initCounts[4]); - XTESTS_TEST_INTEGER_EQUAL(0, s_initCounts[5]); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(1, s_initCounts[1]); + TEST_INT_EQ(1, s_initCounts[2]); + TEST_INT_EQ(1, s_initCounts[3]); + TEST_INT_EQ(1, s_initCounts[4]); + TEST_INT_EQ(0, s_initCounts[5]); - XTESTS_TEST_POINTER_EQUAL(NULL, pantheios_be_N_tokenFromId(-1, NULL)); - XTESTS_TEST_POINTER_EQUAL(NULL, pantheios_be_N_tokenFromId( 0, NULL)); + TEST_PTR_EQ(NULL, pantheios_be_N_tokenFromId(-1, NULL)); + TEST_PTR_EQ(NULL, pantheios_be_N_tokenFromId( 0, NULL)); { size_t i; for (i = 0 ; i != STLSOFT_NUM_ELEMENTS(tokens); ++i) { tokens[i] = pantheios_be_N_tokenFromId((int)i, NULL); if (i > 0) { - XTESTS_TEST_POINTER_NOT_EQUAL(NULL, tokens[i]); + TEST_PTR_NE(NULL, tokens[i]); } if (i > 1) { - XTESTS_TEST_POINTER_LESS(tokens[i], tokens[i - 1]); + TEST_PTR_LT(tokens[i], tokens[i - 1]); } }} diff --git a/test/unit/be.N/filtering/entry.c b/test/unit/be.N/filtering/entry.c index 780d0e42..fdadc321 100644 --- a/test/unit/be.N/filtering/entry.c +++ b/test/unit/be.N/filtering/entry.c @@ -4,7 +4,7 @@ * Purpose: Tests **pantheios.be.N** filtering functionality. * * Created: 28th June 2016 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -13,7 +13,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -182,50 +182,50 @@ int main(int argc, char* argv[]) pantheios_be_uninit(token); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[1][PANTHEIOS_SEV_DEBUG]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[1][PANTHEIOS_SEV_INFORMATIONAL]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[1][PANTHEIOS_SEV_NOTICE]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[1][PANTHEIOS_SEV_WARNING]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[1][PANTHEIOS_SEV_ERROR]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[1][PANTHEIOS_SEV_CRITICAL]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[1][PANTHEIOS_SEV_ALERT]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[1][PANTHEIOS_SEV_EMERGENCY]); - - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[2][PANTHEIOS_SEV_DEBUG]); - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[2][PANTHEIOS_SEV_INFORMATIONAL]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[2][PANTHEIOS_SEV_NOTICE]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[2][PANTHEIOS_SEV_WARNING]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[2][PANTHEIOS_SEV_ERROR]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[2][PANTHEIOS_SEV_CRITICAL]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[2][PANTHEIOS_SEV_ALERT]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[2][PANTHEIOS_SEV_EMERGENCY]); - - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[3][PANTHEIOS_SEV_DEBUG]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[3][PANTHEIOS_SEV_INFORMATIONAL]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[3][PANTHEIOS_SEV_NOTICE]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[3][PANTHEIOS_SEV_WARNING]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[3][PANTHEIOS_SEV_ERROR]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[3][PANTHEIOS_SEV_CRITICAL]); - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[3][PANTHEIOS_SEV_ALERT]); - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[3][PANTHEIOS_SEV_EMERGENCY]); - - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[4][PANTHEIOS_SEV_DEBUG]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[4][PANTHEIOS_SEV_INFORMATIONAL]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[4][PANTHEIOS_SEV_NOTICE]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[4][PANTHEIOS_SEV_WARNING]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[4][PANTHEIOS_SEV_ERROR]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[4][PANTHEIOS_SEV_CRITICAL]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[4][PANTHEIOS_SEV_ALERT]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[4][PANTHEIOS_SEV_EMERGENCY]); - - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[5][PANTHEIOS_SEV_DEBUG]); - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[5][PANTHEIOS_SEV_INFORMATIONAL]); - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[5][PANTHEIOS_SEV_NOTICE]); - XTESTS_TEST_INTEGER_EQUAL( 0u, results.counts[5][PANTHEIOS_SEV_WARNING]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[5][PANTHEIOS_SEV_ERROR]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[5][PANTHEIOS_SEV_CRITICAL]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[5][PANTHEIOS_SEV_ALERT]); - XTESTS_TEST_INTEGER_EQUAL(10u, results.counts[5][PANTHEIOS_SEV_EMERGENCY]); + TEST_INT_EQ(10u, results.counts[1][PANTHEIOS_SEV_DEBUG]); + TEST_INT_EQ(10u, results.counts[1][PANTHEIOS_SEV_INFORMATIONAL]); + TEST_INT_EQ(10u, results.counts[1][PANTHEIOS_SEV_NOTICE]); + TEST_INT_EQ(10u, results.counts[1][PANTHEIOS_SEV_WARNING]); + TEST_INT_EQ(10u, results.counts[1][PANTHEIOS_SEV_ERROR]); + TEST_INT_EQ(10u, results.counts[1][PANTHEIOS_SEV_CRITICAL]); + TEST_INT_EQ(10u, results.counts[1][PANTHEIOS_SEV_ALERT]); + TEST_INT_EQ(10u, results.counts[1][PANTHEIOS_SEV_EMERGENCY]); + + TEST_INT_EQ( 0u, results.counts[2][PANTHEIOS_SEV_DEBUG]); + TEST_INT_EQ( 0u, results.counts[2][PANTHEIOS_SEV_INFORMATIONAL]); + TEST_INT_EQ(10u, results.counts[2][PANTHEIOS_SEV_NOTICE]); + TEST_INT_EQ(10u, results.counts[2][PANTHEIOS_SEV_WARNING]); + TEST_INT_EQ(10u, results.counts[2][PANTHEIOS_SEV_ERROR]); + TEST_INT_EQ(10u, results.counts[2][PANTHEIOS_SEV_CRITICAL]); + TEST_INT_EQ(10u, results.counts[2][PANTHEIOS_SEV_ALERT]); + TEST_INT_EQ(10u, results.counts[2][PANTHEIOS_SEV_EMERGENCY]); + + TEST_INT_EQ( 0u, results.counts[3][PANTHEIOS_SEV_DEBUG]); + TEST_INT_EQ(10u, results.counts[3][PANTHEIOS_SEV_INFORMATIONAL]); + TEST_INT_EQ(10u, results.counts[3][PANTHEIOS_SEV_NOTICE]); + TEST_INT_EQ(10u, results.counts[3][PANTHEIOS_SEV_WARNING]); + TEST_INT_EQ(10u, results.counts[3][PANTHEIOS_SEV_ERROR]); + TEST_INT_EQ(10u, results.counts[3][PANTHEIOS_SEV_CRITICAL]); + TEST_INT_EQ( 0u, results.counts[3][PANTHEIOS_SEV_ALERT]); + TEST_INT_EQ( 0u, results.counts[3][PANTHEIOS_SEV_EMERGENCY]); + + TEST_INT_EQ(10u, results.counts[4][PANTHEIOS_SEV_DEBUG]); + TEST_INT_EQ(10u, results.counts[4][PANTHEIOS_SEV_INFORMATIONAL]); + TEST_INT_EQ(10u, results.counts[4][PANTHEIOS_SEV_NOTICE]); + TEST_INT_EQ(10u, results.counts[4][PANTHEIOS_SEV_WARNING]); + TEST_INT_EQ(10u, results.counts[4][PANTHEIOS_SEV_ERROR]); + TEST_INT_EQ(10u, results.counts[4][PANTHEIOS_SEV_CRITICAL]); + TEST_INT_EQ(10u, results.counts[4][PANTHEIOS_SEV_ALERT]); + TEST_INT_EQ(10u, results.counts[4][PANTHEIOS_SEV_EMERGENCY]); + + TEST_INT_EQ( 0u, results.counts[5][PANTHEIOS_SEV_DEBUG]); + TEST_INT_EQ( 0u, results.counts[5][PANTHEIOS_SEV_INFORMATIONAL]); + TEST_INT_EQ( 0u, results.counts[5][PANTHEIOS_SEV_NOTICE]); + TEST_INT_EQ( 0u, results.counts[5][PANTHEIOS_SEV_WARNING]); + TEST_INT_EQ(10u, results.counts[5][PANTHEIOS_SEV_ERROR]); + TEST_INT_EQ(10u, results.counts[5][PANTHEIOS_SEV_CRITICAL]); + TEST_INT_EQ(10u, results.counts[5][PANTHEIOS_SEV_ALERT]); + TEST_INT_EQ(10u, results.counts[5][PANTHEIOS_SEV_EMERGENCY]); XTESTS_CASE_END("Test-SeverityCeiling"); } diff --git a/test/unit/be.fail/entry.c b/test/unit/be.fail/entry.c index c8aaed8c..f3354575 100644 --- a/test/unit/be.fail/entry.c +++ b/test/unit/be.fail/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.be.fail project. * * Created: 27th January 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -46,8 +46,8 @@ int main(int argc, char* argv[]) void* token; int res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_LESS(0, res); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); + TEST_INT_LT(0, res); + TEST_INT_EQ(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); XTESTS_CASE_END("Test-1"); } diff --git a/test/unit/be.lrsplit/entry.c b/test/unit/be.lrsplit/entry.c index 93c34f1f..26523aca 100644 --- a/test/unit/be.lrsplit/entry.c +++ b/test/unit/be.lrsplit/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.be.lrsplit project. * * Created: 27th January 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -151,7 +151,7 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); pantheios_be_uninit(token); @@ -171,7 +171,7 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); + TEST_INT_EQ(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); /* pantheios_be_uninit(token); */ @@ -191,7 +191,7 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); + TEST_INT_EQ(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); /* pantheios_be_uninit(token); */ @@ -211,7 +211,7 @@ int main(int argc, char* argv[]) res = pantheios_be_init(PANTHEIOS_FE_PROCESS_IDENTITY, NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); + TEST_INT_EQ(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); /* pantheios_be_uninit(token); */ diff --git a/test/unit/bec.AnsiConsole/entry.cpp b/test/unit/bec.AnsiConsole/entry.cpp index 594f846d..d18dbfe1 100644 --- a/test/unit/bec.AnsiConsole/entry.cpp +++ b/test/unit/bec.AnsiConsole/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Unit-test for bec.AnsiConsole. * * Created: 24th January 2025 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -118,7 +118,7 @@ static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_true() int const r = pantheios_be_AnsiConsole_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(16, r); + TEST_INT_EQ(16, r); pantheios_uint32_t expected = 0 /* stock */ @@ -141,7 +141,7 @@ static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_true() | PANTHEIOS_BE_ANSICONSOLE_F_COLOUR_MESSAGE ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_false() @@ -194,7 +194,7 @@ static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_false() int const r = pantheios_be_AnsiConsole_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(16, r); + TEST_INT_EQ(16, r); pantheios_uint32_t expected = 0 /* stock */ @@ -217,7 +217,7 @@ static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_false() // | PANTHEIOS_BE_ANSICONSOLE_F_COLOUR_MESSAGE ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } diff --git a/test/unit/bec.COMErrorObject/entry.cpp b/test/unit/bec.COMErrorObject/entry.cpp index a542178f..4246f4f1 100644 --- a/test/unit/bec.COMErrorObject/entry.cpp +++ b/test/unit/bec.COMErrorObject/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.bec.COMErrorObject project. * * Created: 1st January 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -55,7 +55,7 @@ * macros */ -#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) XTESTS_TEST_INTEGER_EQUAL(static_cast(x), static_cast(y)) +#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) TEST_INT_EQ(static_cast(x), static_cast(y)) /* ///////////////////////////////////////////////////////////////////////// @@ -64,10 +64,10 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -142,7 +142,7 @@ static int main_(int argc, char* argv[]) if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.COMErrorObject", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.COMErrorObject", pantheios::getInitErrorString(res)); } else { @@ -163,7 +163,7 @@ static int main_(int argc, char* argv[]) { comstl::errorinfo_desc ed; - XTESTS_TEST_STRING_EQUAL(strings[j], ed); + TEST_STRING_EQ(strings[j], ed); } }} }} @@ -195,7 +195,7 @@ static int main_(int argc, char* argv[]) if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.COMErrorObject", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.COMErrorObject", pantheios::getInitErrorString(res)); } else { @@ -218,7 +218,7 @@ static int main_(int argc, char* argv[]) { comstl::errorinfo_desc ed; - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("the first string", ed); + TEST_MS_EQ("the first string", ed); } }} }} @@ -319,7 +319,7 @@ static void TEST_pantheios_be_COMErrorObject_WITH_ALL_STOCK_true() int const r = pantheios_be_COMErrorObject_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(13, r); + TEST_INT_EQ(13, r); pantheios_uint32_t expected = 0 /* stock */ @@ -339,7 +339,7 @@ static void TEST_pantheios_be_COMErrorObject_WITH_ALL_STOCK_true() // | PANTHEIOS_BE_COMERROROBJECT_F_DONT_OVERWRITE_EXISTING ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } static void TEST_pantheios_be_COMErrorObject_WITH_ALL_STOCK_false() @@ -388,7 +388,7 @@ static void TEST_pantheios_be_COMErrorObject_WITH_ALL_STOCK_false() int const r = pantheios_be_COMErrorObject_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(13, r); + TEST_INT_EQ(13, r); pantheios_uint32_t expected = 0 /* stock */ @@ -408,7 +408,7 @@ static void TEST_pantheios_be_COMErrorObject_WITH_ALL_STOCK_false() | PANTHEIOS_BE_COMERROROBJECT_F_DONT_OVERWRITE_EXISTING ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } } /* anonymous namespace */ diff --git a/test/unit/bec.WindowsConsole/entry.cpp b/test/unit/bec.WindowsConsole/entry.cpp index f021e558..1d8fbffa 100644 --- a/test/unit/bec.WindowsConsole/entry.cpp +++ b/test/unit/bec.WindowsConsole/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Unit-test for bec.WindowsConsole. * * Created: 25th January 2025 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -118,7 +118,7 @@ static void TEST_pantheios_be_WindowsConsole_WITH_ALL_STOCK_true() int const r = pantheios_be_WindowsConsole_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(15, r); + TEST_INT_EQ(15, r); pantheios_uint32_t expected = 0 /* stock */ @@ -140,7 +140,7 @@ static void TEST_pantheios_be_WindowsConsole_WITH_ALL_STOCK_true() | PANTHEIOS_BE_WINDOWSCONSOLE_F_RECOGNISE_16_SEVERITIES ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } static void TEST_pantheios_be_WindowsConsole_WITH_ALL_STOCK_false() @@ -191,7 +191,7 @@ static void TEST_pantheios_be_WindowsConsole_WITH_ALL_STOCK_false() int const r = pantheios_be_WindowsConsole_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(15, r); + TEST_INT_EQ(15, r); pantheios_uint32_t expected = 0 /* stock */ @@ -213,7 +213,7 @@ static void TEST_pantheios_be_WindowsConsole_WITH_ALL_STOCK_false() // | PANTHEIOS_BE_WINDOWSCONSOLE_F_RECOGNISE_16_SEVERITIES ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } diff --git a/test/unit/bec.WindowsSyslog/entry.cpp b/test/unit/bec.WindowsSyslog/entry.cpp index b1ab5a4a..a359ab6f 100644 --- a/test/unit/bec.WindowsSyslog/entry.cpp +++ b/test/unit/bec.WindowsSyslog/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.bec.WindowsSyslog project. * * Created: 17th October 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -111,15 +111,15 @@ static void test_getDefaultAppInit() pantheios_be_WindowsSyslog_getDefaultAppInit(&init); - XTESTS_TEST_INTEGER_EQUAL(0u, unsigned(init.flags)); - XTESTS_TEST_INTEGER_EQUAL(4u, init.addrSize); - XTESTS_TEST_INTEGER_EQUAL(255u, init.bytes[0]); - XTESTS_TEST_INTEGER_EQUAL(255u, init.bytes[1]); - XTESTS_TEST_INTEGER_EQUAL(255u, init.bytes[2]); - XTESTS_TEST_INTEGER_EQUAL(255u, init.bytes[3]); - XTESTS_TEST_POINTER_EQUAL(static_cast(NULL), init.hostName); - XTESTS_TEST_INTEGER_EQUAL(514u, init.port); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_SYSLOG_FAC_USER, init.facility); + TEST_INT_EQ(0u, unsigned(init.flags)); + TEST_INT_EQ(4u, init.addrSize); + TEST_INT_EQ(255u, init.bytes[0]); + TEST_INT_EQ(255u, init.bytes[1]); + TEST_INT_EQ(255u, init.bytes[2]); + TEST_INT_EQ(255u, init.bytes[3]); + TEST_PTR_EQ(static_cast(NULL), init.hostName); + TEST_INT_EQ(514u, init.port); + TEST_INT_EQ(PANTHEIOS_SYSLOG_FAC_USER, init.facility); } static void test_initialisation() @@ -138,13 +138,13 @@ static void test_initialisation() if (r < 0) { - XTESTS_TEST_FAIL_WITH_QUALIFIER("could not initialise bec.WindowsSyslog", winstl::t2m(pantheios::getStockSeverityString(r))); + TEST_FAIL_WITH_QUALIFIER("could not initialise bec.WindowsSyslog", winstl::t2m(pantheios::getStockSeverityString(r))); } else { stlsoft::scoped_handle scoper(token, pantheios_be_WindowsSyslog_uninit); - XTESTS_TEST_PASSED(); + TEST_PASSED(); } } @@ -164,7 +164,7 @@ static void test_1_2() if (r < 0) { - XTESTS_TEST_FAIL_WITH_QUALIFIER("could not initialise bec.WindowsSyslog", winstl::t2m(pantheios::getStockSeverityString(r))); + TEST_FAIL_WITH_QUALIFIER("could not initialise bec.WindowsSyslog", winstl::t2m(pantheios::getStockSeverityString(r))); } else { @@ -172,7 +172,7 @@ static void test_1_2() // TODO: create a listening thread, do the statements, stop the thread, verify the elements; - XTESTS_TEST_PASSED(); + TEST_PASSED(); } } @@ -230,7 +230,7 @@ static void TEST_pantheios_be_WindowsSyslog_WITH_ALL_STOCK_true() int const r = pantheios_be_WindowsSyslog_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(17, r); + TEST_INT_EQ(17, r); pantheios_uint32_t expected = 0 /* stock */ @@ -254,7 +254,7 @@ static void TEST_pantheios_be_WindowsSyslog_WITH_ALL_STOCK_true() | PANTHEIOS_BE_WINDOWSSYSLOG_F_NDELAY ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } static void TEST_pantheios_be_WindowsSyslog_WITH_ALL_STOCK_false() @@ -309,7 +309,7 @@ static void TEST_pantheios_be_WindowsSyslog_WITH_ALL_STOCK_false() int const r = pantheios_be_WindowsSyslog_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(17, r); + TEST_INT_EQ(17, r); pantheios_uint32_t expected = 0 /* stock */ @@ -333,7 +333,7 @@ static void TEST_pantheios_be_WindowsSyslog_WITH_ALL_STOCK_false() // | PANTHEIOS_BE_WINDOWSSYSLOG_F_NDELAY ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } } /* anonymous namespace */ diff --git a/test/unit/bec.fail/entry.c b/test/unit/bec.fail/entry.c index e486e6f1..faa23cd2 100644 --- a/test/unit/bec.fail/entry.c +++ b/test/unit/bec.fail/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.bec.fail project. * * Created: 27th January 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -46,8 +46,8 @@ int main(int argc, char* argv[]) void* token; int res = pantheios_be_fail_init(PANTHEIOS_FE_PROCESS_IDENTITY, 0, NULL, NULL, &token); - XTESTS_TEST_INTEGER_LESS(0, res); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); + TEST_INT_LT(0, res); + TEST_INT_EQ(PANTHEIOS_BE_INIT_RC_INTENDED_FAILURE, res); XTESTS_CASE_END("Test-1"); } diff --git a/test/unit/bec.file/entry.cpp b/test/unit/bec.file/entry.cpp index 58e4af67..5f7353ce 100644 --- a/test/unit/bec.file/entry.cpp +++ b/test/unit/bec.file/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Unit-tests for bec.file. * * Created: 19th January 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -24,7 +24,7 @@ #include /* xTests header files */ -#include +#include /* Standard C++ header files */ #include // for std::exception @@ -41,7 +41,7 @@ * macros */ -#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) XTESTS_TEST_INTEGER_EQUAL(static_cast(x), static_cast(y)) +#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) TEST_INT_EQ(static_cast(x), static_cast(y)) /* ///////////////////////////////////////////////////////////////////////// @@ -63,7 +63,7 @@ typedef std::basic_string string_t; #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ # define P_TO_M_(x) static_cast(stlsoft::w2m((x))) # define P_TO_W_(x) (x) @@ -72,7 +72,7 @@ typedef std::basic_string string_t; #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ # define P_TO_M_(x) (x) # define P_TO_W_(x) static_cast(stlsoft::m2w((x))) @@ -294,7 +294,7 @@ static void test_1_00() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -319,10 +319,10 @@ static void test_1_00() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); }} } } @@ -348,7 +348,7 @@ static void test_1_01() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -373,10 +373,10 @@ static void test_1_01() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); }} } } @@ -402,7 +402,7 @@ static void test_1_02() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -427,10 +427,10 @@ static void test_1_02() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); }} } } @@ -456,7 +456,7 @@ static void test_1_03() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -481,10 +481,10 @@ static void test_1_03() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); }} } } @@ -510,7 +510,7 @@ static void test_1_04() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -535,11 +535,11 @@ static void test_1_04() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -566,7 +566,7 @@ static void test_1_05() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -591,11 +591,11 @@ static void test_1_05() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -622,7 +622,7 @@ static void test_1_06() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -647,11 +647,11 @@ static void test_1_06() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -678,7 +678,7 @@ static void test_1_07() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -703,11 +703,11 @@ static void test_1_07() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -734,7 +734,7 @@ static void test_1_08() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -759,10 +759,10 @@ static void test_1_08() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); }} } } @@ -788,7 +788,7 @@ static void test_1_09() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -813,10 +813,10 @@ static void test_1_09() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); }} } } @@ -842,7 +842,7 @@ static void test_1_0a() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -867,10 +867,10 @@ static void test_1_0a() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); }} } } @@ -896,7 +896,7 @@ static void test_1_0b() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -921,10 +921,10 @@ static void test_1_0b() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); }} } } @@ -950,7 +950,7 @@ static void test_1_0c() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -975,11 +975,11 @@ static void test_1_0c() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1006,7 +1006,7 @@ static void test_1_0d() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1031,11 +1031,11 @@ static void test_1_0d() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1062,7 +1062,7 @@ static void test_1_0e() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1087,11 +1087,11 @@ static void test_1_0e() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1118,7 +1118,7 @@ static void test_1_0f() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1143,11 +1143,11 @@ static void test_1_0f() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_MULTIBYTE_STRING_EQUAL((resultPrefix + P_TO_M_(strings[i])), lines[i]); + TEST_MS_EQ((resultPrefix + P_TO_M_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1176,7 +1176,7 @@ static void test_2_00() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1201,10 +1201,10 @@ static void test_2_00() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); }} } } @@ -1230,7 +1230,7 @@ static void test_2_01() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1255,10 +1255,10 @@ static void test_2_01() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); }} } } @@ -1284,7 +1284,7 @@ static void test_2_02() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1309,10 +1309,10 @@ static void test_2_02() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); }} } } @@ -1338,7 +1338,7 @@ static void test_2_03() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1363,10 +1363,10 @@ static void test_2_03() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); }} } } @@ -1392,7 +1392,7 @@ static void test_2_04() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1417,11 +1417,11 @@ static void test_2_04() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1448,7 +1448,7 @@ static void test_2_05() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1473,11 +1473,11 @@ static void test_2_05() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1504,7 +1504,7 @@ static void test_2_06() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1529,11 +1529,11 @@ static void test_2_06() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1560,7 +1560,7 @@ static void test_2_07() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1585,11 +1585,11 @@ static void test_2_07() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1616,7 +1616,7 @@ static void test_2_08() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1641,10 +1641,10 @@ static void test_2_08() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); }} } } @@ -1670,7 +1670,7 @@ static void test_2_09() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1695,10 +1695,10 @@ static void test_2_09() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); }} } } @@ -1724,7 +1724,7 @@ static void test_2_0a() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1749,10 +1749,10 @@ static void test_2_0a() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); }} } } @@ -1778,7 +1778,7 @@ static void test_2_0b() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1803,10 +1803,10 @@ static void test_2_0b() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); }} } } @@ -1832,7 +1832,7 @@ static void test_2_0c() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1857,11 +1857,11 @@ static void test_2_0c() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1888,7 +1888,7 @@ static void test_2_0d() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1913,11 +1913,11 @@ static void test_2_0d() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -1944,7 +1944,7 @@ static void test_2_0e() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -1969,11 +1969,11 @@ static void test_2_0e() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -2000,7 +2000,7 @@ static void test_2_0f() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2025,11 +2025,11 @@ static void test_2_0f() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_WIDE_STRING_EQUAL((resultPrefix + P_TO_W_(strings[i])), lines[i]); + TEST_WS_EQ((resultPrefix + P_TO_W_(strings[i])), lines[i]); #endif /* 0 */ }} } @@ -2057,7 +2057,7 @@ static void test_3_00() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2082,10 +2082,10 @@ static void test_3_00() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); }} } } @@ -2110,7 +2110,7 @@ static void test_3_01() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2135,10 +2135,10 @@ static void test_3_01() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); }} } } @@ -2163,7 +2163,7 @@ static void test_3_02() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2188,10 +2188,10 @@ static void test_3_02() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL(resultPrefix + strings[i], lines[i]); + TEST_STRING_EQ(resultPrefix + strings[i], lines[i]); }} } } @@ -2216,7 +2216,7 @@ static void test_3_03() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2241,10 +2241,10 @@ static void test_3_03() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); }} } } @@ -2269,7 +2269,7 @@ static void test_3_04() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2294,11 +2294,11 @@ static void test_3_04() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); #endif /* 0 */ }} } @@ -2324,7 +2324,7 @@ static void test_3_05() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2349,11 +2349,11 @@ static void test_3_05() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); #endif /* 0 */ }} } @@ -2379,7 +2379,7 @@ static void test_3_06() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2404,11 +2404,11 @@ static void test_3_06() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); #endif /* 0 */ }} } @@ -2434,7 +2434,7 @@ static void test_3_07() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2459,11 +2459,11 @@ static void test_3_07() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); #endif /* 0 */ }} } @@ -2489,7 +2489,7 @@ static void test_3_08() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2514,10 +2514,10 @@ static void test_3_08() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); }} } } @@ -2542,7 +2542,7 @@ static void test_3_09() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2567,10 +2567,10 @@ static void test_3_09() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); }} } } @@ -2595,7 +2595,7 @@ static void test_3_0a() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2620,10 +2620,10 @@ static void test_3_0a() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); }} } } @@ -2648,7 +2648,7 @@ static void test_3_0b() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2673,10 +2673,10 @@ static void test_3_0b() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); }} } } @@ -2701,7 +2701,7 @@ static void test_3_0c() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2726,11 +2726,11 @@ static void test_3_0c() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); #endif /* 0 */ }} } @@ -2756,7 +2756,7 @@ static void test_3_0d() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2781,11 +2781,11 @@ static void test_3_0d() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); #endif /* 0 */ }} } @@ -2811,7 +2811,7 @@ static void test_3_0e() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2836,11 +2836,11 @@ static void test_3_0e() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); #endif /* 0 */ }} } @@ -2866,7 +2866,7 @@ static void test_3_0f() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2891,11 +2891,11 @@ static void test_3_0f() fs_traits_t::unlink_file(FILE_PATH); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), lines[i]); + TEST_STRING_EQ((resultPrefix + strings[i]), lines[i]); #endif /* 0 */ }} } @@ -2919,7 +2919,7 @@ static void test_4_00() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -2931,35 +2931,35 @@ static void test_4_00() { // (i) Writing something (none-0 length) pantheios_be_file_setFilePath(FILE_PATH); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); pantheios_be_file_logEntry(NULL, token, PANTHEIOS_SEV_EMERGENCY, PANTHEIOS_LITERAL_STRING("abc"), 3u); pantheios_be_file_setFilePath(NULL); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); } { // (i) Writing something (0 length) pantheios_be_file_setFilePath(FILE_PATH); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); pantheios_be_file_logEntry(NULL, token, PANTHEIOS_SEV_EMERGENCY, PANTHEIOS_LITERAL_STRING("abc"), 0u); pantheios_be_file_setFilePath(NULL); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); } { // (i) Writing nothing pantheios_be_file_setFilePath(FILE_PATH); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); pantheios_be_file_setFilePath(NULL); - XTESTS_TEST_BOOLEAN_FALSE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_FALSE(fs_traits_t::file_exists(FILE_PATH)); } @@ -2989,7 +2989,7 @@ static void test_4_01() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.file", pantheios::getInitErrorString(res)); } else { @@ -3001,35 +3001,35 @@ static void test_4_01() { // (i) Writing something (none-0 length) pantheios_be_file_setFilePath(FILE_PATH); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); pantheios_be_file_logEntry(NULL, token, PANTHEIOS_SEV_EMERGENCY, PANTHEIOS_LITERAL_STRING("abc"), 3u); pantheios_be_file_setFilePath(NULL); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); } { // (i) Writing something (0 length) pantheios_be_file_setFilePath(FILE_PATH); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); pantheios_be_file_logEntry(NULL, token, PANTHEIOS_SEV_EMERGENCY, PANTHEIOS_LITERAL_STRING("abc"), 0u); pantheios_be_file_setFilePath(NULL); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); } { // (i) Writing nothing pantheios_be_file_setFilePath(FILE_PATH); - XTESTS_TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_TRUE(fs_traits_t::file_exists(FILE_PATH)); pantheios_be_file_setFilePath(NULL); - XTESTS_TEST_BOOLEAN_FALSE(fs_traits_t::file_exists(FILE_PATH)); + TEST_BOOLEAN_FALSE(fs_traits_t::file_exists(FILE_PATH)); } @@ -3093,7 +3093,7 @@ static void TEST_pantheios_be_file_WITH_ALL_STOCK_true() int const r = pantheios_be_file_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - XTESTS_TEST_INTEGER_EQUAL(18, r); + TEST_INT_EQ(18, r); pantheios_uint32_t expected = 0 /* stock */ @@ -3118,7 +3118,7 @@ static void TEST_pantheios_be_file_WITH_ALL_STOCK_true() | PANTHEIOS_BE_FILE_F_DELETE_IF_EMPTY ; - XTESTS_TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } static void TEST_pantheios_be_file_WITH_ALL_STOCK_false() @@ -3175,7 +3175,7 @@ static void TEST_pantheios_be_file_WITH_ALL_STOCK_false() int const r = pantheios_be_file_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - XTESTS_TEST_INTEGER_EQUAL(18, r); + TEST_INT_EQ(18, r); pantheios_uint32_t expected = 0 /* stock */ @@ -3200,7 +3200,7 @@ static void TEST_pantheios_be_file_WITH_ALL_STOCK_false() // | PANTHEIOS_BE_FILE_F_DELETE_IF_EMPTY ; - XTESTS_TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } } /* anonymous namespace */ diff --git a/test/unit/bec.fprintf/entry.cpp b/test/unit/bec.fprintf/entry.cpp index 961c1a65..b89f3b2e 100644 --- a/test/unit/bec.fprintf/entry.cpp +++ b/test/unit/bec.fprintf/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.bec.fprintf project. * * Created: 3rd August 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -23,7 +23,7 @@ #include /* xTests header files */ -#include +#include /* Standard C++ header files */ #include // for std::exception @@ -52,7 +52,7 @@ namespace * macros */ -#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) XTESTS_TEST_INTEGER_EQUAL(static_cast(x), static_cast(y)) +#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) TEST_INT_EQ(static_cast(x), static_cast(y)) /* ///////////////////////////////////////////////////////////////////////// @@ -69,13 +69,13 @@ typedef platformstl::basic_file_lines lines_t; #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ # define PGET_(x) string_t(stlsoft::m2w(x).c_str()) #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ # define PGET_(x) (x) @@ -216,7 +216,7 @@ static void test_1_00() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -227,7 +227,7 @@ static void test_1_00() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -245,13 +245,13 @@ static void test_1_00() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); }} } } @@ -276,7 +276,7 @@ static void test_1_01() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -287,7 +287,7 @@ static void test_1_01() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -305,13 +305,13 @@ static void test_1_01() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); }} } } @@ -336,7 +336,7 @@ static void test_1_02() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -347,7 +347,7 @@ static void test_1_02() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -365,13 +365,13 @@ static void test_1_02() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL(resultPrefix + strings[i], PGET_(lines[i])); + TEST_STRING_EQ(resultPrefix + strings[i], PGET_(lines[i])); }} } } @@ -396,7 +396,7 @@ static void test_1_03() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -407,7 +407,7 @@ static void test_1_03() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -425,13 +425,13 @@ static void test_1_03() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); }} } } @@ -456,7 +456,7 @@ static void test_1_04() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -467,7 +467,7 @@ static void test_1_04() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -485,14 +485,14 @@ static void test_1_04() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); #endif /* 0 */ }} } @@ -518,7 +518,7 @@ static void test_1_05() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -529,7 +529,7 @@ static void test_1_05() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -547,14 +547,14 @@ static void test_1_05() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); #endif /* 0 */ }} } @@ -580,7 +580,7 @@ static void test_1_06() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -591,7 +591,7 @@ static void test_1_06() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -609,14 +609,14 @@ static void test_1_06() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); #endif /* 0 */ }} } @@ -642,7 +642,7 @@ static void test_1_07() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -653,7 +653,7 @@ static void test_1_07() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -671,14 +671,14 @@ static void test_1_07() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); #endif /* 0 */ }} } @@ -704,7 +704,7 @@ static void test_1_08() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -715,7 +715,7 @@ static void test_1_08() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -733,13 +733,13 @@ static void test_1_08() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); }} } } @@ -764,7 +764,7 @@ static void test_1_09() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -775,7 +775,7 @@ static void test_1_09() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -793,13 +793,13 @@ static void test_1_09() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); }} } } @@ -824,7 +824,7 @@ static void test_1_0a() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -835,7 +835,7 @@ static void test_1_0a() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -853,13 +853,13 @@ static void test_1_0a() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); }} } } @@ -884,7 +884,7 @@ static void test_1_0b() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -895,7 +895,7 @@ static void test_1_0b() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -913,13 +913,13 @@ static void test_1_0b() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); }} } } @@ -944,7 +944,7 @@ static void test_1_0c() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -955,7 +955,7 @@ static void test_1_0c() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -973,14 +973,14 @@ static void test_1_0c() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); #endif /* 0 */ }} } @@ -1006,7 +1006,7 @@ static void test_1_0d() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -1017,7 +1017,7 @@ static void test_1_0d() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -1035,14 +1035,14 @@ static void test_1_0d() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); #endif /* 0 */ }} } @@ -1068,7 +1068,7 @@ static void test_1_0e() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -1079,7 +1079,7 @@ static void test_1_0e() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -1097,14 +1097,14 @@ static void test_1_0e() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); #endif /* 0 */ }} } @@ -1130,7 +1130,7 @@ static void test_1_0f() if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise bec.fprintf", pantheios::getInitErrorString(res)); } else { @@ -1141,7 +1141,7 @@ static void test_1_0f() if (NULL == f) { - XTESTS_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); + TEST_FAIL_WITH_QUALIFIER("failed to reopen standard output stream", strerror(errno)); } else { @@ -1159,14 +1159,14 @@ static void test_1_0f() ::remove(STDERR_FILE_NAME); // Start the tests - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(STLSOFT_NUM_ELEMENTS(strings), lines.size())); + REQUIRE(TEST_INT_EQ(STLSOFT_NUM_ELEMENTS(strings), lines.size())); if (STLSOFT_NUM_ELEMENTS(strings) == lines.size()) { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { #if 0 - XTESTS_TEST_STRING_EQUAL((resultPrefix + strings[i]), PGET_(lines[i])); + TEST_STRING_EQ((resultPrefix + strings[i]), PGET_(lines[i])); #endif /* 0 */ }} } diff --git a/test/unit/bec.speech/entry.cpp b/test/unit/bec.speech/entry.cpp index 6793fcfa..297d0dbf 100644 --- a/test/unit/bec.speech/entry.cpp +++ b/test/unit/bec.speech/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Unit-test for bec.speech. * * Created: 25th January 2025 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -121,7 +121,7 @@ static void TEST_pantheios_be_speech_WITH_ALL_STOCK_true() int const r = pantheios_be_speech_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(16, r); + TEST_INT_EQ(16, r); pantheios_uint32_t expected = 0 /* stock */ @@ -145,7 +145,7 @@ static void TEST_pantheios_be_speech_WITH_ALL_STOCK_true() // | PANTHEIOS_BE_SPEECH_F_UNINIT_DISCARD_WORKAROUND ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } static void TEST_pantheios_be_speech_WITH_ALL_STOCK_false() @@ -199,7 +199,7 @@ static void TEST_pantheios_be_speech_WITH_ALL_STOCK_false() int const r = pantheios_be_speech_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(16, r); + TEST_INT_EQ(16, r); pantheios_uint32_t expected = 0 /* stock */ @@ -223,7 +223,7 @@ static void TEST_pantheios_be_speech_WITH_ALL_STOCK_false() // // | PANTHEIOS_BE_SPEECH_F_UNINIT_DISCARD_WORKAROUND ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } diff --git a/test/unit/bec.syslog/entry.cpp b/test/unit/bec.syslog/entry.cpp index d111e61c..b44538f8 100644 --- a/test/unit/bec.syslog/entry.cpp +++ b/test/unit/bec.syslog/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Unit-test for bec.syslog. * * Created: 24th January 2025 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -120,7 +120,7 @@ static void TEST_pantheios_be_syslog_WITH_ALL_STOCK_true() int const r = pantheios_be_syslog_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(16, r); + TEST_INT_EQ(16, r); pantheios_uint32_t expected = 0 /* stock */ @@ -143,7 +143,7 @@ static void TEST_pantheios_be_syslog_WITH_ALL_STOCK_true() | PANTHEIOS_BE_SYSLOG_F_NDELAY ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } static void TEST_pantheios_be_syslog_WITH_ALL_STOCK_false() @@ -196,7 +196,7 @@ static void TEST_pantheios_be_syslog_WITH_ALL_STOCK_false() int const r = pantheios_be_syslog_parseArgs(STLSOFT_NUM_ELEMENTS(args), args, &init); - TEST_INTEGER_EQUAL(16, r); + TEST_INT_EQ(16, r); pantheios_uint32_t expected = 0 /* stock */ @@ -219,7 +219,7 @@ static void TEST_pantheios_be_syslog_WITH_ALL_STOCK_false() // | PANTHEIOS_BE_SYSLOG_F_NDELAY ; - TEST_INTEGER_EQUAL(expected, init.flags); + TEST_INT_EQ(expected, init.flags); } diff --git a/test/unit/fe.N/entry.c b/test/unit/fe.N/entry.c index bb777c60..95ef4c2c 100644 --- a/test/unit/fe.N/entry.c +++ b/test/unit/fe.N/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.fe.N project. * * Created: 24th August 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -21,7 +21,7 @@ */ /* xTests header files */ -#include +#include /* STLSoft header files */ #include @@ -144,13 +144,13 @@ static void test_empty_array_with_negative_default_ceiling(void) if (0 != res) { - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); } else { { size_t i; for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); + TEST_INT_EQ(severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); }} pantheios_fe_uninit(token); @@ -180,13 +180,13 @@ static void test_empty_array_with_EMERGENCY_default_ceiling(void) if (0 != res) { - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); } else { { size_t i; for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); + TEST_INT_EQ(severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); }} pantheios_fe_uninit(token); @@ -216,13 +216,13 @@ static void test_empty_array_with_ALERT_default_ceiling(void) if (0 != res) { - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); } else { { size_t i; for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); + TEST_INT_EQ(severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); }} pantheios_fe_uninit(token); @@ -278,23 +278,23 @@ static void test_array_with_one_specific_id(void) if (0 != res) { - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); } else { { size_t i; for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults_for_all[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); + TEST_INT_EQ(severityLevelResults_for_all[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); { int id; for (id = 1; id != 1000000; ++id) { switch (id) { case BACKEND_0_ID: - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults_for_0[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); + TEST_INT_EQ(severityLevelResults_for_0[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); break; default: - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults_for_N[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); + TEST_INT_EQ(severityLevelResults_for_N[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); break; } }} @@ -381,29 +381,29 @@ static void test_array_with_three_specific_ids(void) if (0 != res) { - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", pantheios_getInitCodeString(res)); } else { { size_t i; for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults_for_all[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); + TEST_INT_EQ(severityLevelResults_for_all[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); { int id; for (id = 1; id != 1000000; ++id) { switch (id) { case BACKEND_0_ID: - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults_for_0[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); + TEST_INT_EQ(severityLevelResults_for_0[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); break; case BACKEND_1_ID: - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults_for_1[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); + TEST_INT_EQ(severityLevelResults_for_1[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); break; case BACKEND_2_ID: - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults_for_2[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); + TEST_INT_EQ(severityLevelResults_for_2[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); break; default: - XTESTS_TEST_INTEGER_EQUAL(severityLevelResults_for_N[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); + TEST_INT_EQ(severityLevelResults_for_N[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], id)); break; } }} diff --git a/test/unit/fe.WindowsRegistry/entry.cpp b/test/unit/fe.WindowsRegistry/entry.cpp index a0c54f7f..a6187da1 100644 --- a/test/unit/fe.WindowsRegistry/entry.cpp +++ b/test/unit/fe.WindowsRegistry/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.fe.WindowsRegistry project. * * Created: 14th May 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ #include /* stlsoft::integer_to_string */ @@ -34,17 +34,17 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ -#ifndef XTESTS_TEST_NOTICE -# define XTESTS_TEST_NOTICE(x) ::OutputDebugString(PANTHEIOS_LITERAL_STRING(x)) -#endif // XTESTS_TEST_NOTICE +#ifndef DEBUG_LOG_NOTICE +# define DEBUG_LOG_NOTICE(x) ::OutputDebugString(PANTHEIOS_LITERAL_STRING(x)) +#endif // DEBUG_LOG_NOTICE #ifdef PSTR # undef PSTR @@ -331,7 +331,7 @@ static void test_can_init() ensure_HKCU(0, 0, 0); if (!delete_HKLM()) { - XTESTS_TEST_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); + DEBUG_LOG_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); return; } @@ -341,17 +341,17 @@ static void test_can_init() res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS != res) { char num[21]; - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); } else { - XTESTS_TEST_PASSED(); + TEST_PASSED(); pantheios_fe_uninit(token); } @@ -363,7 +363,7 @@ static void test_cannot_init() delete_HKCU(); if (!delete_HKLM()) { - XTESTS_TEST_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); + DEBUG_LOG_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); return; } @@ -373,15 +373,15 @@ static void test_cannot_init() res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_NOT_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_NE(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS != res) { - XTESTS_TEST_PASSED(); + TEST_PASSED(); } else { - XTESTS_TEST_FAIL("unexpectedly able to initialise front-end"); + TEST_FAIL("unexpectedly able to initialise front-end"); pantheios_fe_uninit(token); } @@ -393,7 +393,7 @@ static void test_levels_in_HKCU() ensure_HKCU(0xff, 0x3f, -1); if (!delete_HKLM()) { - XTESTS_TEST_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); + DEBUG_LOG_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); return; } @@ -422,24 +422,24 @@ static void test_levels_in_HKCU() res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS != res) { char num[21]; - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); } else { - XTESTS_TEST_PASSED(); + TEST_PASSED(); // Now verify the levels { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { int b = pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0); - XTESTS_TEST_INTEGER_EQUAL(s_severityLevelResults[i], b); + TEST_INT_EQ(s_severityLevelResults[i], b); }} pantheios_fe_uninit(token); @@ -452,7 +452,7 @@ static void test_levels_in_HKLM() delete_HKCU(); if (!ensure_HKLM(0xff, 0x3f, -1)) { - XTESTS_TEST_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); + DEBUG_LOG_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); return; } @@ -481,24 +481,24 @@ static void test_levels_in_HKLM() res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS != res) { char num[21]; - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); } else { - XTESTS_TEST_PASSED(); + TEST_PASSED(); // Now verify the levels { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { int b = pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0); - XTESTS_TEST_INTEGER_EQUAL(s_severityLevelResults[i], b); + TEST_INT_EQ(s_severityLevelResults[i], b); }} pantheios_fe_uninit(token); @@ -511,7 +511,7 @@ static void test_HKCU_overrides_HKLM() ensure_HKCU(0xff, 0x3f, -1); if (!ensure_HKLM(0, 0, 0)) { - XTESTS_TEST_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); + DEBUG_LOG_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); return; } @@ -540,24 +540,24 @@ static void test_HKCU_overrides_HKLM() res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS != res) { char num[21]; - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); } else { - XTESTS_TEST_PASSED(); + TEST_PASSED(); // Now verify the levels { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { int b = pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0); - XTESTS_TEST_INTEGER_EQUAL(s_severityLevelResults[i], b); + TEST_INT_EQ(s_severityLevelResults[i], b); }} pantheios_fe_uninit(token); @@ -571,7 +571,7 @@ static void test_star() ensure_HKCU(-1, -1, 0x0f); if (!delete_HKLM()) { - XTESTS_TEST_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); + DEBUG_LOG_NOTICE("could not change HKEY_LOCAL_MACHINE, so skipping test case"); return; } @@ -595,24 +595,24 @@ static void test_star() res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS != res) { char num[21]; - XTESTS_TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); + TEST_FAIL_WITH_QUALIFIER("failed to initialise front-end", stlsoft::integer_to_string(&num[0], STLSOFT_NUM_ELEMENTS(num), res)); } else { - XTESTS_TEST_PASSED(); + TEST_PASSED(); // Now verify the levels { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { int b = pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0); - XTESTS_TEST_INTEGER_EQUAL(s_severityLevelResults[i], b); + TEST_INT_EQ(s_severityLevelResults[i], b); }} pantheios_fe_uninit(token); @@ -625,7 +625,7 @@ static void test_cleanup() delete_HKCU(); delete_HKLM(); - XTESTS_TEST_PASSED(); + TEST_PASSED(); } diff --git a/test/unit/fe.all/entry.c b/test/unit/fe.all/entry.c index 4c4d947b..7bb51739 100644 --- a/test/unit/fe.all/entry.c +++ b/test/unit/fe.all/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.fe.all project. * * Created: 14th May 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -26,11 +26,11 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -91,7 +91,7 @@ int main(int argc, char* argv[]) res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS == res) { @@ -112,7 +112,7 @@ int main(int argc, char* argv[]) if (PANTHEIOS_INIT_RC_SUCCESS == res) { - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_FE_PROCESS_IDENTITY, pantheios_fe_getProcessIdentity(token)); + TEST_STRING_EQ(PANTHEIOS_FE_PROCESS_IDENTITY, pantheios_fe_getProcessIdentity(token)); pantheios_fe_uninit(token); } @@ -134,7 +134,7 @@ int main(int argc, char* argv[]) { size_t i; for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(s_severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); + TEST_INT_EQ(s_severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); }} pantheios_fe_uninit(token); diff --git a/test/unit/fe.fail/entry.c b/test/unit/fe.fail/entry.c index 49726aa0..9a816a4c 100644 --- a/test/unit/fe.fail/entry.c +++ b/test/unit/fe.fail/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.fe.fail project. * * Created: 14th May 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -38,8 +38,8 @@ int main(int argc, char* argv[]) res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_LESS(0, res); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_FE_INIT_RC_INTENDED_FAILURE, res); + TEST_INT_LT(0, res); + TEST_INT_EQ(PANTHEIOS_FE_INIT_RC_INTENDED_FAILURE, res); XTESTS_CASE_END("Test-1"); } diff --git a/test/unit/fe.null/entry.c b/test/unit/fe.null/entry.c index 746a813b..2a94d846 100644 --- a/test/unit/fe.null/entry.c +++ b/test/unit/fe.null/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.fe.null project. * * Created: 14th May 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -26,11 +26,11 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -91,7 +91,7 @@ int main(int argc, char* argv[]) res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS == res) { @@ -112,7 +112,7 @@ int main(int argc, char* argv[]) if (PANTHEIOS_INIT_RC_SUCCESS == res) { - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_FE_PROCESS_IDENTITY, pantheios_fe_getProcessIdentity(token)); + TEST_STRING_EQ(PANTHEIOS_FE_PROCESS_IDENTITY, pantheios_fe_getProcessIdentity(token)); pantheios_fe_uninit(token); } @@ -134,7 +134,7 @@ int main(int argc, char* argv[]) { size_t i; for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(s_severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); + TEST_INT_EQ(s_severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); }} pantheios_fe_uninit(token); diff --git a/test/unit/fe.simple/entry.c b/test/unit/fe.simple/entry.c index 64a70676..87f2286f 100644 --- a/test/unit/fe.simple/entry.c +++ b/test/unit/fe.simple/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.fe.simple project. * * Created: 14th May 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -26,11 +26,11 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -96,7 +96,7 @@ int main(int argc, char* argv[]) res = pantheios_fe_init(NULL, &token); - XTESTS_TEST_INTEGER_EQUAL(PANTHEIOS_INIT_RC_SUCCESS, res); + TEST_INT_EQ(PANTHEIOS_INIT_RC_SUCCESS, res); if (PANTHEIOS_INIT_RC_SUCCESS == res) { @@ -117,7 +117,7 @@ int main(int argc, char* argv[]) if (PANTHEIOS_INIT_RC_SUCCESS == res) { - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_FE_PROCESS_IDENTITY, pantheios_fe_getProcessIdentity(token)); + TEST_STRING_EQ(PANTHEIOS_FE_PROCESS_IDENTITY, pantheios_fe_getProcessIdentity(token)); pantheios_fe_uninit(token); } @@ -139,7 +139,7 @@ int main(int argc, char* argv[]) { size_t i; for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(s_severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); + TEST_INT_EQ(s_severityLevelResults[i], pantheios_fe_isSeverityLogged(token, s_severityLevels[i], 0)); }} pantheios_fe_uninit(token); diff --git a/test/unit/getversion/entry.c b/test/unit/getversion/entry.c index 642a4ad3..d8b71d02 100644 --- a/test/unit/getversion/entry.c +++ b/test/unit/getversion/entry.c @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.getversion project. * * Created: 28th August 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -22,7 +22,6 @@ /* xTests header files */ #include -#include /* STLSoft header files */ #include diff --git a/test/unit/inserters/integer/entry.cpp b/test/unit/inserters/integer/entry.cpp index 93a9f716..b1c92bd9 100644 --- a/test/unit/inserters/integer/entry.cpp +++ b/test/unit/inserters/integer/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.inserter.integer project. * * Created: 21st December 2010 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -15,7 +15,7 @@ #include -#include +#include #include @@ -45,11 +45,11 @@ static void test_1_06(); #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -88,33 +88,33 @@ namespace static void test_1_01() { - XTESTS_TEST_STRING_EQUAL(PSTR("0"), pantheios::integer(0)); + TEST_STRING_EQ(PSTR("0"), pantheios::integer(0)); } static void test_1_02() { - XTESTS_TEST_STRING_EQUAL(PSTR("-1"), pantheios::integer(-1)); - XTESTS_TEST_STRING_EQUAL(PSTR( "1"), pantheios::integer(+1)); + TEST_STRING_EQ(PSTR("-1"), pantheios::integer(-1)); + TEST_STRING_EQ(PSTR( "1"), pantheios::integer(+1)); } static void test_1_03() { - XTESTS_TEST_STRING_EQUAL(PSTR("-1"), pantheios::integer(-1, 0, 0)); - XTESTS_TEST_STRING_EQUAL(PSTR( "1"), pantheios::integer(+1, 0, 0)); + TEST_STRING_EQ(PSTR("-1"), pantheios::integer(-1, 0, 0)); + TEST_STRING_EQ(PSTR( "1"), pantheios::integer(+1, 0, 0)); } static void test_1_04() { - XTESTS_TEST_STRING_EQUAL(PSTR("+0"), pantheios::integer( 0, 0, pantheios::fmt::showPlus)); - XTESTS_TEST_STRING_EQUAL(PSTR("-1"), pantheios::integer(-1, 0, pantheios::fmt::showPlus)); - XTESTS_TEST_STRING_EQUAL(PSTR("+1"), pantheios::integer(+1, 0, pantheios::fmt::showPlus)); + TEST_STRING_EQ(PSTR("+0"), pantheios::integer( 0, 0, pantheios::fmt::showPlus)); + TEST_STRING_EQ(PSTR("-1"), pantheios::integer(-1, 0, pantheios::fmt::showPlus)); + TEST_STRING_EQ(PSTR("+1"), pantheios::integer(+1, 0, pantheios::fmt::showPlus)); } static void test_1_06() { - XTESTS_TEST_STRING_EQUAL(PSTR("-1"), pantheios::integer(-1)); -// XTESTS_TEST_STRING_EQUAL(PSTR("+1"), pantheios::integer(+1)); + TEST_STRING_EQ(PSTR("-1"), pantheios::integer(-1)); +// TEST_STRING_EQ(PSTR("+1"), pantheios::integer(+1)); } diff --git a/test/unit/inserters/m2w/entry.cpp b/test/unit/inserters/m2w/entry.cpp index 0c72b53e..a09d76cc 100644 --- a/test/unit/inserters/m2w/entry.cpp +++ b/test/unit/inserters/m2w/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.inserter.m2w project. * * Created: 22nd November 2010 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -19,7 +19,7 @@ #include -#include +#include #include #include @@ -85,7 +85,7 @@ static void test_1_01() { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_WIDE_STRING_EQUAL(stlsoft::m2w(strings[i]), pantheios::m2w(strings[i])); + TEST_WS_EQ(stlsoft::m2w(strings[i]), pantheios::m2w(strings[i])); }} } diff --git a/test/unit/inserters/stream_character/entry.cpp b/test/unit/inserters/stream_character/entry.cpp index dc83dde1..88adb431 100644 --- a/test/unit/inserters/stream_character/entry.cpp +++ b/test/unit/inserters/stream_character/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.inserter.stream_character project. * * Created: 9th May 2014 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -15,7 +15,7 @@ #include -#include +#include #include @@ -41,10 +41,10 @@ namespace #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -92,7 +92,7 @@ static void test_type_exists() { STLSOFT_SUPPRESS_UNUSED(typeid(pantheios::stream_character)); - XTESTS_TEST_PASSED(); + TEST_PASSED(); } static void test_plain_characters() @@ -104,46 +104,46 @@ static void test_plain_characters() PAN_CHAR_T ch = plain_characters[i]; PAN_CHAR_T sz[2] = { ch, '\0' }; - XTESTS_TEST_STRING_EQUAL(sz, pantheios::stream_character(ch)); + TEST_STRING_EQ(sz, pantheios::stream_character(ch)); }} } static void test_special_characters_1() { - XTESTS_TEST_STRING_EQUAL(PSTR("NUL"), pantheios::stream_character(0)); - XTESTS_TEST_STRING_EQUAL(PSTR("SOH"), pantheios::stream_character(1)); - XTESTS_TEST_STRING_EQUAL(PSTR("STX"), pantheios::stream_character(2)); - XTESTS_TEST_STRING_EQUAL(PSTR("ETX"), pantheios::stream_character(3)); - XTESTS_TEST_STRING_EQUAL(PSTR("EOT"), pantheios::stream_character(4)); - XTESTS_TEST_STRING_EQUAL(PSTR("ENQ"), pantheios::stream_character(5)); - XTESTS_TEST_STRING_EQUAL(PSTR("ACK"), pantheios::stream_character(6)); - XTESTS_TEST_STRING_EQUAL(PSTR("BEL"), pantheios::stream_character(7)); - XTESTS_TEST_STRING_EQUAL(PSTR("BS"), pantheios::stream_character(8)); - XTESTS_TEST_STRING_EQUAL(PSTR("HT"), pantheios::stream_character(9)); - XTESTS_TEST_STRING_EQUAL(PSTR("LF"), pantheios::stream_character(10)); - XTESTS_TEST_STRING_EQUAL(PSTR("VT"), pantheios::stream_character(11)); - XTESTS_TEST_STRING_EQUAL(PSTR("FF"), pantheios::stream_character(12)); - XTESTS_TEST_STRING_EQUAL(PSTR("CR"), pantheios::stream_character(13)); - XTESTS_TEST_STRING_EQUAL(PSTR("SO"), pantheios::stream_character(14)); - XTESTS_TEST_STRING_EQUAL(PSTR("SI"), pantheios::stream_character(15)); - XTESTS_TEST_STRING_EQUAL(PSTR("DLE"), pantheios::stream_character(16)); - XTESTS_TEST_STRING_EQUAL(PSTR("DC1"), pantheios::stream_character(17)); - XTESTS_TEST_STRING_EQUAL(PSTR("DC2"), pantheios::stream_character(18)); - XTESTS_TEST_STRING_EQUAL(PSTR("DC3"), pantheios::stream_character(19)); - XTESTS_TEST_STRING_EQUAL(PSTR("DC4"), pantheios::stream_character(20)); - XTESTS_TEST_STRING_EQUAL(PSTR("NAK"), pantheios::stream_character(21)); - XTESTS_TEST_STRING_EQUAL(PSTR("SYN"), pantheios::stream_character(22)); - XTESTS_TEST_STRING_EQUAL(PSTR("ETB"), pantheios::stream_character(23)); - XTESTS_TEST_STRING_EQUAL(PSTR("CAN"), pantheios::stream_character(24)); - XTESTS_TEST_STRING_EQUAL(PSTR("EM"), pantheios::stream_character(25)); - XTESTS_TEST_STRING_EQUAL(PSTR("SUB"), pantheios::stream_character(26)); - XTESTS_TEST_STRING_EQUAL(PSTR("ESC"), pantheios::stream_character(27)); - XTESTS_TEST_STRING_EQUAL(PSTR("FS"), pantheios::stream_character(28)); - XTESTS_TEST_STRING_EQUAL(PSTR("GS"), pantheios::stream_character(29)); - XTESTS_TEST_STRING_EQUAL(PSTR("RS"), pantheios::stream_character(30)); - XTESTS_TEST_STRING_EQUAL(PSTR("US"), pantheios::stream_character(31)); - - XTESTS_TEST_STRING_EQUAL(PSTR("DEL"), pantheios::stream_character(127)); + TEST_STRING_EQ(PSTR("NUL"), pantheios::stream_character(0)); + TEST_STRING_EQ(PSTR("SOH"), pantheios::stream_character(1)); + TEST_STRING_EQ(PSTR("STX"), pantheios::stream_character(2)); + TEST_STRING_EQ(PSTR("ETX"), pantheios::stream_character(3)); + TEST_STRING_EQ(PSTR("EOT"), pantheios::stream_character(4)); + TEST_STRING_EQ(PSTR("ENQ"), pantheios::stream_character(5)); + TEST_STRING_EQ(PSTR("ACK"), pantheios::stream_character(6)); + TEST_STRING_EQ(PSTR("BEL"), pantheios::stream_character(7)); + TEST_STRING_EQ(PSTR("BS"), pantheios::stream_character(8)); + TEST_STRING_EQ(PSTR("HT"), pantheios::stream_character(9)); + TEST_STRING_EQ(PSTR("LF"), pantheios::stream_character(10)); + TEST_STRING_EQ(PSTR("VT"), pantheios::stream_character(11)); + TEST_STRING_EQ(PSTR("FF"), pantheios::stream_character(12)); + TEST_STRING_EQ(PSTR("CR"), pantheios::stream_character(13)); + TEST_STRING_EQ(PSTR("SO"), pantheios::stream_character(14)); + TEST_STRING_EQ(PSTR("SI"), pantheios::stream_character(15)); + TEST_STRING_EQ(PSTR("DLE"), pantheios::stream_character(16)); + TEST_STRING_EQ(PSTR("DC1"), pantheios::stream_character(17)); + TEST_STRING_EQ(PSTR("DC2"), pantheios::stream_character(18)); + TEST_STRING_EQ(PSTR("DC3"), pantheios::stream_character(19)); + TEST_STRING_EQ(PSTR("DC4"), pantheios::stream_character(20)); + TEST_STRING_EQ(PSTR("NAK"), pantheios::stream_character(21)); + TEST_STRING_EQ(PSTR("SYN"), pantheios::stream_character(22)); + TEST_STRING_EQ(PSTR("ETB"), pantheios::stream_character(23)); + TEST_STRING_EQ(PSTR("CAN"), pantheios::stream_character(24)); + TEST_STRING_EQ(PSTR("EM"), pantheios::stream_character(25)); + TEST_STRING_EQ(PSTR("SUB"), pantheios::stream_character(26)); + TEST_STRING_EQ(PSTR("ESC"), pantheios::stream_character(27)); + TEST_STRING_EQ(PSTR("FS"), pantheios::stream_character(28)); + TEST_STRING_EQ(PSTR("GS"), pantheios::stream_character(29)); + TEST_STRING_EQ(PSTR("RS"), pantheios::stream_character(30)); + TEST_STRING_EQ(PSTR("US"), pantheios::stream_character(31)); + + TEST_STRING_EQ(PSTR("DEL"), pantheios::stream_character(127)); } } /* anonymous namespace */ diff --git a/test/unit/inserters/w2m/entry.cpp b/test/unit/inserters/w2m/entry.cpp index 48fc3d35..c297de8d 100644 --- a/test/unit/inserters/w2m/entry.cpp +++ b/test/unit/inserters/w2m/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.inserter.w2m project. * * Created: 21st December 2010 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -19,7 +19,7 @@ #include -#include +#include #include #include @@ -85,7 +85,7 @@ static void test_1_01() { { for (size_t i = 0; i != STLSOFT_NUM_ELEMENTS(strings); ++i) { - XTESTS_TEST_MULTIBYTE_STRING_EQUAL(stlsoft::w2m(strings[i]), pantheios::w2m(strings[i])); + TEST_MS_EQ(stlsoft::w2m(strings[i]), pantheios::w2m(strings[i])); }} } diff --git a/test/unit/inserters/windows/sc/entry.cpp b/test/unit/inserters/windows/sc/entry.cpp index b90379de..7a00baae 100644 --- a/test/unit/inserters/windows/sc/entry.cpp +++ b/test/unit/inserters/windows/sc/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.inserters.windows.sc project. * * Created: 5th April 2014 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -16,7 +16,7 @@ #include -#include +#include #include @@ -51,10 +51,10 @@ PANTHEIOS_EXTERN PAN_CHAR_T const PANTHEIOS_FE_PROCESS_IDENTITY[] = PANTHEIOS_LI #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -2346,7 +2346,7 @@ static void test_regular_decimal_codes_DWORD() { DWORD const code = static_cast(regular_decimal_codes[i]); - XTESTS_TEST_STRING_EQUAL(pantheios::integer(code), pantheios::windows::sc(code)); + TEST_STRING_EQ(pantheios::integer(code), pantheios::windows::sc(code)); }} } @@ -2357,7 +2357,7 @@ static void test_highbit_hexadecimal_codes_DWORD() { DWORD const code = static_cast(highbit_hexadecimal_codes[i]); - XTESTS_TEST_STRING_EQUAL(pantheios::integer(code, 8, pantheios::fmt::fullHex), pantheios::windows::sc(code)); + TEST_STRING_EQ(pantheios::integer(code, 8, pantheios::fmt::fullHex), pantheios::windows::sc(code)); }} } @@ -2368,7 +2368,7 @@ static void test_1_07() { DWORD const code = static_cast(WSA_decimal_codes[i]); - XTESTS_TEST_STRING_EQUAL(pantheios::integer(code), pantheios::windows::sc(code)); + TEST_STRING_EQ(pantheios::integer(code), pantheios::windows::sc(code)); }} } diff --git a/test/unit/levels/dynamic_initialisation/entry.cpp b/test/unit/levels/dynamic_initialisation/entry.cpp index ee2bf47d..ac48efca 100644 --- a/test/unit/levels/dynamic_initialisation/entry.cpp +++ b/test/unit/levels/dynamic_initialisation/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.levels.dynamic_initialisation project. * * Created: 20th October 2007 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -40,7 +40,7 @@ class DynamicInit #include /* xTests header files */ -#include +#include /* Standard C++ header files */ #include // for std::exception @@ -56,7 +56,7 @@ class DynamicInit * macros */ -#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) XTESTS_TEST_INTEGER_EQUAL(static_cast(x), static_cast(y)) +#define PANTHEIOS_SEV_LEVELS_EQUAL(x, y) TEST_INT_EQ(static_cast(x), static_cast(y)) /* ///////////////////////////////////////////////////////////////////////// diff --git a/test/unit/levels/values/entry.c b/test/unit/levels/values/entry.c index 827277d3..9360e29b 100644 --- a/test/unit/levels/values/entry.c +++ b/test/unit/levels/values/entry.c @@ -4,14 +4,14 @@ * Purpose: Implementation file for the test.unit.levels.values project. * * Created: 29th November 2007 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ #include -#include +#include #include /* for STLSOFT_NUM_ELEMENTS */ @@ -61,7 +61,7 @@ int main(int argc, char* argv[]) for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(s_severityLevels[i], s_severityLevelValues[i]); + TEST_INT_EQ(s_severityLevels[i], s_severityLevelValues[i]); } XTESTS_CASE_END("Test-1"); @@ -74,7 +74,7 @@ int main(int argc, char* argv[]) for (i = 0; i != STLSOFT_NUM_ELEMENTS(s_severityLevels); ++i) { - XTESTS_TEST_INTEGER_EQUAL(s_severityLevels[i], s_severityLevelValues[i]); + TEST_INT_EQ(s_severityLevels[i], s_severityLevelValues[i]); } XTESTS_CASE_END("Test-2"); diff --git a/test/unit/util/date_elements_to_string/entry.cpp b/test/unit/util/date_elements_to_string/entry.cpp index a1a8101a..ea8bd335 100644 --- a/test/unit/util/date_elements_to_string/entry.cpp +++ b/test/unit/util/date_elements_to_string/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Unit-tests for date component formatting functions. * * Created: 13th November 2016 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -17,7 +17,7 @@ #include -#include +#include #include @@ -33,12 +33,12 @@ #ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL -# define XTESTS_TEST_STRING_EQUAL_N XTESTS_TEST_WIDE_STRING_EQUAL_N +# define TEST_STRING_EQ TEST_WS_EQ +# define TEST_STRING_EQ_N TEST_WS_EQ_N #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL -# define XTESTS_TEST_STRING_EQUAL_N XTESTS_TEST_MULTIBYTE_STRING_EQUAL_N +# define TEST_STRING_EQ TEST_MS_EQ +# define TEST_STRING_EQ_N TEST_MS_EQ_N #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -139,7 +139,7 @@ static void test_formatYearToString2_01() pantheios_util_formatYearToString4(0, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("0000"), sz, 4); + TEST_STRING_EQ_N(PSTR("0000"), sz, 4); } static void test_formatYearToString2_02() @@ -154,7 +154,7 @@ static void test_formatYearToString2_02() pantheios_util_snprintf(expected, STLSOFT_NUM_ELEMENTS(expected), PSTR("%04d"), year); - XTESTS_TEST_STRING_EQUAL_N(expected, sz, 4); + TEST_STRING_EQ_N(expected, sz, 4); } } @@ -164,7 +164,7 @@ static void test_formatYearToString2_03() pantheios_util_formatYearToString4(10000, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("??00"), sz, 4); + TEST_STRING_EQ_N(PSTR("??00"), sz, 4); for (unsigned year = 10001; year != 12800; ++year) { @@ -174,7 +174,7 @@ static void test_formatYearToString2_03() pantheios_util_snprintf(expected, STLSOFT_NUM_ELEMENTS(expected), PSTR("??%02d"), year % 100); - XTESTS_TEST_STRING_EQUAL_N(expected, sz, 4); + TEST_STRING_EQ_N(expected, sz, 4); } } @@ -185,7 +185,7 @@ static void test_formatMonthToString2_01() pantheios_util_formatMonthToString2(0, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("00"), sz, 2); + TEST_STRING_EQ_N(PSTR("00"), sz, 2); } static void test_formatMonthToString2_02() @@ -200,7 +200,7 @@ static void test_formatMonthToString2_02() pantheios_util_snprintf(expected, STLSOFT_NUM_ELEMENTS(expected), PSTR("%02d"), month); - XTESTS_TEST_STRING_EQUAL_N(expected, sz, 2); + TEST_STRING_EQ_N(expected, sz, 2); } } @@ -210,19 +210,19 @@ static void test_formatMonthToString2_03() pantheios_util_formatMonthToString2(13, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("13"), sz, 2); + TEST_STRING_EQ_N(PSTR("13"), sz, 2); pantheios_util_formatMonthToString2(14, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("14"), sz, 2); + TEST_STRING_EQ_N(PSTR("14"), sz, 2); pantheios_util_formatMonthToString2(15, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("15"), sz, 2); + TEST_STRING_EQ_N(PSTR("15"), sz, 2); pantheios_util_formatMonthToString2(16, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("00"), sz, 2); + TEST_STRING_EQ_N(PSTR("00"), sz, 2); } @@ -232,7 +232,7 @@ static void test_formatDayToString2_01() pantheios_util_formatDayToString2(0, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("00"), sz, 2); + TEST_STRING_EQ_N(PSTR("00"), sz, 2); } static void test_formatDayToString2_02() @@ -247,7 +247,7 @@ static void test_formatDayToString2_02() pantheios_util_snprintf(expected, STLSOFT_NUM_ELEMENTS(expected), PSTR("%02d"), month); - XTESTS_TEST_STRING_EQUAL_N(expected, sz, 2); + TEST_STRING_EQ_N(expected, sz, 2); } } @@ -257,11 +257,11 @@ static void test_formatDayToString2_03() pantheios_util_formatDayToString2(32, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("00"), sz, 2); + TEST_STRING_EQ_N(PSTR("00"), sz, 2); pantheios_util_formatDayToString2(33, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("01"), sz, 2); + TEST_STRING_EQ_N(PSTR("01"), sz, 2); } @@ -271,7 +271,7 @@ static void test_formatHourToString2_01() pantheios_util_formatHourToString2(0, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("00"), sz, 2); + TEST_STRING_EQ_N(PSTR("00"), sz, 2); } static void test_formatHourToString2_02() @@ -286,7 +286,7 @@ static void test_formatHourToString2_02() pantheios_util_snprintf(expected, STLSOFT_NUM_ELEMENTS(expected), PSTR("%02d"), hour); - XTESTS_TEST_STRING_EQUAL_N(expected, sz, 2); + TEST_STRING_EQ_N(expected, sz, 2); } } @@ -296,39 +296,39 @@ static void test_formatHourToString2_03() pantheios_util_formatHourToString2(24, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("24"), sz, 2); + TEST_STRING_EQ_N(PSTR("24"), sz, 2); pantheios_util_formatHourToString2(25, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("25"), sz, 2); + TEST_STRING_EQ_N(PSTR("25"), sz, 2); pantheios_util_formatHourToString2(26, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("26"), sz, 2); + TEST_STRING_EQ_N(PSTR("26"), sz, 2); pantheios_util_formatHourToString2(27, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("27"), sz, 2); + TEST_STRING_EQ_N(PSTR("27"), sz, 2); pantheios_util_formatHourToString2(28, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("28"), sz, 2); + TEST_STRING_EQ_N(PSTR("28"), sz, 2); pantheios_util_formatHourToString2(29, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("29"), sz, 2); + TEST_STRING_EQ_N(PSTR("29"), sz, 2); pantheios_util_formatHourToString2(30, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("30"), sz, 2); + TEST_STRING_EQ_N(PSTR("30"), sz, 2); pantheios_util_formatHourToString2(31, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("31"), sz, 2); + TEST_STRING_EQ_N(PSTR("31"), sz, 2); pantheios_util_formatHourToString2(32, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("00"), sz, 2); + TEST_STRING_EQ_N(PSTR("00"), sz, 2); } @@ -338,7 +338,7 @@ static void test_formatMinuteOrSecondToString2_01() pantheios_util_formatMinuteOrSecondToString2(0, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("00"), sz, 2); + TEST_STRING_EQ_N(PSTR("00"), sz, 2); } static void test_formatMinuteOrSecondToString2_02() @@ -353,7 +353,7 @@ static void test_formatMinuteOrSecondToString2_02() pantheios_util_snprintf(expected, STLSOFT_NUM_ELEMENTS(expected), PSTR("%02d"), minuteOrSecond); - XTESTS_TEST_STRING_EQUAL_N(expected, sz, 2); + TEST_STRING_EQ_N(expected, sz, 2); } } @@ -363,23 +363,23 @@ static void test_formatMinuteOrSecondToString2_03() pantheios_util_formatMinuteOrSecondToString2(60, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("60"), sz, 2); + TEST_STRING_EQ_N(PSTR("60"), sz, 2); pantheios_util_formatMinuteOrSecondToString2(61, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("61"), sz, 2); + TEST_STRING_EQ_N(PSTR("61"), sz, 2); pantheios_util_formatMinuteOrSecondToString2(62, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("62"), sz, 2); + TEST_STRING_EQ_N(PSTR("62"), sz, 2); pantheios_util_formatMinuteOrSecondToString2(63, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("63"), sz, 2); + TEST_STRING_EQ_N(PSTR("63"), sz, 2); pantheios_util_formatMinuteOrSecondToString2(64, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("00"), sz, 2); + TEST_STRING_EQ_N(PSTR("00"), sz, 2); } @@ -389,7 +389,7 @@ static void test_formatMillisecondToString3_01() pantheios_util_formatMillisecondToString3(0, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("000"), sz, 3); + TEST_STRING_EQ_N(PSTR("000"), sz, 3); } static void test_formatMillisecondToString3_02() @@ -404,7 +404,7 @@ static void test_formatMillisecondToString3_02() pantheios_util_snprintf(expected, STLSOFT_NUM_ELEMENTS(expected), PSTR("%03d"), microsecond); - XTESTS_TEST_STRING_EQUAL_N(expected, sz, 3); + TEST_STRING_EQ_N(expected, sz, 3); } } @@ -414,31 +414,31 @@ static void test_formatMillisecondToString3_03() pantheios_util_formatMillisecondToString3(1001, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("001"), sz, 3); + TEST_STRING_EQ_N(PSTR("001"), sz, 3); pantheios_util_formatMillisecondToString3(1234, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("234"), sz, 3); + TEST_STRING_EQ_N(PSTR("234"), sz, 3); pantheios_util_formatMillisecondToString3(12345, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("345"), sz, 3); + TEST_STRING_EQ_N(PSTR("345"), sz, 3); pantheios_util_formatMillisecondToString3(123456, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("456"), sz, 3); + TEST_STRING_EQ_N(PSTR("456"), sz, 3); pantheios_util_formatMillisecondToString3(1234567, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("567"), sz, 3); + TEST_STRING_EQ_N(PSTR("567"), sz, 3); pantheios_util_formatMillisecondToString3(12345678, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("678"), sz, 3); + TEST_STRING_EQ_N(PSTR("678"), sz, 3); pantheios_util_formatMillisecondToString3(123456789, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("789"), sz, 3); + TEST_STRING_EQ_N(PSTR("789"), sz, 3); } @@ -448,7 +448,7 @@ static void test_formatMicrosecondToString6_01() pantheios_util_formatMicrosecondToString6(0, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("000000"), sz, 6); + TEST_STRING_EQ_N(PSTR("000000"), sz, 6); } static void test_formatMicrosecondToString6_02() @@ -463,7 +463,7 @@ static void test_formatMicrosecondToString6_02() pantheios_util_snprintf(expected, STLSOFT_NUM_ELEMENTS(expected), PSTR("%06d"), microsecond); - XTESTS_TEST_STRING_EQUAL_N(expected, sz, 6); + TEST_STRING_EQ_N(expected, sz, 6); } } @@ -473,11 +473,11 @@ static void test_formatMicrosecondToString6_03() pantheios_util_formatMicrosecondToString6(1000001, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("000001"), sz, 6); + TEST_STRING_EQ_N(PSTR("000001"), sz, 6); pantheios_util_formatMicrosecondToString6(1234567890, &sz); - XTESTS_TEST_STRING_EQUAL_N(PSTR("567890"), sz, 6); + TEST_STRING_EQ_N(PSTR("567890"), sz, 6); } @@ -518,7 +518,7 @@ static void test_date_formatting_01() sz[19] = '\0'; - XTESTS_TEST_STRING_EQUAL(PSTR("2016-11-13 13:45:23"), sz); + TEST_STRING_EQ(PSTR("2016-11-13 13:45:23"), sz); } diff --git a/test/unit/util/getcurrenttime/entry.cpp b/test/unit/util/getcurrenttime/entry.cpp index abe2d309..26f492fb 100644 --- a/test/unit/util/getcurrenttime/entry.cpp +++ b/test/unit/util/getcurrenttime/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Unit-testing of `pantheios_util_getCurrentTime()` * * Created: 10th November 2007 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -32,7 +32,7 @@ #include /* xTests header files */ -#include +#include /* shwild header files */ #include diff --git a/test/unit/util/gethostname/entry.cpp b/test/unit/util/gethostname/entry.cpp index 3d209337..db0ac9ff 100644 --- a/test/unit/util/gethostname/entry.cpp +++ b/test/unit/util/gethostname/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.util.gethostname project. * * Created: 14th April 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -12,7 +12,7 @@ #include /* xTests header files */ -#include +#include /* Pantheios header files */ #include // Pantheios C++ main header @@ -55,13 +55,13 @@ typedef std::basic_string string_t; # define pantheios_GetComputerName_ ::GetComputerNameW -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ #else /* ? PANTHEIOS_USE_WIDE_STRINGS */ # define pantheios_GetComputerName_ ::GetComputerNameA -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -120,17 +120,17 @@ static void test_1_01() { // The function did not have enough space to write in, so it // will return the length passed to it ... - XTESTS_TEST_INTEGER_EQUAL(i, len); + TEST_INT_EQ(i, len); // ... and will not have written anything to the file - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING(""), hostname); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING(""), hostname); } else { // The function had enough space, so it will return the length // of the intended hostname ... - XTESTS_TEST_INTEGER_EQUAL(hid.size(), len); + TEST_INT_EQ(hid.size(), len); // ... and will have written the hostname - XTESTS_TEST_STRING_EQUAL(hid, hostname); + TEST_STRING_EQ(hid, hostname); } }} } @@ -147,9 +147,9 @@ static void test_1_02() // The function had enough space, so it will return the length // of the intended hostname ... - XTESTS_TEST_INTEGER_EQUAL(hid.size(), len); + TEST_INT_EQ(hid.size(), len); // ... and will have written the hostname - XTESTS_TEST_STRING_EQUAL(hid, hostname.data()); + TEST_STRING_EQ(hid, hostname.data()); }} } diff --git a/test/unit/util/onbailout/entry.cpp b/test/unit/util/onbailout/entry.cpp index d05d4966..92657bb9 100644 --- a/test/unit/util/onbailout/entry.cpp +++ b/test/unit/util/onbailout/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.util.onbailout project. * * Created: 29th April 2008 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -29,7 +29,7 @@ #include #include -#include +#include #include @@ -62,11 +62,11 @@ #if _XTESTS_VER < 0x00150000 -# define XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern, value) \ +# define TEST_MS_MATCHES(pattern, value) \ \ ((0 == shwild::match(pattern, stlsoft::c_str_ptr(value), 0)) \ - ? XTESTS_TEST_PASSED() \ - : XTESTS_TEST_FAIL_WITH_QUALIFIER(std::string("the actual value did not match the pattern '") + pattern + "'", value)) + ? TEST_PASSED() \ + : TEST_FAIL_WITH_QUALIFIER(std::string("the actual value did not match the pattern '") + pattern + "'", value)) #endif #ifdef PANTHEIOS_USE_WIDE_STRINGS @@ -94,11 +94,11 @@ namespace { } /* anonymous namespace */ -#define XTESTS_TEST_WIDE_STRING_MATCHES(pattern, value) \ +#define TEST_WS_MATCHES(pattern, value) \ \ ((0 == shwild_match_w(pattern, value, 0)) \ - ? XTESTS_TEST_PASSED() \ - : XTESTS_TEST_FAIL_WITH_QUALIFIER(winstl::w2m(std::wstring(L"the actual value did not match the pattern '") + pattern + L"'"), winstl::w2m(value))) + ? TEST_PASSED() \ + : TEST_FAIL_WITH_QUALIFIER(winstl::w2m(std::wstring(L"the actual value did not match the pattern '") + pattern + L"'"), winstl::w2m(value))) #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -325,23 +325,23 @@ static void test_unused_receiver() receiver.Clear(); #ifdef TEST_ODS_ - XTESTS_TEST_INTEGER_EQUAL(0u, receiver.OutputDebugStringResults.size()); + TEST_INT_EQ(0u, receiver.OutputDebugStringResults.size()); #endif #ifdef TEST_CONSOLE_ - XTESTS_TEST_INTEGER_EQUAL(0u, receiver.ConsoleResults.size()); + TEST_INT_EQ(0u, receiver.ConsoleResults.size()); #endif #ifdef TEST_LBT_ - XTESTS_TEST_INTEGER_EQUAL(0u, receiver.LoggingBailoutTxtResults.size()); + TEST_INT_EQ(0u, receiver.LoggingBailoutTxtResults.size()); #endif #if TEST_EVLOG_ - XTESTS_TEST_INTEGER_EQUAL(0u, receiver.EventLogResults.size()); + TEST_INT_EQ(0u, receiver.EventLogResults.size()); #endif #if TEST_SYSLOG_ - XTESTS_TEST_INTEGER_EQUAL(0u, receiver.SyslogResults.size()); + TEST_INT_EQ(0u, receiver.SyslogResults.size()); #endif /* PLATFORMSTL_OS_IS_UNIX */ } @@ -355,28 +355,28 @@ static void test_pantheios_onBailOut3() pantheios_onBailOut3(PANTHEIOS_SEV_DEBUG, message, "process-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ } @@ -399,28 +399,28 @@ static void test_pantheios_onBailOut4() pantheios_onBailOut4(PANTHEIOS_SEV_DEBUG, message, "process-#1", NULL); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_no_qual, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_no_qual, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_no_qual, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_no_qual, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_no_qual, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_no_qual, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_no_qual, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_no_qual, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_no_qual, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_no_qual, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -429,28 +429,28 @@ static void test_pantheios_onBailOut4() pantheios_onBailOut4(PANTHEIOS_SEV_DEBUG, message, "process-#1", qualifier_1); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_1, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_qual_1, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_1, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_qual_1, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_1, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_qual_1, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_1, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_qual_1, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_1, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_qual_1, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -459,28 +459,28 @@ static void test_pantheios_onBailOut4() pantheios_onBailOut4(PANTHEIOS_SEV_DEBUG, message, "process-#1", qualifier_2); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_2, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_qual_2, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_2, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_qual_2, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_2, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_qual_2, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_2, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_qual_2, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_qual_2, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_qual_2, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ } @@ -498,28 +498,28 @@ static void test_pantheios_onBailOut6() pantheios_onBailOut6(PANTHEIOS_SEV_DEBUG, message, "process-#1", "qual-#1", NULL, NULL); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_none, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_none, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_none, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_none, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_none, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_none, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_none, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_none, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_none, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_none, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -528,28 +528,28 @@ static void test_pantheios_onBailOut6() pantheios_onBailOut6(PANTHEIOS_SEV_DEBUG, message, "process-#1", "qual-#1", "fe-#1", NULL); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_fe, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_fe, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_fe, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_fe, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_fe, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_fe, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_fe, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_fe, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_fe, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_fe, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -558,28 +558,28 @@ static void test_pantheios_onBailOut6() pantheios_onBailOut6(PANTHEIOS_SEV_DEBUG, message, "process-#1", "qual-#1", NULL, "be-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_be, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_be, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_be, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_be, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_be, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_be, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_be, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_be, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_be, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_be, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -588,28 +588,28 @@ static void test_pantheios_onBailOut6() pantheios_onBailOut6(PANTHEIOS_SEV_DEBUG, message, "process-#1", "qual-#1", "fe-#1", "be-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_febe, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_febe, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_febe, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_febe, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_febe, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_febe, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_febe, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_febe, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_febe, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_febe, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ } @@ -627,28 +627,28 @@ static void test_pantheios_onBailOut6_too_long() pantheios_onBailOut6(PANTHEIOS_SEV_DEBUG, message, "process-#1", "qual-#1", "fe-#1", "be-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_short, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_short, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_short, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_short, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_short, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_short, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_short, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_short, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_short, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_short, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -657,28 +657,28 @@ static void test_pantheios_onBailOut6_too_long() pantheios_onBailOut6(PANTHEIOS_SEV_DEBUG, message, "process-#1", "a-longish-qualifier-#1", "a-longish-front-end-#1", "a-longish-back-end-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_1, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_medium_1, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_1, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_medium_1, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_1, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_medium_1, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_1, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_medium_1, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_1, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_medium_1, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -687,28 +687,28 @@ static void test_pantheios_onBailOut6_too_long() pantheios_onBailOut6(PANTHEIOS_SEV_DEBUG, message, "process-#1", "a-fair-bit-more-than-fairish-amount-longer-qualifier-#1", "a-fair-bit-more-than-fairish-amount-longer-front-end-#1", "a-fair-bit-more-than-fairish-amount-longer-back-end-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_2, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_medium_2, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_2, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_medium_2, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_2, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_medium_2, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_2, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_medium_2, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_medium_2, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_medium_2, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -717,28 +717,28 @@ static void test_pantheios_onBailOut6_too_long() pantheios_onBailOut6(PANTHEIOS_SEV_DEBUG, message, "process-#1", "a-much-much-much-much-much-much-much-much-longer-qualifier-#1", "a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-name-for-a-front-end-#1", "a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-name-for-a-back-end-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.OutputDebugStringResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_long, receiver.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.OutputDebugStringResults.size())); + TEST_MS_MATCHES(pattern_long, receiver.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.ConsoleResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_long, receiver.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.ConsoleResults.size())); + TEST_MS_MATCHES(pattern_long, receiver.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.LoggingBailoutTxtResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_long, receiver.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.LoggingBailoutTxtResults.size())); + TEST_MS_MATCHES(pattern_long, receiver.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.EventLogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_long, receiver.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.EventLogResults.size())); + TEST_MS_MATCHES(pattern_long, receiver.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver.SyslogResults.size())); - XTESTS_TEST_MULTIBYTE_STRING_MATCHES(pattern_long, receiver.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver.SyslogResults.size())); + TEST_MS_MATCHES(pattern_long, receiver.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ } @@ -755,28 +755,28 @@ static void test_pantheios_onBailOut3_w() pantheios_onBailOut3_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern, receiver_w.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); + TEST_WS_MATCHES(pattern, receiver_w.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern, receiver_w.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); + TEST_WS_MATCHES(pattern, receiver_w.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ } @@ -799,28 +799,28 @@ static void test_pantheios_onBailOut4_w() pantheios_onBailOut4_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1", NULL); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_no_qual, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern_no_qual, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_no_qual, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern_no_qual, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_no_qual, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern_no_qual, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_no_qual, receiver_w.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); + TEST_WS_MATCHES(pattern_no_qual, receiver_w.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_no_qual, receiver_w.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); + TEST_WS_MATCHES(pattern_no_qual, receiver_w.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -829,28 +829,28 @@ static void test_pantheios_onBailOut4_w() pantheios_onBailOut4_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1", qualifier_1); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_1, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern_qual_1, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_1, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern_qual_1, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_1, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern_qual_1, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_1, receiver_w.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); + TEST_WS_MATCHES(pattern_qual_1, receiver_w.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_1, receiver_w.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); + TEST_WS_MATCHES(pattern_qual_1, receiver_w.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -859,28 +859,28 @@ static void test_pantheios_onBailOut4_w() pantheios_onBailOut4_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1", qualifier_2); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_2, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern_qual_2, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_2, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern_qual_2, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_2, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern_qual_2, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_2, receiver_w.EventLogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); + TEST_WS_MATCHES(pattern_qual_2, receiver_w.EventLogResults[0].message); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_qual_2, receiver_w.SyslogResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); + TEST_WS_MATCHES(pattern_qual_2, receiver_w.SyslogResults[0].message); #endif /* PLATFORMSTL_OS_IS_UNIX */ } @@ -899,26 +899,26 @@ static void test_pantheios_onBailOut6_w() pantheios_onBailOut6_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1", NULL, NULL, NULL); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_noqual, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern_noqual, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_noqual, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern_noqual, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_noqual, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern_noqual, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -927,26 +927,26 @@ static void test_pantheios_onBailOut6_w() pantheios_onBailOut6_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1", L"qual-#1", NULL, NULL); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_none, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern_none, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_none, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern_none, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_none, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern_none, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -955,26 +955,26 @@ static void test_pantheios_onBailOut6_w() pantheios_onBailOut6_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1", L"qual-#1", L"fe-#1", NULL); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_fe, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern_fe, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_fe, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern_fe, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_fe, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern_fe, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -983,26 +983,26 @@ static void test_pantheios_onBailOut6_w() pantheios_onBailOut6_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1", L"qual-#1", NULL, L"be-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_be, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern_be, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_be, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern_be, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_be, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern_be, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); #endif /* PLATFORMSTL_OS_IS_UNIX */ @@ -1011,26 +1011,26 @@ static void test_pantheios_onBailOut6_w() pantheios_onBailOut6_w(PANTHEIOS_SEV_DEBUG, message, L"process-#1", L"qual-#1", L"fe-#1", L"be-#1"); #ifdef TEST_ODS_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.OutputDebugStringResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_febe, receiver_w.OutputDebugStringResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.OutputDebugStringResults.size())); + TEST_WS_MATCHES(pattern_febe, receiver_w.OutputDebugStringResults[0].message); #endif #ifdef TEST_CONSOLE_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.ConsoleResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_febe, receiver_w.ConsoleResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.ConsoleResults.size())); + TEST_WS_MATCHES(pattern_febe, receiver_w.ConsoleResults[0].message); #endif #ifdef TEST_LBT_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.LoggingBailoutTxtResults.size())); - XTESTS_TEST_WIDE_STRING_MATCHES(pattern_febe, receiver_w.LoggingBailoutTxtResults[0].message); + REQUIRE(TEST_INT_EQ(1u, receiver_w.LoggingBailoutTxtResults.size())); + TEST_WS_MATCHES(pattern_febe, receiver_w.LoggingBailoutTxtResults[0].message); #endif #if TEST_EVLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.EventLogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.EventLogResults.size())); #endif #if TEST_SYSLOG_ - XTESTS_REQUIRE(XTESTS_TEST_INTEGER_EQUAL(1u, receiver_w.SyslogResults.size())); + REQUIRE(TEST_INT_EQ(1u, receiver_w.SyslogResults.size())); #endif /* PLATFORMSTL_OS_IS_UNIX */ } #endif /* PANTHEIOS_USE_WIDE_STRINGS */ diff --git a/test/unit/util/parse_args/entry.cpp b/test/unit/util/parse_args/entry.cpp index 6d5cf63e..75553f3c 100644 --- a/test/unit/util/parse_args/entry.cpp +++ b/test/unit/util/parse_args/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Unit-test for argument parsing functions. * * Created: 24th January 2025 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -120,9 +120,9 @@ static void TEST_pantheios_be_parseBooleanArg_NO_ARGS() int const r = pantheios_be_parseBooleanArg(0, args, "verbose", false, 0x01, &flags); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(0, flags); + TEST_INT_EQ(0, flags); } static void TEST_pantheios_be_parseBooleanArg_EMPTY_ARG() @@ -136,9 +136,9 @@ static void TEST_pantheios_be_parseBooleanArg_EMPTY_ARG() int const r = pantheios_be_parseBooleanArg(STLSOFT_NUM_ELEMENTS(args), args, "verbose", false, 0x01, &flags); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(0, flags); + TEST_INT_EQ(0, flags); } static void TEST_pantheios_be_parseBooleanArg_NO_MATCHING_ARGS() @@ -152,9 +152,9 @@ static void TEST_pantheios_be_parseBooleanArg_NO_MATCHING_ARGS() int const r = pantheios_be_parseBooleanArg(STLSOFT_NUM_ELEMENTS(args), args, "verbose", false, 0x01, &flags); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(0, flags); + TEST_INT_EQ(0, flags); } static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_ONLY() @@ -168,13 +168,13 @@ static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_ONLY() int const r = pantheios_be_parseBooleanArg(STLSOFT_NUM_ELEMENTS(args), args, "verbose", false, 0x01, &flags); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(0x00, flags); + TEST_INT_EQ(0x00, flags); // NOTE: current functionality is to ignore if not provided with a '=', but there's an argument to default this to true ... - // TEST_INTEGER_EQUAL(1, r); - // TEST_INTEGER_EQUAL(0x01, flags); + // TEST_INT_EQ(1, r); + // TEST_INT_EQ(0x01, flags); } static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_AND_EMPTY_VALUE() @@ -188,9 +188,9 @@ static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_AND_EMP int const r = pantheios_be_parseBooleanArg(STLSOFT_NUM_ELEMENTS(args), args, "verbose", false, 0x01, &flags); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(0x00, flags); + TEST_INT_EQ(0x00, flags); } static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_AND_true_VALUE() @@ -206,9 +206,9 @@ static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_AND_tru int const r = pantheios_be_parseBooleanArg(STLSOFT_NUM_ELEMENTS(args), args, "verbose", false, 0x01, &flags); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(0x01, flags); + TEST_INT_EQ(0x01, flags); } // suppressive @@ -224,9 +224,9 @@ static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_AND_tru int const r = pantheios_be_parseBooleanArg(STLSOFT_NUM_ELEMENTS(args), args, "verbose", true, 0x01, &flags); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(0x00, flags); + TEST_INT_EQ(0x00, flags); } } @@ -243,9 +243,9 @@ static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_AND_fal int const r = pantheios_be_parseBooleanArg(STLSOFT_NUM_ELEMENTS(args), args, "verbose", false, 0x01, &flags); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(0x00, flags); + TEST_INT_EQ(0x00, flags); } // suppressive @@ -261,9 +261,9 @@ static void TEST_pantheios_be_parseBooleanArg_ONE_MATCHING_ARG_WITH_NAME_AND_fal int const r = pantheios_be_parseBooleanArg(STLSOFT_NUM_ELEMENTS(args), args, "verbose", true, 0x01, &flags); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(0xf1, flags); + TEST_INT_EQ(0xf1, flags); } } @@ -279,10 +279,10 @@ static void TEST_pantheios_be_parseStringArg_NO_ARGS() int const r = pantheios_be_parseStringArg(0, args, "processName", &value); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(4, value.len); - TEST_MULTIBYTE_STRING_EQUAL("four", value.ptr); + TEST_INT_EQ(4, value.len); + TEST_MS_EQ("four", value.ptr); } static void TEST_pantheios_be_parseStringArg_EMPTY_ARG() @@ -296,10 +296,10 @@ static void TEST_pantheios_be_parseStringArg_EMPTY_ARG() int const r = pantheios_be_parseStringArg(STLSOFT_NUM_ELEMENTS(args), args, "processName", &value); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(4, value.len); - TEST_MULTIBYTE_STRING_EQUAL("four", value.ptr); + TEST_INT_EQ(4, value.len); + TEST_MS_EQ("four", value.ptr); } static void TEST_pantheios_be_parseStringArg_NO_MATCHING_ARGS() @@ -314,10 +314,10 @@ static void TEST_pantheios_be_parseStringArg_NO_MATCHING_ARGS() int const r = pantheios_be_parseStringArg(STLSOFT_NUM_ELEMENTS(args), args, "processName", &value); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(4, value.len); - TEST_MULTIBYTE_STRING_EQUAL("four", value.ptr); + TEST_INT_EQ(4, value.len); + TEST_MS_EQ("four", value.ptr); } static void TEST_pantheios_be_parseStringArg_ONE_MATCHING_ARG_WITH_NAME_ONLY() @@ -333,10 +333,10 @@ static void TEST_pantheios_be_parseStringArg_ONE_MATCHING_ARG_WITH_NAME_ONLY() int const r = pantheios_be_parseStringArg(STLSOFT_NUM_ELEMENTS(args), args, "processName", &value); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(0, value.len); - TEST_POINTER_NOT_EQUAL(NULL, value.ptr); + TEST_INT_EQ(0, value.len); + TEST_PTR_NE(NULL, value.ptr); } static void TEST_pantheios_be_parseStringArg_ONE_MATCHING_ARG_WITH_EMPTY_VALUE() @@ -352,10 +352,10 @@ static void TEST_pantheios_be_parseStringArg_ONE_MATCHING_ARG_WITH_EMPTY_VALUE() int const r = pantheios_be_parseStringArg(STLSOFT_NUM_ELEMENTS(args), args, "processName", &value); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(0, value.len); - TEST_POINTER_NOT_EQUAL(NULL, value.ptr); + TEST_INT_EQ(0, value.len); + TEST_PTR_NE(NULL, value.ptr); } static void TEST_pantheios_be_parseStringArg_ONE_MATCHING_ARG_WITH_VALUE() @@ -371,10 +371,10 @@ static void TEST_pantheios_be_parseStringArg_ONE_MATCHING_ARG_WITH_VALUE() int const r = pantheios_be_parseStringArg(STLSOFT_NUM_ELEMENTS(args), args, "processName", &value); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(5, value.len); - TEST_MULTIBYTE_STRING_EQUAL("tuupa", value.ptr); + TEST_INT_EQ(5, value.len); + TEST_MS_EQ("tuupa", value.ptr); } static void TEST_pantheios_be_parseStringArg_TWO_MATCHING_ARGS() @@ -391,10 +391,10 @@ static void TEST_pantheios_be_parseStringArg_TWO_MATCHING_ARGS() int const r = pantheios_be_parseStringArg(STLSOFT_NUM_ELEMENTS(args), args, "processName", &value); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(5, value.len); - TEST_MULTIBYTE_STRING_EQUAL("tuupa", value.ptr); + TEST_INT_EQ(5, value.len); + TEST_MS_EQ("tuupa", value.ptr); } @@ -410,9 +410,9 @@ static void TEST_pantheios_be_parseStockArgs_NO_ARGS() int const r = pantheios_be_parseStockArgs(0, args, &flags); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(0, flags); + TEST_INT_EQ(0, flags); } static void TEST_pantheios_be_parseStockArgs_EMPTY_ARG() @@ -426,9 +426,9 @@ static void TEST_pantheios_be_parseStockArgs_EMPTY_ARG() int const r = pantheios_be_parseStockArgs(STLSOFT_NUM_ELEMENTS(args), args, &flags); - TEST_INTEGER_EQUAL(0, r); + TEST_INT_EQ(0, r); - TEST_INTEGER_EQUAL(0, flags); + TEST_INT_EQ(0, flags); } static void TEST_pantheios_be_parseStockArgs_WITH_processId() @@ -443,9 +443,9 @@ static void TEST_pantheios_be_parseStockArgs_WITH_processId() int const r = pantheios_be_parseStockArgs(STLSOFT_NUM_ELEMENTS(args), args, &flags); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(0, flags); + TEST_INT_EQ(0, flags); } { @@ -458,9 +458,9 @@ static void TEST_pantheios_be_parseStockArgs_WITH_processId() int const r = pantheios_be_parseStockArgs(STLSOFT_NUM_ELEMENTS(args), args, &flags); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(0, flags); + TEST_INT_EQ(0, flags); } { @@ -473,9 +473,9 @@ static void TEST_pantheios_be_parseStockArgs_WITH_processId() int const r = pantheios_be_parseStockArgs(STLSOFT_NUM_ELEMENTS(args), args, &flags); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(PANTHEIOS_BE_INIT_F_NO_PROCESS_ID, flags); + TEST_INT_EQ(PANTHEIOS_BE_INIT_F_NO_PROCESS_ID, flags); } { @@ -488,9 +488,9 @@ static void TEST_pantheios_be_parseStockArgs_WITH_processId() int const r = pantheios_be_parseStockArgs(STLSOFT_NUM_ELEMENTS(args), args, &flags); - TEST_INTEGER_EQUAL(1, r); + TEST_INT_EQ(1, r); - TEST_INTEGER_EQUAL(PANTHEIOS_BE_INIT_F_NO_PROCESS_ID, flags); + TEST_INT_EQ(PANTHEIOS_BE_INIT_F_NO_PROCESS_ID, flags); } } @@ -530,7 +530,7 @@ static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_true() int const r = pantheios_be_parseStockArgs(STLSOFT_NUM_ELEMENTS(args), args, &flags); - TEST_INTEGER_EQUAL(12, r); + TEST_INT_EQ(12, r); pantheios_uint32_t expected = 0 // | PANTHEIOS_BE_INIT_F_NO_PROCESS_ID @@ -547,7 +547,7 @@ static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_true() | PANTHEIOS_BE_INIT_F_NUMERIC_SEVERITY ; - TEST_INTEGER_EQUAL(expected, flags); + TEST_INT_EQ(expected, flags); } static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_false() @@ -586,7 +586,7 @@ static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_false() int const r = pantheios_be_parseStockArgs(STLSOFT_NUM_ELEMENTS(args), args, &flags); - TEST_INTEGER_EQUAL(12, r); + TEST_INT_EQ(12, r); pantheios_uint32_t expected = 0 | PANTHEIOS_BE_INIT_F_NO_PROCESS_ID @@ -603,7 +603,7 @@ static void TEST_pantheios_be_parseStockArgs_WITH_ALL_STOCK_false() // | PANTHEIOS_BE_INIT_F_NUMERIC_SEVERITY ; - TEST_INTEGER_EQUAL(expected, flags); + TEST_INT_EQ(expected, flags); } diff --git a/test/unit/util/snprintf/entry.cpp b/test/unit/util/snprintf/entry.cpp index e3e9ee3c..d85c58f0 100644 --- a/test/unit/util/snprintf/entry.cpp +++ b/test/unit/util/snprintf/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.util.snprintf project. * * Created: 19th June 2020 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include @@ -85,13 +85,13 @@ namespace using ::pantheios::pantheios_util_snprintf_w; #endif /* PANTHEIOS_USE_WIDE_STRINGS */ -#ifndef XTESTS_TEST_STRING_EQUAL +#ifndef TEST_STRING_EQ # ifdef PANTHEIOS_USE_WIDE_STRINGS -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_WIDE_STRING_EQUAL +# define TEST_STRING_EQ TEST_WS_EQ # else -# define XTESTS_TEST_STRING_EQUAL XTESTS_TEST_MULTIBYTE_STRING_EQUAL +# define TEST_STRING_EQ TEST_MS_EQ # endif #endif @@ -109,7 +109,7 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), ""); - XTESTS_TEST_INTEGER_EQUAL(0u, n); + TEST_INT_EQ(0u, n); } { @@ -117,7 +117,7 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), "%s", ""); - XTESTS_TEST_INTEGER_EQUAL(0u, n); + TEST_INT_EQ(0u, n); } #if defined(__GNUC__) && \ __GNUC__ >= 9 @@ -132,8 +132,8 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), "a"); - XTESTS_TEST_INTEGER_EQUAL(1u, n); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("a", buff); + TEST_INT_EQ(1u, n); + TEST_MS_EQ("a", buff); } { @@ -141,8 +141,8 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), "%s", "a"); - XTESTS_TEST_INTEGER_EQUAL(1u, n); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("a", buff); + TEST_INT_EQ(1u, n); + TEST_MS_EQ("a", buff); } @@ -153,7 +153,7 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), "abc"); - XTESTS_TEST_INTEGER_EQUAL(3u, n); + TEST_INT_EQ(3u, n); } { @@ -161,8 +161,8 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), "abc"); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc", buff); + TEST_INT_EQ(3u, n); + TEST_MS_EQ("abc", buff); } { @@ -170,8 +170,8 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), "%s", "abc"); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc", buff); + TEST_INT_EQ(3u, n); + TEST_MS_EQ("abc", buff); } { @@ -179,8 +179,8 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), "a%cc", 'b'); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("abc", buff); + TEST_INT_EQ(3u, n); + TEST_MS_EQ("abc", buff); } @@ -191,8 +191,8 @@ static void test_pantheios_util_snprintf_a() size_t const n = pantheios_util_snprintf_a(&buff[0], STLSOFT_NUM_ELEMENTS(buff), "%d", -10); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_MULTIBYTE_STRING_EQUAL("-10", buff); + TEST_INT_EQ(3u, n); + TEST_MS_EQ("-10", buff); } } @@ -207,7 +207,7 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L""); - XTESTS_TEST_INTEGER_EQUAL(0u, n); + TEST_INT_EQ(0u, n); } { @@ -215,7 +215,7 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L"%s", L""); - XTESTS_TEST_INTEGER_EQUAL(0u, n); + TEST_INT_EQ(0u, n); } @@ -226,8 +226,8 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L"a"); - XTESTS_TEST_INTEGER_EQUAL(1u, n); - XTESTS_TEST_WIDE_STRING_EQUAL(L"a", buff); + TEST_INT_EQ(1u, n); + TEST_WS_EQ(L"a", buff); } { @@ -235,8 +235,8 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L"%s", L"a"); - XTESTS_TEST_INTEGER_EQUAL(1u, n); - XTESTS_TEST_WIDE_STRING_EQUAL(L"a", buff); + TEST_INT_EQ(1u, n); + TEST_WS_EQ(L"a", buff); } @@ -247,7 +247,7 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L"abc"); - XTESTS_TEST_INTEGER_EQUAL(3u, n); + TEST_INT_EQ(3u, n); } { @@ -255,8 +255,8 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L"abc"); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_WIDE_STRING_EQUAL(L"abc", buff); + TEST_INT_EQ(3u, n); + TEST_WS_EQ(L"abc", buff); } { @@ -264,8 +264,8 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L"%s", L"abc"); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_WIDE_STRING_EQUAL(L"abc", buff); + TEST_INT_EQ(3u, n); + TEST_WS_EQ(L"abc", buff); } { @@ -273,8 +273,8 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L"a%cc", 'b'); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_WIDE_STRING_EQUAL(L"abc", buff); + TEST_INT_EQ(3u, n); + TEST_WS_EQ(L"abc", buff); } @@ -285,8 +285,8 @@ static void test_pantheios_util_snprintf_w() size_t const n = pantheios_util_snprintf_w(&buff[0], STLSOFT_NUM_ELEMENTS(buff), L"%d", -10); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_WIDE_STRING_EQUAL(L"-10", buff); + TEST_INT_EQ(3u, n); + TEST_WS_EQ(L"-10", buff); } } #endif /* PANTHEIOS_USE_WIDE_STRINGS */ @@ -305,7 +305,7 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("")); - XTESTS_TEST_INTEGER_EQUAL(0u, n); + TEST_INT_EQ(0u, n); } { @@ -313,7 +313,7 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("%s"), PANTHEIOS_LITERAL_STRING("")); - XTESTS_TEST_INTEGER_EQUAL(0u, n); + TEST_INT_EQ(0u, n); } #if defined(__GNUC__) && \ __GNUC__ >= 9 @@ -328,8 +328,8 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("a")); - XTESTS_TEST_INTEGER_EQUAL(1u, n); - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING("a"), buff); + TEST_INT_EQ(1u, n); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("a"), buff); } { @@ -337,8 +337,8 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("%s"), PANTHEIOS_LITERAL_STRING("a")); - XTESTS_TEST_INTEGER_EQUAL(1u, n); - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING("a"), buff); + TEST_INT_EQ(1u, n); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("a"), buff); } @@ -349,7 +349,7 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("abc")); - XTESTS_TEST_INTEGER_EQUAL(3u, n); + TEST_INT_EQ(3u, n); } { @@ -357,8 +357,8 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("abc")); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING("abc"), buff); + TEST_INT_EQ(3u, n); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("abc"), buff); } { @@ -366,8 +366,8 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("%s"), PANTHEIOS_LITERAL_STRING("abc")); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING("abc"), buff); + TEST_INT_EQ(3u, n); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("abc"), buff); } { @@ -375,8 +375,8 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("a%cc"), 'b'); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING("abc"), buff); + TEST_INT_EQ(3u, n); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("abc"), buff); } @@ -387,8 +387,8 @@ static void test_pantheios_util_snprintf() size_t const n = pantheios_util_snprintf(&buff[0], STLSOFT_NUM_ELEMENTS(buff), PANTHEIOS_LITERAL_STRING("%d"), -10); - XTESTS_TEST_INTEGER_EQUAL(3u, n); - XTESTS_TEST_STRING_EQUAL(PANTHEIOS_LITERAL_STRING("-10"), buff); + TEST_INT_EQ(3u, n); + TEST_STRING_EQ(PANTHEIOS_LITERAL_STRING("-10"), buff); } } diff --git a/test/unit/util/strnlen/entry.cpp b/test/unit/util/strnlen/entry.cpp index 06922fd0..a2404ffa 100644 --- a/test/unit/util/strnlen/entry.cpp +++ b/test/unit/util/strnlen/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Implementation file for the test.unit.util.strnlen project. * * Created: 17th April 2009 - * Updated: 10th October 2026 + * Updated: 12th October 2026 * * ////////////////////////////////////////////////////////////////////// */ @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -100,7 +100,7 @@ static void test_length_passed_through() { for (size_t i = 0; i < iterations; ++i) { - XTESTS_TEST_INTEGER_EQUAL(i, pantheios_util_strnlen(PANTHEIOS_LITERAL_STRING(""), i)); + TEST_INT_EQ(i, pantheios_util_strnlen(PANTHEIOS_LITERAL_STRING(""), i)); }} } @@ -113,7 +113,7 @@ static void test_length_via_strlen() { PAN_CHAR_T const* const string = strings[i]; - XTESTS_TEST_INTEGER_EQUAL(stlsoft::c_str_len(string), pantheios_util_strnlen(string, ~size_t(0))); + TEST_INT_EQ(stlsoft::c_str_len(string), pantheios_util_strnlen(string, ~size_t(0))); }} } @@ -125,59 +125,59 @@ static void test_length_calculated_forwards() PAN_CHAR_T const string[] = PANTHEIOS_LITERAL_STRING("abcdefghijklm\0nop\0qrs\0tuvwxyz"); // lengths: 13, 17, 21 - XTESTS_TEST_INTEGER_EQUAL( 0u, pantheios_util_strnlen(string, get_min_max( 0, 0))); - XTESTS_TEST_INTEGER_EQUAL( 1u, pantheios_util_strnlen(string, get_min_max( 0, 1))); - XTESTS_TEST_INTEGER_EQUAL( 2u, pantheios_util_strnlen(string, get_min_max( 0, 2))); - XTESTS_TEST_INTEGER_EQUAL( 3u, pantheios_util_strnlen(string, get_min_max( 0, 3))); - XTESTS_TEST_INTEGER_EQUAL( 4u, pantheios_util_strnlen(string, get_min_max( 0, 4))); - XTESTS_TEST_INTEGER_EQUAL( 5u, pantheios_util_strnlen(string, get_min_max( 0, 5))); - XTESTS_TEST_INTEGER_EQUAL( 6u, pantheios_util_strnlen(string, get_min_max( 0, 6))); - XTESTS_TEST_INTEGER_EQUAL( 7u, pantheios_util_strnlen(string, get_min_max( 0, 7))); - XTESTS_TEST_INTEGER_EQUAL( 8u, pantheios_util_strnlen(string, get_min_max( 0, 8))); - XTESTS_TEST_INTEGER_EQUAL( 9u, pantheios_util_strnlen(string, get_min_max( 0, 9))); - XTESTS_TEST_INTEGER_EQUAL(10u, pantheios_util_strnlen(string, get_min_max( 0, 10))); - XTESTS_TEST_INTEGER_EQUAL(11u, pantheios_util_strnlen(string, get_min_max( 0, 11))); - XTESTS_TEST_INTEGER_EQUAL(12u, pantheios_util_strnlen(string, get_min_max( 0, 12))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 13))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 14))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 15))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 16))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 17))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 18))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 19))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 20))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 21))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 22))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 23))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 24))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 25))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 26))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 27))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max( 0, 28))); - - XTESTS_TEST_INTEGER_EQUAL(10u, pantheios_util_strnlen(string, get_min_max(10, 10))); - XTESTS_TEST_INTEGER_EQUAL(11u, pantheios_util_strnlen(string, get_min_max(10, 11))); - XTESTS_TEST_INTEGER_EQUAL(12u, pantheios_util_strnlen(string, get_min_max(10, 12))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(10, 13))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(10, 14))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(10, 15))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(10, 16))); - - XTESTS_TEST_INTEGER_EQUAL(14u, pantheios_util_strnlen(string, get_min_max(14, 14))); - XTESTS_TEST_INTEGER_EQUAL(15u, pantheios_util_strnlen(string, get_min_max(14, 15))); - XTESTS_TEST_INTEGER_EQUAL(16u, pantheios_util_strnlen(string, get_min_max(14, 16))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(14, 17))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(14, 18))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(14, 19))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(14, 20))); - - XTESTS_TEST_INTEGER_EQUAL(18u, pantheios_util_strnlen(string, get_min_max(18, 18))); - XTESTS_TEST_INTEGER_EQUAL(19u, pantheios_util_strnlen(string, get_min_max(18, 19))); - XTESTS_TEST_INTEGER_EQUAL(20u, pantheios_util_strnlen(string, get_min_max(18, 20))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(18, 21))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(18, 22))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(18, 23))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(18, 24))); + TEST_INT_EQ( 0u, pantheios_util_strnlen(string, get_min_max( 0, 0))); + TEST_INT_EQ( 1u, pantheios_util_strnlen(string, get_min_max( 0, 1))); + TEST_INT_EQ( 2u, pantheios_util_strnlen(string, get_min_max( 0, 2))); + TEST_INT_EQ( 3u, pantheios_util_strnlen(string, get_min_max( 0, 3))); + TEST_INT_EQ( 4u, pantheios_util_strnlen(string, get_min_max( 0, 4))); + TEST_INT_EQ( 5u, pantheios_util_strnlen(string, get_min_max( 0, 5))); + TEST_INT_EQ( 6u, pantheios_util_strnlen(string, get_min_max( 0, 6))); + TEST_INT_EQ( 7u, pantheios_util_strnlen(string, get_min_max( 0, 7))); + TEST_INT_EQ( 8u, pantheios_util_strnlen(string, get_min_max( 0, 8))); + TEST_INT_EQ( 9u, pantheios_util_strnlen(string, get_min_max( 0, 9))); + TEST_INT_EQ(10u, pantheios_util_strnlen(string, get_min_max( 0, 10))); + TEST_INT_EQ(11u, pantheios_util_strnlen(string, get_min_max( 0, 11))); + TEST_INT_EQ(12u, pantheios_util_strnlen(string, get_min_max( 0, 12))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 13))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 14))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 15))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 16))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 17))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 18))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 19))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 20))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 21))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 22))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 23))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 24))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 25))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 26))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 27))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max( 0, 28))); + + TEST_INT_EQ(10u, pantheios_util_strnlen(string, get_min_max(10, 10))); + TEST_INT_EQ(11u, pantheios_util_strnlen(string, get_min_max(10, 11))); + TEST_INT_EQ(12u, pantheios_util_strnlen(string, get_min_max(10, 12))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(10, 13))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(10, 14))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(10, 15))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(10, 16))); + + TEST_INT_EQ(14u, pantheios_util_strnlen(string, get_min_max(14, 14))); + TEST_INT_EQ(15u, pantheios_util_strnlen(string, get_min_max(14, 15))); + TEST_INT_EQ(16u, pantheios_util_strnlen(string, get_min_max(14, 16))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(14, 17))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(14, 18))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(14, 19))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(14, 20))); + + TEST_INT_EQ(18u, pantheios_util_strnlen(string, get_min_max(18, 18))); + TEST_INT_EQ(19u, pantheios_util_strnlen(string, get_min_max(18, 19))); + TEST_INT_EQ(20u, pantheios_util_strnlen(string, get_min_max(18, 20))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(18, 21))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(18, 22))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(18, 23))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(18, 24))); } static void test_length_calculated_backwards() @@ -188,89 +188,89 @@ static void test_length_calculated_backwards() PAN_CHAR_T const string[] = PANTHEIOS_LITERAL_STRING("abcdefghijklm\0nop\0qrs\0tuvwxyz"); // lengths: 13, 17, 21 - XTESTS_TEST_INTEGER_EQUAL( 0u, pantheios_util_strnlen(string, get_min_max( 0, 0))); - XTESTS_TEST_INTEGER_EQUAL( 1u, pantheios_util_strnlen(string, get_min_max( 1, 0))); - XTESTS_TEST_INTEGER_EQUAL( 2u, pantheios_util_strnlen(string, get_min_max( 2, 0))); - XTESTS_TEST_INTEGER_EQUAL( 3u, pantheios_util_strnlen(string, get_min_max( 3, 0))); - XTESTS_TEST_INTEGER_EQUAL( 4u, pantheios_util_strnlen(string, get_min_max( 4, 0))); - XTESTS_TEST_INTEGER_EQUAL( 5u, pantheios_util_strnlen(string, get_min_max( 5, 0))); - XTESTS_TEST_INTEGER_EQUAL( 6u, pantheios_util_strnlen(string, get_min_max( 6, 0))); - XTESTS_TEST_INTEGER_EQUAL( 7u, pantheios_util_strnlen(string, get_min_max( 7, 0))); - XTESTS_TEST_INTEGER_EQUAL( 8u, pantheios_util_strnlen(string, get_min_max( 8, 0))); - XTESTS_TEST_INTEGER_EQUAL( 9u, pantheios_util_strnlen(string, get_min_max( 9, 0))); - XTESTS_TEST_INTEGER_EQUAL(10u, pantheios_util_strnlen(string, get_min_max(10, 0))); - XTESTS_TEST_INTEGER_EQUAL(11u, pantheios_util_strnlen(string, get_min_max(11, 0))); - XTESTS_TEST_INTEGER_EQUAL(12u, pantheios_util_strnlen(string, get_min_max(12, 0))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(13, 0))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(14, 0))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(15, 0))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(16, 0))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(17, 0))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(18, 0))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(19, 0))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(20, 0))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(21, 0))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(22, 0))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(23, 0))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(24, 0))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(25, 0))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(26, 0))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(27, 0))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(28, 0))); - - XTESTS_TEST_INTEGER_EQUAL(10u, pantheios_util_strnlen(string, get_min_max(10, 10))); - XTESTS_TEST_INTEGER_EQUAL(11u, pantheios_util_strnlen(string, get_min_max(11, 10))); - XTESTS_TEST_INTEGER_EQUAL(12u, pantheios_util_strnlen(string, get_min_max(12, 10))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(13, 10))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(14, 10))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(15, 10))); - XTESTS_TEST_INTEGER_EQUAL(13u, pantheios_util_strnlen(string, get_min_max(16, 10))); - - XTESTS_TEST_INTEGER_EQUAL(14u, pantheios_util_strnlen(string, get_min_max(14, 14))); - XTESTS_TEST_INTEGER_EQUAL(15u, pantheios_util_strnlen(string, get_min_max(15, 14))); - XTESTS_TEST_INTEGER_EQUAL(16u, pantheios_util_strnlen(string, get_min_max(16, 14))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(17, 14))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(18, 14))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(19, 14))); - XTESTS_TEST_INTEGER_EQUAL(17u, pantheios_util_strnlen(string, get_min_max(20, 14))); - - XTESTS_TEST_INTEGER_EQUAL(18u, pantheios_util_strnlen(string, get_min_max(18, 18))); - XTESTS_TEST_INTEGER_EQUAL(19u, pantheios_util_strnlen(string, get_min_max(19, 18))); - XTESTS_TEST_INTEGER_EQUAL(20u, pantheios_util_strnlen(string, get_min_max(20, 18))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(21, 18))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(22, 18))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(23, 18))); - XTESTS_TEST_INTEGER_EQUAL(21u, pantheios_util_strnlen(string, get_min_max(24, 18))); + TEST_INT_EQ( 0u, pantheios_util_strnlen(string, get_min_max( 0, 0))); + TEST_INT_EQ( 1u, pantheios_util_strnlen(string, get_min_max( 1, 0))); + TEST_INT_EQ( 2u, pantheios_util_strnlen(string, get_min_max( 2, 0))); + TEST_INT_EQ( 3u, pantheios_util_strnlen(string, get_min_max( 3, 0))); + TEST_INT_EQ( 4u, pantheios_util_strnlen(string, get_min_max( 4, 0))); + TEST_INT_EQ( 5u, pantheios_util_strnlen(string, get_min_max( 5, 0))); + TEST_INT_EQ( 6u, pantheios_util_strnlen(string, get_min_max( 6, 0))); + TEST_INT_EQ( 7u, pantheios_util_strnlen(string, get_min_max( 7, 0))); + TEST_INT_EQ( 8u, pantheios_util_strnlen(string, get_min_max( 8, 0))); + TEST_INT_EQ( 9u, pantheios_util_strnlen(string, get_min_max( 9, 0))); + TEST_INT_EQ(10u, pantheios_util_strnlen(string, get_min_max(10, 0))); + TEST_INT_EQ(11u, pantheios_util_strnlen(string, get_min_max(11, 0))); + TEST_INT_EQ(12u, pantheios_util_strnlen(string, get_min_max(12, 0))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(13, 0))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(14, 0))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(15, 0))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(16, 0))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(17, 0))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(18, 0))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(19, 0))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(20, 0))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(21, 0))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(22, 0))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(23, 0))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(24, 0))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(25, 0))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(26, 0))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(27, 0))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(28, 0))); + + TEST_INT_EQ(10u, pantheios_util_strnlen(string, get_min_max(10, 10))); + TEST_INT_EQ(11u, pantheios_util_strnlen(string, get_min_max(11, 10))); + TEST_INT_EQ(12u, pantheios_util_strnlen(string, get_min_max(12, 10))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(13, 10))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(14, 10))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(15, 10))); + TEST_INT_EQ(13u, pantheios_util_strnlen(string, get_min_max(16, 10))); + + TEST_INT_EQ(14u, pantheios_util_strnlen(string, get_min_max(14, 14))); + TEST_INT_EQ(15u, pantheios_util_strnlen(string, get_min_max(15, 14))); + TEST_INT_EQ(16u, pantheios_util_strnlen(string, get_min_max(16, 14))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(17, 14))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(18, 14))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(19, 14))); + TEST_INT_EQ(17u, pantheios_util_strnlen(string, get_min_max(20, 14))); + + TEST_INT_EQ(18u, pantheios_util_strnlen(string, get_min_max(18, 18))); + TEST_INT_EQ(19u, pantheios_util_strnlen(string, get_min_max(19, 18))); + TEST_INT_EQ(20u, pantheios_util_strnlen(string, get_min_max(20, 18))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(21, 18))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(22, 18))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(23, 18))); + TEST_INT_EQ(21u, pantheios_util_strnlen(string, get_min_max(24, 18))); } static void test_strnlen_with_negatives() { PAN_CHAR_T const abcdefghi[] = PANTHEIOS_LITERAL_STRING("abcdefghi"); - XTESTS_TEST_INTEGER_EQUAL(9u, pantheios_util_strnlen(abcdefghi, static_cast(-1))); + TEST_INT_EQ(9u, pantheios_util_strnlen(abcdefghi, static_cast(-1))); { signed char minus1 = -1; - XTESTS_TEST_INTEGER_EQUAL(9u, pantheios_util_strnlen(abcdefghi, static_cast(minus1))); + TEST_INT_EQ(9u, pantheios_util_strnlen(abcdefghi, static_cast(minus1))); } { short minus1 = -1; - XTESTS_TEST_INTEGER_EQUAL(9u, pantheios_util_strnlen(abcdefghi, static_cast(minus1))); + TEST_INT_EQ(9u, pantheios_util_strnlen(abcdefghi, static_cast(minus1))); } { int minus1 = -1; - XTESTS_TEST_INTEGER_EQUAL(9u, pantheios_util_strnlen(abcdefghi, static_cast(minus1))); + TEST_INT_EQ(9u, pantheios_util_strnlen(abcdefghi, static_cast(minus1))); } { long minus1 = -1; - XTESTS_TEST_INTEGER_EQUAL(9u, pantheios_util_strnlen(abcdefghi, static_cast(minus1))); + TEST_INT_EQ(9u, pantheios_util_strnlen(abcdefghi, static_cast(minus1))); } }