diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-20 13:30:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-20 13:30:50 +0200 |
| commit | 1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3 (patch) | |
| tree | 03dd0c39e323c7f0b1f06014ff30e74f429bfa01 /src/unittest/test.h | |
| parent | 50669cd2822a11570ae462972194eeb2d585a8c1 (diff) | |
| download | minetest-1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3.tar.xz | |
Modernize source code: last part (#6285)
* Modernize source code: last par
* Use empty when needed
* Use emplace_back instead of push_back when needed
* For range-based loops
* Initializers fixes
* constructors, destructors default
* c++ C stl includes
Diffstat (limited to 'src/unittest/test.h')
| -rw-r--r-- | src/unittest/test.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/unittest/test.h b/src/unittest/test.h index 44b0cd02b..1102f6d33 100644 --- a/src/unittest/test.h +++ b/src/unittest/test.h @@ -71,7 +71,7 @@ class TestFailedException : public std::exception { } // Asserts the comparison specified by CMP is true, or fails the current unit test -#define UASSERTCMP(T, CMP, actual, expected) do { \ +#define UASSERTCMP(T, CMP, actual, expected) { \ T a = (actual); \ T e = (expected); \ if (!(a CMP e)) { \ @@ -84,12 +84,12 @@ class TestFailedException : public std::exception { << e << std::endl; \ throw TestFailedException(); \ } \ -} while (0) +} #define UASSERTEQ(T, actual, expected) UASSERTCMP(T, ==, actual, expected) // UASSERTs that the specified exception occurs -#define EXCEPTION_CHECK(EType, code) do { \ +#define EXCEPTION_CHECK(EType, code) { \ bool exception_thrown = false; \ try { \ code; \ @@ -97,7 +97,7 @@ class TestFailedException : public std::exception { exception_thrown = true; \ } \ UASSERT(exception_thrown); \ -} while (0) +} class IGameDef; |