X-Git-Url: https://git.llucax.com/software/mutest.git/blobdiff_plain/a894239e9a62676c861bdd817714b5f8b3c05265..b18c9878940d9878ab2fb5a71b0fc54531353c29:/mutest.h

diff --git a/mutest.h b/mutest.h
index c84eb15..9afbac0 100644
--- a/mutest.h
+++ b/mutest.h
@@ -41,38 +41,112 @@ enum {
 		} \
 	} while (0)
 
+/* print an error message */
+#define mu_printerr(name, action) \
+		mu_print(MU_ERROR, __FILE__ ":%d: " name " failed, "\
+				action " test case\n", __LINE__);
+
+/* modify the internal state so a failure gets counted */
+#define mutest_count_err ++mutest_failed_checks; mutest_case_failed = 1;
+
+/* modify the internal state so a success gets counted */
+#define mutest_count_suc ++mutest_passed_checks;
+
+#ifdef __cplusplus
+
+#include <exception>
+
+/* print an error message triggered by a C++ exception */
+#define mu_printex(name, action, ex) \
+		mu_print(MU_ERROR, __FILE__ ":%d: " name " failed, " \
+				"exception thrown (%s), " action \
+				" test case\n", __LINE__, ex);
+
+#define mutest_try try {
+#define mutest_catch(name, action, final) \
+		} catch (const std::exception& e) { \
+			mutest_count_err \
+			mu_printex(name, action, e.what()); \
+			final; \
+		} catch (...) { \
+			mutest_count_err \
+			mu_printex(name, action, "[unknown]"); \
+			final; \
+		}
+
+#else /* !__cplusplus */
+
+#define mutest_try
+#define mutest_catch(name, action, exp)
+
+#endif /* __cplusplus */
+
 /* check that an expression evaluates to true, continue if the check fails */
-#define mu_check(exp) \
+#define mu_check_base(exp, name, action, final) \
 	do { \
-		mu_print(MU_CHECK, "\t\t* Checking mu_check(%s)...\n", #exp); \
-		if (exp) ++mutest_passed_checks; \
-		else { \
-			++mutest_failed_checks; \
-			mutest_case_failed = 1; \
-			mu_print(MU_ERROR, "%s:%d: mu_check(%s) failed, " \
-					"resuming test case\n", __FILE__, \
-					__LINE__, #exp); \
-		} \
+		mu_print(MU_CHECK, "\t\t* Checking " name "(" #exp ")...\n"); \
+		mutest_try \
+			if (exp) mutest_count_suc \
+			else { \
+				mutest_count_err \
+				mu_printerr(name "(" #exp ")", action); \
+				final; \
+			} \
+		mutest_catch(name, action, final) \
 	} while (0)
 
+/* check that an expression evaluates to true, continue if the check fails */
+#define mu_check(exp) mu_check_base(exp, "mu_check", "resuming", continue)
+
 /*
  * ensure that an expression evaluates to true, abort the current test
  * case if the check fails
  */
-#define mu_ensure(exp) \
+#define mu_ensure(exp) mu_check_base(exp, "mu_ensure", "aborting", return)
+
+#ifdef __cplusplus
+
+#define mu_echeck_base(ex, exp, name, action, final) \
 	do { \
-		mu_print(MU_CHECK, "\t\t* Checking mu_ensure(%s)...\n", #exp);\
-		if (exp) ++mutest_passed_checks; \
-		else { \
-			++mutest_failed_checks; \
-			mutest_case_failed = 1; \
-			mu_print(MU_ERROR, "%s:%d: mu_ensure(%s) failed, " \
-					"aborting test case\n", __FILE__, \
-					__LINE__, #exp); \
-			return; \
+		mu_print(MU_CHECK, "\t\t* Checking " name "(" #ex ", " #exp \
+				")...\n"); \
+		try { \
+			exp; \
+			mutest_count_err \
+			mu_printerr(name "(" #ex ", " #exp ")", \
+					"no exception thrown, "	action); \
+			final; \
+		} catch (const ex& e) { \
+			mutest_count_suc \
+		} catch (const std::exception& e) { \
+			mutest_count_err \
+			mu_printex(name "(" #ex ", " #exp ")", action, \
+					e.what()); \
+			final; \
+		} catch (...) { \
+			mutest_count_err \
+			mu_printex(name "(" #ex ", " #exp ")", action, \
+					"[unknown]"); \
+			final; \
 		} \
 	} while (0)
 
+/*
+ * check that an expression throws a particular exception, continue if the
+ * check fails
+ */
+#define mu_echeck(ex, exp) \
+	mu_echeck_base(ex, exp, "mu_echeck", "resuming", continue)
+
+/*
+ * ensure that an expression throws a particular exception, abort the current
+ * test case if the check fails
+ */
+#define mu_eensure(ex, exp) \
+	mu_echeck_base(ex, exp, "mu_eensure", "aborting", return)
+
+#endif /* __cplusplus */
+
 #ifndef MUTEST_PY /* we are using the C implementation */
 
 /*