diff --git a/build/msbuild/lol.rules.props b/build/msbuild/lol.rules.props index 82de2832..4cd0bc70 100644 --- a/build/msbuild/lol.rules.props +++ b/build/msbuild/lol.rules.props @@ -29,7 +29,6 @@ $(LolDir)\lol-core\include; $(LolDir)\src; $(LolDir)\src\3rdparty\bullet3\src; - $(LolDir)\tools\lolunit; $(PegtlIncludes); $(ImguiIncludes); $(BtPhysIncludes); diff --git a/configure.ac b/configure.ac index d0bd8bdb..3a7c0959 100644 --- a/configure.ac +++ b/configure.ac @@ -271,7 +271,6 @@ AC_CONFIG_FILES( doc/samples/sandbox/Makefile doc/tutorial/Makefile tools/Makefile - tools/lolunit/Makefile tools/vimlol/Makefile tools/vslol/Makefile ]) diff --git a/lol-core b/lol-core index 02bb54bd..c6960306 160000 --- a/lol-core +++ b/lol-core @@ -1 +1 @@ -Subproject commit 02bb54bdf96af1ddacfa35b397c1caf7bf30e4e4 +Subproject commit c6960306484a771d580572b810247265e8d25088 diff --git a/src/t/Makefile.am b/src/t/Makefile.am index 1dba7868..9058da8e 100644 --- a/src/t/Makefile.am +++ b/src/t/Makefile.am @@ -29,7 +29,6 @@ endif test_base_SOURCES = test-common.cpp \ base/avl_tree.cpp base/array.cpp base/enum.cpp base/map.cpp \ base/string.cpp base/types.cpp -test_base_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit test_base_DEPENDENCIES = @LOL_DEPS@ test_math_SOURCES = test-common.cpp \ @@ -38,22 +37,18 @@ test_math_SOURCES = test-common.cpp \ math/quat.cpp math/rand.cpp math/real.cpp math/rotation.cpp \ math/trig.cpp math/vector.cpp math/polynomial.cpp math/noise/simplex.cpp \ math/bigint.cpp math/sqt.cpp math/numbers.cpp -test_math_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit test_math_DEPENDENCIES = @LOL_DEPS@ test_sys_SOURCES = test-common.cpp \ sys/thread.cpp sys/timer.cpp -test_sys_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit test_sys_DEPENDENCIES = @LOL_DEPS@ test_image_SOURCES = test-common.cpp \ image/color.cpp image/image.cpp -test_image_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit test_image_DEPENDENCIES = @LOL_DEPS@ test_entity_SOURCES = test-common.cpp \ entity/camera.cpp -test_entity_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit test_entity_DEPENDENCIES = @LOL_DEPS@ EXTRA_DIST += data/gradient.png diff --git a/src/t/base/array.cpp b/src/t/base/array.cpp index 5cbbf554..cef09dd9 100644 --- a/src/t/base/array.cpp +++ b/src/t/base/array.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2018 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/base/avl_tree.cpp b/src/t/base/avl_tree.cpp index 1b508894..647640d3 100644 --- a/src/t/base/avl_tree.cpp +++ b/src/t/base/avl_tree.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // © 2013—2015 Benjamin “Touky” Huet // © 2013—2015 Guillaume Bittoun // @@ -13,8 +13,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/base/enum.cpp b/src/t/base/enum.cpp index bc0dee81..b7692cd5 100644 --- a/src/t/base/enum.cpp +++ b/src/t/base/enum.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2018 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include #include #include diff --git a/src/t/base/map.cpp b/src/t/base/map.cpp index 6531d4aa..f707d0cc 100644 --- a/src/t/base/map.cpp +++ b/src/t/base/map.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2018 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,11 +11,10 @@ // #include +#include #include -#include - namespace lol { diff --git a/src/t/base/string.cpp b/src/t/base/string.cpp index 341b78d3..70bbbc1e 100644 --- a/src/t/base/string.cpp +++ b/src/t/base/string.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2018 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // © 2014—2015 Benjamin “Touky” Huet // // Lol Engine is free software. It comes without any warranty, to @@ -12,11 +12,10 @@ // #include +#include #include -#include - namespace lol { diff --git a/src/t/base/types.cpp b/src/t/base/types.cpp index 9cab9324..fab5bbb4 100644 --- a/src/t/base/types.cpp +++ b/src/t/base/types.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/entity/camera.cpp b/src/t/entity/camera.cpp index ab94c5b0..6b80e770 100644 --- a/src/t/entity/camera.cpp +++ b/src/t/entity/camera.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests for the camera object // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // © 2013 Benjamin “Touky” Huet // // Lol Engine is free software. It comes without any warranty, to @@ -12,8 +12,7 @@ // #include - -#include +#include #include diff --git a/src/t/image/color.cpp b/src/t/image/color.cpp index c5b68ce7..967f0ff6 100644 --- a/src/t/image/color.cpp +++ b/src/t/image/color.cpp @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/image/image.cpp b/src/t/image/image.cpp index 92015075..b36cd704 100644 --- a/src/t/image/image.cpp +++ b/src/t/image/image.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2017 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,11 +11,10 @@ // #include +#include #include -#include - namespace lol { diff --git a/src/t/math/array2d.cpp b/src/t/math/array2d.cpp index 0f875f78..b75bfaf3 100644 --- a/src/t/math/array2d.cpp +++ b/src/t/math/array2d.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/array3d.cpp b/src/t/math/array3d.cpp index 0a85e806..73a9cd27 100644 --- a/src/t/math/array3d.cpp +++ b/src/t/math/array3d.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/arraynd.cpp b/src/t/math/arraynd.cpp index 4280ad6a..2da49476 100644 --- a/src/t/math/arraynd.cpp +++ b/src/t/math/arraynd.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/bigint.cpp b/src/t/math/bigint.cpp index 63be0876..d74a94a7 100644 --- a/src/t/math/bigint.cpp +++ b/src/t/math/bigint.cpp @@ -11,12 +11,11 @@ // #include +#include +#include #include -#include -#include - namespace lol { diff --git a/src/t/math/box.cpp b/src/t/math/box.cpp index 37877abb..6c9a52b6 100644 --- a/src/t/math/box.cpp +++ b/src/t/math/box.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/cmplx.cpp b/src/t/math/cmplx.cpp index 632c4044..d9992952 100644 --- a/src/t/math/cmplx.cpp +++ b/src/t/math/cmplx.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/half.cpp b/src/t/math/half.cpp index 457e596c..107b9ec2 100644 --- a/src/t/math/half.cpp +++ b/src/t/math/half.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,11 +11,10 @@ // #include +#include #include -#include - namespace lol { diff --git a/src/t/math/interp.cpp b/src/t/math/interp.cpp index 95aeb785..9bae9116 100644 --- a/src/t/math/interp.cpp +++ b/src/t/math/interp.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/matrix.cpp b/src/t/math/matrix.cpp index 0a42ed0c..6f93dc92 100644 --- a/src/t/math/matrix.cpp +++ b/src/t/math/matrix.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/noise/simplex.cpp b/src/t/math/noise/simplex.cpp index ce5e882c..19c9c880 100644 --- a/src/t/math/noise/simplex.cpp +++ b/src/t/math/noise/simplex.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // © 2013—2014 Benjamin “Touky” Huet // © 2013—2014 Guillaume Bittoun // @@ -13,8 +13,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/numbers.cpp b/src/t/math/numbers.cpp index f2e6be79..946325d8 100644 --- a/src/t/math/numbers.cpp +++ b/src/t/math/numbers.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests for number theory // -// Copyright © 2010—2018 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/polynomial.cpp b/src/t/math/polynomial.cpp index 720ac7e3..6d4ee645 100644 --- a/src/t/math/polynomial.cpp +++ b/src/t/math/polynomial.cpp @@ -11,10 +11,9 @@ // #include - +#include #include #include -#include namespace lol { diff --git a/src/t/math/quat.cpp b/src/t/math/quat.cpp index acaaadd0..11b9e96c 100644 --- a/src/t/math/quat.cpp +++ b/src/t/math/quat.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests for quaternions // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/rand.cpp b/src/t/math/rand.cpp index 496a1f9d..eac2abdf 100644 --- a/src/t/math/rand.cpp +++ b/src/t/math/rand.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/real.cpp b/src/t/math/real.cpp index 6a31d864..a219be69 100644 --- a/src/t/math/real.cpp +++ b/src/t/math/real.cpp @@ -11,9 +11,8 @@ // #include - +#include #include -#include #include diff --git a/src/t/math/rotation.cpp b/src/t/math/rotation.cpp index 46ac3f38..c2c6e280 100644 --- a/src/t/math/rotation.cpp +++ b/src/t/math/rotation.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests for rotations (matrices and quaternions) // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/sqt.cpp b/src/t/math/sqt.cpp index 3d8f162e..d2cde1b6 100644 --- a/src/t/math/sqt.cpp +++ b/src/t/math/sqt.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests for the SQT transform class // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/math/trig.cpp b/src/t/math/trig.cpp index 06dc556b..6735cf0a 100644 --- a/src/t/math/trig.cpp +++ b/src/t/math/trig.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests for trigonometric functions // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,11 +11,10 @@ // #include +#include #include -#include - namespace lol { diff --git a/src/t/math/vector.cpp b/src/t/math/vector.cpp index b63c38e9..b375af09 100644 --- a/src/t/math/vector.cpp +++ b/src/t/math/vector.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,8 +11,7 @@ // #include - -#include +#include namespace lol { diff --git a/src/t/sys/thread.cpp b/src/t/sys/thread.cpp index 8a35dff3..6a0c5220 100644 --- a/src/t/sys/thread.cpp +++ b/src/t/sys/thread.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // © 2014—2015 Benjamin “Touky” Huet // // Lol Engine is free software. It comes without any warranty, to @@ -12,12 +12,11 @@ // #include +#include #include #include -#include - namespace lol { diff --git a/src/t/sys/timer.cpp b/src/t/sys/timer.cpp index 94d06c00..2e2d496b 100644 --- a/src/t/sys/timer.cpp +++ b/src/t/sys/timer.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // © 2014—2015 Benjamin “Touky” Huet // © 2014—2015 Guillaume Bittoun // @@ -13,10 +13,8 @@ // #include +#include -#include - -#include namespace lol { diff --git a/src/t/test-common.cpp b/src/t/test-common.cpp index a3390af5..ee992e84 100644 --- a/src/t/test-common.cpp +++ b/src/t/test-common.cpp @@ -1,7 +1,7 @@ // // Lol Engine — Unit tests // -// Copyright © 2010—2015 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it @@ -11,12 +11,11 @@ // #include +#include #include #include -#include - int main(int argc, char **argv) { UNUSED(argc, argv); diff --git a/tools/Makefile.am b/tools/Makefile.am index 296c66f5..5d1bf177 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,7 +2,6 @@ include $(top_srcdir)/build/autotools/common.am SUBDIRS = -SUBDIRS += lolunit SUBDIRS += vimlol SUBDIRS += vslol diff --git a/tools/lolunit/Makefile.am b/tools/lolunit/Makefile.am deleted file mode 100644 index 077fbffe..00000000 --- a/tools/lolunit/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -include $(top_srcdir)/build/autotools/common.am - -EXTRA_DIST += lolunit.h - diff --git a/tools/lolunit/lolunit.h b/tools/lolunit/lolunit.h deleted file mode 100644 index 357d11b7..00000000 --- a/tools/lolunit/lolunit.h +++ /dev/null @@ -1,449 +0,0 @@ -// -// Lol Engine — Unit test implementation -// -// Copyright © 2010—2016 Sam Hocevar -// -// Lol Engine is free software. It comes without any warranty, to -// the extent permitted by applicable law. You can redistribute it -// and/or modify it under the terms of the Do What the Fuck You Want -// to Public License, Version 2, as published by the WTFPL Task Force. -// See http://www.wtfpl.net/ for more details. -// - -#pragma once - -// -// The Unit test framework -// ----------------------- -// - -#include -#include -#include -#include -#if defined _XBOX -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ -#elif defined _WIN32 -# define WIN32_LEAN_AND_MEAN -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ -#endif - -namespace lol -{ - -/* - * This is the base class for all fixtures. It keeps track of all - * fixtures registered through the lolunit_declare_fixture macro and puts them - * in a linked list. - */ -class FixtureBase -{ - friend class text_runner; - -public: - virtual void setup(void) {}; - virtual void teardown(void) {}; - -protected: - FixtureBase() : m_next(NULL), m_testcases(0), m_failcases(0) {} - virtual ~FixtureBase() {} - - static void AddFixture(FixtureBase *fixture) - { - /* Protect against several instances of the same Fixture subclass */ - if (fixture->MarkFixture()) - return; - FixtureListHelper(fixture); - } - static FixtureBase *FixtureList() { return FixtureListHelper(NULL); } - - virtual void RunFixture() = 0; - virtual bool MarkFixture() = 0; - - /* Prevent compiler complaints about unreachable code */ - static inline bool True() { return true; } - - FixtureBase *m_next; - int m_testcases, m_failcases; - int m_asserts, m_failure; - char const *m_fixturename, *m_currentname; - std::stringstream m_errorlog, m_context; - -private: - /* The FixtureBase class keeps track of all instanciated children - * fixtures through this method. */ - static FixtureBase *FixtureListHelper(FixtureBase *set) - { - static FixtureBase *head = NULL, *tail = NULL; - - if (set) - { - if (!head) head = set; - if (tail) tail->m_next = set; - tail = set; - } - return head; - } -}; - -/* - * This template specialises FixtureBase and provides registration of - * test cases in a linked list through the lolunit_declare_test macro. - */ -template class Fixture : protected FixtureBase -{ -public: - typedef T FixtureClass; - - struct TestCase - { - void (FixtureClass::* m_fun)(); - char const *m_testname; - TestCase *m_next; - - protected: - static inline std::string make_msg(std::string const str) - { - return "- " + str + "\n"; - } - }; - - Fixture() - { - AddFixture(this); - } - - /* Run all test cases in this fixture. */ - virtual void RunFixture() - { - m_errorlog.str(""); - m_testcases = 0; - m_failcases = 0; - for (TestCase *c = TestCaseList(); c; c = c->m_next) - { - m_testcases++; - m_asserts = 0; - m_failure = false; - m_currentname = c->m_testname; - m_context.str(""); - - std::cout << '.'; - (static_cast(this)->*c->m_fun)(); - if (m_failure) std::cout << 'F'; - } - } - - /* Mark the current fixture type as already registered and return whether - * it was seen before. */ - virtual bool MarkFixture() - { - static bool seen = false; - if (seen) - { - SealFixture(); - return true; - } - seen = true; - return false; - } - - /* Manage Fixture sealing. Once SealFixture() has been called, we - * will no longer accept TestCase registrations. */ - static void SealFixture() { SealFixtureHelper(true); } - static bool IsFixtureSealed() { return SealFixtureHelper(false); } - - /* Each Fixture class specialisation keeps track of its instanciated - * test cases. */ - static void AddTestCase(TestCase *that, char const *name, - void (FixtureClass::*fun)()) - { - if (IsFixtureSealed()) - return; - - that->m_fun = fun; - that->m_testname = name; - that->m_next = NULL; - TestCaseListHelper(that); - } - static TestCase *TestCaseList() { return TestCaseListHelper(NULL); } - -private: - static bool SealFixtureHelper(bool set) - { - static bool sealed = false; - if (set) sealed = true; - return sealed; - } - - static TestCase *TestCaseListHelper(TestCase *set) - { - static TestCase *head = NULL, *tail = NULL; - if (set) - { - if (!head) head = set; - if (tail) tail->m_next = set; - tail = set; - } - return head; - } -}; - -/* - * This simple class runs all automatically registered tests and reports - * on error and success in the standard output. - */ -class text_runner -{ -public: - bool Run() - { - bool ret = true; - std::stringstream errors(""); - int failcases = 0, testcases = 0; - - for (FixtureBase *f = FixtureBase::FixtureList(); f; f = f->m_next) - { - f->setup(); - f->RunFixture(); - f->teardown(); - - errors << f->m_errorlog.str(); - testcases += f->m_testcases; - failcases += f->m_failcases; - } - std::cout << "\n"; - - std::stringstream summary; - summary << "\n\n"; - if (failcases) - { - summary << "!!!FAILURES!!!\n"; - summary << "Test Results:\n"; - summary << "Run: " << testcases - << " Failures: " << failcases - << " Errors: 0\n"; /* TODO: handle errors */ - summary << errors.str(); - - ret = false; - } - else - { - summary << "OK (" << testcases << " tests)\n"; - } - summary << "\n\n"; - -#if _WIN32 - ::OutputDebugStringA(summary.str().c_str()); -#else - std::cout << summary.str(); -#endif - - return ret; - } -}; - -#define lolunit_assert_generic(msg, cond) \ - do { \ - m_asserts++; \ - if (True() && !(cond)) \ - { \ - m_errorlog << "\n\n"; \ - m_errorlog << ++m_failcases << ") test: " \ - << lol_unit_helper_name(this) << "::" << m_currentname \ - << " (F) line: " << __LINE__ << " " \ - << __FILE__ << "\n"; \ - m_errorlog << "assertion failed\n"; \ - m_errorlog << "- Expression: " << #cond << "\n"; \ - m_errorlog << msg; \ - m_failure = true; \ - return; \ - } \ - } while (!True()) - -#define lolunit_assert_op(op, modifier, opdesc, msg, a, b) \ - do { \ - m_asserts++; \ - if (True() && !modifier((a) op (b))) \ - { \ - m_errorlog << "\n\n"; \ - m_errorlog << ++m_failcases << ") test: " \ - << lol_unit_helper_name(this) << "::" << m_currentname \ - << " (F) line: " << __LINE__ << " " \ - << __FILE__ << "\n"; \ - m_errorlog << opdesc << " assertion failed\n"; \ - m_errorlog << "- Expected: " << #a << " = " << (a) << "\n"; \ - m_errorlog << "- Actual : " << #b << " = " << (b) << "\n"; \ - m_errorlog << msg; \ - m_errorlog << m_context.str(); \ - m_failure = true; \ - return; \ - } \ - } while (!True()) - -#define lolunit_assert_doubles_equal_generic(msg, a, b, t) \ - do { \ - m_asserts++; \ - using std::fabs; \ - if (True() && fabs(double(a) - double(b)) > fabs(double(t))) \ - { \ - m_errorlog << "\n\n"; \ - m_errorlog << ++m_failcases << ") test: " \ - << lol_unit_helper_name(this) << "::" << m_currentname \ - << " (F) line: " << __LINE__ << " " \ - << __FILE__ << "\n"; \ - m_errorlog << "double equality assertion failed\n"; \ - std::streamsize old_prec = m_errorlog.precision(); \ - m_errorlog << std::setprecision(16); \ - m_errorlog << "- Expected: " << #a << " = " << (a) << "\n"; \ - m_errorlog << "- Actual : " << #b << " = " << (b) << "\n"; \ - m_errorlog << "- Delta : " << (t) << "\n"; \ - m_errorlog << std::setprecision(old_prec); \ - m_errorlog << msg; \ - m_errorlog << m_context.str(); \ - m_failure = true; \ - return; \ - } \ - } while (!True()) - -/* - * Public helper macros - */ - -#define lolunit_declare_fixture(N) \ - class N; \ - /* This pattern allows us to statically create a Fixture instance \ - * before its exact implementation was defined. */ \ - template struct lol_unit_helper_fixture_##N \ - { \ - lol_unit_helper_fixture_##N() { p = new T(); } \ - ~lol_unit_helper_fixture_##N() { delete p; } \ - T *p; \ - }; \ - lol_unit_helper_fixture_##N lol_unit_helper_fixture_##N##_instance; \ - /* Allow to retrieve the class name without using RTTI and without \ - * knowing the type of "this". */ \ - static inline char const *lol_unit_helper_name(N *p) \ - { \ - (void)p; \ - return #N; \ - } \ - /* Now the user can define the implementation */ \ - class N : public lol::Fixture - -#define lolunit_declare_test(N) \ - /* For each test in the fixture, we create an object that will \ - * automatically register the test method in a list global to the \ - * specialised fixture. */ \ - class lol_unit_helper_test_##N : public TestCase \ - { \ - public: \ - lol_unit_helper_test_##N() \ - { \ - (void)lol_unit_helper_name(nullptr); \ - AddTestCase(this, #N, \ - (void (FixtureClass::*)()) &FixtureClass::N); \ - } \ - }; \ - lol_unit_helper_test_##N lol_unit_helper_test_instance_##N; \ - void N() - -/* - * Provide context for error messages - */ - -#define lolunit_set_context(n) \ - do { \ - m_context.str(""); \ - m_context << "- Context : " << #n << " = " << (n) << "\n"; \ - } while (!True()) - -#define lolunit_unset_context(n) \ - m_context.str("") - -/* - * Public assert macros - */ - -#define lolunit_fail(msg) \ - do { \ - m_asserts++; \ - m_errorlog << "\n\n"; \ - m_errorlog << ++m_failcases << ") test: " \ - << lol_unit_helper_name(this) << "::" << m_currentname \ - << " (F) line: " << __LINE__ << " " \ - << __FILE__ << "\n"; \ - m_errorlog << "forced failure\n"; \ - m_errorlog << make_msg(msg); \ - m_errorlog << m_context.str(); \ - m_failure = true; \ - return; \ - } while (!True()) - -#define lolunit_assert(cond) \ - lolunit_assert_generic("", cond) -#define lolunit_assert_message(m, cond) \ - lolunit_assert_generic(make_msg(m), cond) - - -#define lolunit_assert_equal(a, b) \ - lolunit_assert_op(==, (bool), "equality", "", a, b) -#define lolunit_assert_equal_message(m, a, b) \ - lolunit_assert_op(==, (bool), "equality", make_msg(m), a, b) -#define lolunit_assert_different(a, b) \ - lolunit_assert_op(!=, (bool), "inequality", "", a, b) -#define lolunit_assert_different_message(m, a, b) \ - lolunit_assert_op(!=, (bool), "inequality", make_msg(m), a, b) -#define lolunit_assert_less(a, b) \ - lolunit_assert_op(<, (bool), "less than", "", a, b) -#define lolunit_assert_less_message(m, a, b) \ - lolunit_assert_op(<, (bool), "less than", make_msg(m), a, b) -#define lolunit_assert_lequal(a, b) \ - lolunit_assert_op(<=, (bool), "less than or equal", "", a, b) -#define lolunit_assert_lequal_message(m, a, b) \ - lolunit_assert_op(<=, (bool), "less than or equal", make_msg(m), a, b) -#define lolunit_assert_greater(a, b) \ - lolunit_assert_op(>, (bool), "greater than", "", a, b) -#define lolunit_assert_greater_message(m, a, b) \ - lolunit_assert_op(>, (bool), "greater than", make_msg(m), a, b) -#define lolunit_assert_gequal(a, b) \ - lolunit_assert_op(>=, (bool), "greater than or equal", "", a, b) -#define lolunit_assert_gequal_message(m, a, b) \ - lolunit_assert_op(>=, (bool), "greater than or equal", make_msg(m), a, b) - - -#define lolunit_refute_equal(a, b) \ - lolunit_assert_op(==, !, "not equality", "", a, b) -#define lolunit_refute_equal_message(m, a, b) \ - lolunit_assert_op(==, !, "not equality", make_msg(m), a, b) -#define lolunit_refute_different(a, b) \ - lolunit_assert_op(!=, !, "not inequality", "", a, b) -#define lolunit_refute_different_message(m, a, b) \ - lolunit_assert_op(!=, !, "not inequality", make_msg(m), a, b) -#define lolunit_refute_less(a, b) \ - lolunit_assert_op(<, !, "not less than", "", a, b) -#define lolunit_refute_less_message(m, a, b) \ - lolunit_assert_op(<, !, "not less than", make_msg(m), a, b) -#define lolunit_refute_lequal(a, b) \ - lolunit_assert_op(<=, !, "not less than or equal", "", a, b) -#define lolunit_refute_lequal_message(m, a, b) \ - lolunit_assert_op(<=, !, "not less than or equal", make_msg(m), a, b) -#define lolunit_refute_greater(a, b) \ - lolunit_assert_op(>, !, "not greater than", "", a, b) -#define lolunit_refute_greater_message(m, a, b) \ - lolunit_assert_op(>, !, "not greater than", make_msg(m), a, b) -#define lolunit_refute_gequal(a, b) \ - lolunit_assert_op(>=, !, "not greater than or equal", "", a, b) -#define lolunit_refute_gequal_message(m, a, b) \ - lolunit_assert_op(>=, !, "not greater than or equal", make_msg(m), a, b) - -#define lolunit_assert_doubles_equal(a, b, t) \ - lolunit_assert_doubles_equal_generic("", a, b, t) -#define lolunit_assert_doubles_equal_message(msg, a, b, t) \ - lolunit_assert_doubles_equal_generic(make_msg(msg), a, b, t) - -} /* namespace lol */ -