Improved ASSERT macro, and renamed tests/check.hpp to tests/assert.hpp

tests/assert.hpp

@@ -0,0 +1,8 @@
+#ifndef TESTS_ASSERT_HPP
+#define TESTS_ASSERT_HPP
+
+#include <cstdlib>
+
+#define ASSERT(e) ((void)((e) ? ((void)0) : ((void)fprintf(stderr, "Assertion failed: (%s), function %s, file %s, line %u.\n", #e, __func__, __FILE__, __LINE__), abort())))
+
+#endif /* TESTS_ASSERT_HPP */

tests/check.hpp

@@ -1,8 +0,0 @@
-#ifndef CHECK_HPP
-#define CHECK_HPP
-
-#include <cstdlib>
-
-#define ASSERT(cond) if (!(cond)) { std::abort(); }
-
-#endif /* CHECK_HPP */

tests/crypto_test.cpp

@@ -1,7 +1,6 @@
-#include <vector>
+#include "assert.hpp"
-
-#include "check.hpp"
 #include "crypto.hpp"
+#include <vector>
 
 using namespace std;
 using namespace SimpleWeb;

tests/io_test.cpp

@@ -1,6 +1,6 @@
+#include "assert.hpp"
 #include "client_http.hpp"
 #include "server_http.hpp"
-#include "check.hpp"
 
 using namespace std;
 

tests/parse_test.cpp

@@ -1,6 +1,6 @@
+#include "assert.hpp"
 #include "client_http.hpp"
 #include "server_http.hpp"
-#include "check.hpp"
 #include <iostream>
 
 using namespace std;

tests/status_code_test.cpp

@@ -1,5 +1,5 @@
+#include "assert.hpp"
 #include "status_code.hpp"
-#include "check.hpp"
 
 using namespace SimpleWeb;