Tweaks and fixes for Assert

.clang-format

@@ -116,6 +116,8 @@ Standard:        Cpp11
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
+  - Assert
+  - AssertNotNull
 TabWidth:        8
 UseTab:          Never
 ...

src/Assert.hpp

@@ -14,7 +14,7 @@
     }
 #else
 // Assert is empty if NO_ASSERT is defined.
-#define Assert(expr)
+#define Assert(expr) ;
 #endif
 
-#define AssertNotNull(value) Assert(value != nullptr);
+#define AssertNotNull(value) Assert(value != nullptr)

tests/AssertTests.cpp

@@ -1,11 +1,9 @@
 #include "../extern/catch.hpp"
 #include "../src/Assert.hpp"
 void TestWrapper(bool wrapperExpression) { Assert(wrapperExpression) }
-void TestWrapperNotNull(void* value){AssertNotNull(value)}
+void TestWrapperNotNull(void* value) { AssertNotNull(value) }
 
-TEST_CASE("Assert succeeds if true", "[Utilities]") {
+TEST_CASE("Assert succeeds if true", "[Utilities]") { REQUIRE_NOTHROW(TestWrapper(true)); }
-    REQUIRE_NOTHROW(TestWrapper(true));
-}
 
 TEST_CASE("Assert throws if false", "[Utilities]") { REQUIRE_THROWS(TestWrapper(false)); }
 
@@ -15,9 +13,9 @@ TEST_CASE("Assert throws if false with message", "[Utilities]") {
 }
 
 TEST_CASE("Multiple asserts", "[Utilities]") {
-    Assert(true);
+    Assert(true)
-    Assert(true);
+    Assert(true)
-    Assert(true);
+    Assert(true)
 }
 
 TEST_CASE("AssertNotNull throws if nullptr", "[Utilities]") { REQUIRE_THROWS(TestWrapperNotNull(nullptr)); }