From a0ce0a75828401be43132fdfffa89f5ae903f501 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Mon, 26 Oct 2020 19:40:44 +0100 Subject: Add abbreviated convenience macros. --- examples/ExampleTest.cc | 118 ++++++++++++++++++++++++------------------------ uunit.h | 5 +- 2 files changed, 63 insertions(+), 60 deletions(-) diff --git a/examples/ExampleTest.cc b/examples/ExampleTest.cc index 2a4997c..8947c9b 100644 --- a/examples/ExampleTest.cc +++ b/examples/ExampleTest.cc @@ -8,91 +8,91 @@ class ExampleTest public: ExampleTest() { - uUNIT_TEST(ExampleTest::boundaryTests); - uUNIT_TEST(ExampleTest::exceptionTests); + uTEST(ExampleTest::boundaryTests); + uTEST(ExampleTest::exceptionTests); } void boundaryTests() { - uUNIT_ASSERT_EQUAL(B0, getBaud(0)); - uUNIT_ASSERT_EQUAL(B0, getBaud(1)); - uUNIT_ASSERT_EQUAL(B0, getBaud(49)); + uASSERT_EQUAL(B0, getBaud(0)); + uASSERT_EQUAL(B0, getBaud(1)); + uASSERT_EQUAL(B0, getBaud(49)); - uUNIT_ASSERT_EQUAL(B50, getBaud(50)); - uUNIT_ASSERT_EQUAL(B50, getBaud(51)); - uUNIT_ASSERT_EQUAL(B50, getBaud(74)); + uASSERT_EQUAL(B50, getBaud(50)); + uASSERT_EQUAL(B50, getBaud(51)); + uASSERT_EQUAL(B50, getBaud(74)); - uUNIT_ASSERT_EQUAL(B75, getBaud(75)); - uUNIT_ASSERT_EQUAL(B75, getBaud(76)); - uUNIT_ASSERT_EQUAL(B75, getBaud(109)); + uASSERT_EQUAL(B75, getBaud(75)); + uASSERT_EQUAL(B75, getBaud(76)); + uASSERT_EQUAL(B75, getBaud(109)); - uUNIT_ASSERT_EQUAL(B110, getBaud(110)); - uUNIT_ASSERT_EQUAL(B110, getBaud(111)); - uUNIT_ASSERT_EQUAL(B110, getBaud(133)); + uASSERT_EQUAL(B110, getBaud(110)); + uASSERT_EQUAL(B110, getBaud(111)); + uASSERT_EQUAL(B110, getBaud(133)); - uUNIT_ASSERT_EQUAL(B134, getBaud(134)); - uUNIT_ASSERT_EQUAL(B134, getBaud(135)); - uUNIT_ASSERT_EQUAL(B134, getBaud(149)); + uASSERT_EQUAL(B134, getBaud(134)); + uASSERT_EQUAL(B134, getBaud(135)); + uASSERT_EQUAL(B134, getBaud(149)); - uUNIT_ASSERT_EQUAL(B150, getBaud(150)); - uUNIT_ASSERT_EQUAL(B150, getBaud(151)); - uUNIT_ASSERT_EQUAL(B150, getBaud(199)); + uASSERT_EQUAL(B150, getBaud(150)); + uASSERT_EQUAL(B150, getBaud(151)); + uASSERT_EQUAL(B150, getBaud(199)); - uUNIT_ASSERT_EQUAL(B200, getBaud(200)); - uUNIT_ASSERT_EQUAL(B200, getBaud(201)); - uUNIT_ASSERT_EQUAL(B200, getBaud(299)); + uASSERT_EQUAL(B200, getBaud(200)); + uASSERT_EQUAL(B200, getBaud(201)); + uASSERT_EQUAL(B200, getBaud(299)); - uUNIT_ASSERT_EQUAL(B300, getBaud(300)); - uUNIT_ASSERT_EQUAL(B300, getBaud(301)); - uUNIT_ASSERT_EQUAL(B300, getBaud(599)); + uASSERT_EQUAL(B300, getBaud(300)); + uASSERT_EQUAL(B300, getBaud(301)); + uASSERT_EQUAL(B300, getBaud(599)); - uUNIT_ASSERT_EQUAL(B600, getBaud(600)); - uUNIT_ASSERT_EQUAL(B600, getBaud(601)); - uUNIT_ASSERT_EQUAL(B600, getBaud(1199)); + uASSERT_EQUAL(B600, getBaud(600)); + uASSERT_EQUAL(B600, getBaud(601)); + uASSERT_EQUAL(B600, getBaud(1199)); - uUNIT_ASSERT_EQUAL(B1200, getBaud(1200)); - uUNIT_ASSERT_EQUAL(B1200, getBaud(1201)); - uUNIT_ASSERT_EQUAL(B1200, getBaud(1799)); + uASSERT_EQUAL(B1200, getBaud(1200)); + uASSERT_EQUAL(B1200, getBaud(1201)); + uASSERT_EQUAL(B1200, getBaud(1799)); - uUNIT_ASSERT_EQUAL(B1800, getBaud(1800)); - uUNIT_ASSERT_EQUAL(B1800, getBaud(1801)); - uUNIT_ASSERT_EQUAL(B1800, getBaud(2399)); + uASSERT_EQUAL(B1800, getBaud(1800)); + uASSERT_EQUAL(B1800, getBaud(1801)); + uASSERT_EQUAL(B1800, getBaud(2399)); - uUNIT_ASSERT_EQUAL(B2400, getBaud(2400)); - uUNIT_ASSERT_EQUAL(B2400, getBaud(2401)); - uUNIT_ASSERT_EQUAL(B2400, getBaud(4799)); + uASSERT_EQUAL(B2400, getBaud(2400)); + uASSERT_EQUAL(B2400, getBaud(2401)); + uASSERT_EQUAL(B2400, getBaud(4799)); - uUNIT_ASSERT_EQUAL(B4800, getBaud(4800)); - uUNIT_ASSERT_EQUAL(B4800, getBaud(4801)); - uUNIT_ASSERT_EQUAL(B4800, getBaud(9599)); + uASSERT_EQUAL(B4800, getBaud(4800)); + uASSERT_EQUAL(B4800, getBaud(4801)); + uASSERT_EQUAL(B4800, getBaud(9599)); - uUNIT_ASSERT_EQUAL(B9600, getBaud(9600)); - uUNIT_ASSERT_EQUAL(B9600, getBaud(9601)); - uUNIT_ASSERT_EQUAL(B9600, getBaud(19199)); + uASSERT_EQUAL(B9600, getBaud(9600)); + uASSERT_EQUAL(B9600, getBaud(9601)); + uASSERT_EQUAL(B9600, getBaud(19199)); - uUNIT_ASSERT_EQUAL(B19200, getBaud(19200)); - uUNIT_ASSERT_EQUAL(B19200, getBaud(19201)); - uUNIT_ASSERT_EQUAL(B19200, getBaud(38399)); + uASSERT_EQUAL(B19200, getBaud(19200)); + uASSERT_EQUAL(B19200, getBaud(19201)); + uASSERT_EQUAL(B19200, getBaud(38399)); - uUNIT_ASSERT_EQUAL(B38400, getBaud(38400)); - uUNIT_ASSERT_EQUAL(B38400, getBaud(38401)); - uUNIT_ASSERT_EQUAL(B38400, getBaud(57599)); + uASSERT_EQUAL(B38400, getBaud(38400)); + uASSERT_EQUAL(B38400, getBaud(38401)); + uASSERT_EQUAL(B38400, getBaud(57599)); - uUNIT_ASSERT_EQUAL(B57600, getBaud(57600)); - uUNIT_ASSERT_EQUAL(B57600, getBaud(57601)); - uUNIT_ASSERT_EQUAL(B57600, getBaud(115199)); + uASSERT_EQUAL(B57600, getBaud(57600)); + uASSERT_EQUAL(B57600, getBaud(57601)); + uASSERT_EQUAL(B57600, getBaud(115199)); - uUNIT_ASSERT_EQUAL(B115200, getBaud(115200)); - uUNIT_ASSERT_EQUAL(B115200, getBaud(115201)); - uUNIT_ASSERT_EQUAL(B115200, getBaud(230399)); + uASSERT_EQUAL(B115200, getBaud(115200)); + uASSERT_EQUAL(B115200, getBaud(115201)); + uASSERT_EQUAL(B115200, getBaud(230399)); - uUNIT_ASSERT_EQUAL(B230400, getBaud(230400)); - uUNIT_ASSERT_EQUAL(B230400, getBaud(230401)); + uASSERT_EQUAL(B230400, getBaud(230400)); + uASSERT_EQUAL(B230400, getBaud(230401)); } void exceptionTests() { - uUNIT_ASSERT_THROWS(bad_speed, getBaud(-1)); + uASSERT_THROWS(bad_speed, getBaud(-1)); } }; diff --git a/uunit.h b/uunit.h index 9c0775d..c9cb258 100644 --- a/uunit.h +++ b/uunit.h @@ -167,6 +167,7 @@ protected: } #define uUNIT_TEST(func) \ registerTest(this, &func, #func, __FILE__) + #define uTEST(args...) uUNIT_TEST(args) void u_assert(bool value, const char* expr, const char* file, std::size_t line) @@ -182,6 +183,7 @@ protected: //! Convenience macro to pass along filename and linenumber #define uUNIT_ASSERT(value) \ u_assert(value, #value, __FILE__, __LINE__) + #define uASSERT(args...) uUNIT_ASSERT(args) void assert_equal(double expected, double value, const char* file, std::size_t line) @@ -211,7 +213,7 @@ protected: //! Convenience macro to pass along filename and linenumber #define uUNIT_ASSERT_EQUAL(expected, value) \ assert_equal(expected, value, __FILE__, __LINE__) - + #define uASSERT_EQUAL(args...) uUNIT_ASSERT_EQUAL(args) template void assert_throws(const char* expected, std::function expr, @@ -241,6 +243,7 @@ protected: } #define uUNIT_ASSERT_THROWS(expected, expr) \ assert_throws(#expected, [&](){ expr; }, __FILE__, __LINE__) + #define uASSERT_THROWS(args...) uUNIT_ASSERT_THROWS(args) private: static std::string sanitize(const std::string& input) -- cgit v1.2.3