Added any_throw and none_throw assertions

Snaipe · Sep 14, 2015 · 5e8491a · 5e8491a
1 parent d427186
commit 5e8491a
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 12 deletions.
diff --git a/include/criterion/assert.h b/include/criterion/assert.h
@@ -65,6 +65,8 @@ enum criterion_assert_messages {
     CRITERION_ASSERT_MSG_FILE_STR_MATCH,
     CRITERION_ASSERT_MSG_THROW,
     CRITERION_ASSERT_MSG_NO_THROW,
+    CRITERION_ASSERT_MSG_ANY_THROW,
+    CRITERION_ASSERT_MSG_NONE_THROW,
 };
 
 CR_BEGIN_C_API
@@ -487,13 +489,13 @@ CR_END_C_API
 
 # ifdef __cplusplus
 
-#  define cr_assert_throw_abort_(Fail, Msg, Statement, Exception, ...)  \
+#  define cr_assert_throw_abort_(Fail, Msg, MsgArgs, ...)               \
     CR_EXPAND(cr_assert_impl(                                           \
             Fail,                                                       \
             0,                                                          \
             dummy,                                                      \
             Msg,                                                        \
-            (CR_STR(Statement), CR_STR(Exception)),                     \
+            MsgArgs,                                                    \
             CR_VA_TAIL(__VA_ARGS__)                                     \
     ))
 
@@ -504,9 +506,8 @@ CR_END_C_API
     } catch (...) {                                                     \
         CR_EXPAND(cr_assert_throw_abort_(                               \
                 Fail,                                                   \
-                CRITERION_ASSERT_MSG_THROW,                             \
-                Statement,                                              \
-                Exception,                                              \
+                CRITERION_ASSERT_MSG_NO_THROW,                          \
+                (CR_STR(Statement), CR_STR(Exception)),                 \
                 __VA_ARGS__));                                          \
     }
 
@@ -528,9 +529,8 @@ CR_END_C_API
     } catch (Exception const &) {                                       \
         CR_EXPAND(cr_assert_throw_abort_(                               \
                 Fail,                                                   \
-                CRITERION_ASSERT_MSG_NO_THROW,                          \
-                Statement,                                              \
-                Exception,                                              \
+                CRITERION_ASSERT_MSG_THROW,                             \
+                (CR_STR(Statement), CR_STR(Exception)),                 \
                 __VA_ARGS__));                                          \
     }
 
@@ -546,6 +546,49 @@ CR_END_C_API
 #  define cr_assert_no_throw(...) CR_EXPAND(cr_assert_no_throw_va_(CR_FAIL_ABORT_,     __VA_ARGS__))
 #  define cr_expect_no_throw(...) CR_EXPAND(cr_assert_no_throw_va_(CR_FAIL_CONTINUES_, __VA_ARGS__))
 
+#  define cr_assert_any_throw_(Fail, Statement, ...)                    \
+    try {                                                               \
+        Statement;                                                      \
+        CR_EXPAND(cr_assert_throw_abort_(                               \
+                Fail,                                                   \
+                CRITERION_ASSERT_MSG_ANY_THROW,                         \
+                (CR_STR(Statement)),                                    \
+                __VA_ARGS__));                                          \
+    } catch (...) {}
+
+#  define cr_assert_any_throw_va_(...)                                  \
+    CR_EXPAND(cr_assert_any_throw_(                                     \
+            CR_VA_HEAD(__VA_ARGS__),                                    \
+            CR_VA_HEAD(CR_VA_TAIL(__VA_ARGS__)),                        \
+            dummy,                                                      \
+            CR_VA_TAIL(CR_VA_TAIL(__VA_ARGS__))                         \
+    ))
+
+#  define cr_assert_any_throw(...) CR_EXPAND(cr_assert_any_throw_va_(CR_FAIL_ABORT_,     __VA_ARGS__))
+#  define cr_expect_any_throw(...) CR_EXPAND(cr_assert_any_throw_va_(CR_FAIL_CONTINUES_, __VA_ARGS__))
+
+#  define cr_assert_none_throw_(Fail, Statement, ...)                   \
+    try {                                                               \
+        Statement;                                                      \
+    } catch (...) {                                                     \
+        CR_EXPAND(cr_assert_throw_abort_(                               \
+                Fail,                                                   \
+                CRITERION_ASSERT_MSG_NONE_THROW,                        \
+                (CR_STR(Statement)),                                    \
+                __VA_ARGS__));                                          \
+    }
+
+#  define cr_assert_none_throw_va_(...)                                 \
+    CR_EXPAND(cr_assert_none_throw_(                                    \
+            CR_VA_HEAD(__VA_ARGS__),                                    \
+            CR_VA_HEAD(CR_VA_TAIL(__VA_ARGS__)),                        \
+            dummy,                                                      \
+            CR_VA_TAIL(CR_VA_TAIL(__VA_ARGS__))                         \
+    ))
+
+#  define cr_assert_none_throw(...) CR_EXPAND(cr_assert_none_throw_va_(CR_FAIL_ABORT_,     __VA_ARGS__))
+#  define cr_expect_none_throw(...) CR_EXPAND(cr_assert_none_throw_va_(CR_FAIL_CONTINUES_, __VA_ARGS__))
+
 # endif
 
 // The section below is here for backward compatibility purposes.

diff --git a/po/fr.po b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: criterion 1.0.0\n"
 "Report-Msgid-Bugs-To: franklinmathieu+criterion@gmail.com\n"
-"POT-Creation-Date: 2015-09-14 02:01+0200\n"
+"POT-Creation-Date: 2015-09-14 02:33+0200\n"
 "PO-Revision-Date: 2015-04-03 17:58+0200\n"
 "Last-Translator:  <franklinmathieu@gmail.com>\n"
 "Language-Team: French\n"
@@ -143,19 +143,29 @@ msgstr "%s est vide."
 msgid "%s is not empty."
 msgstr "%s n'est pas vide."
 
+#: src/i18n.c:20
+#, fuzzy, c-format
+msgid "The statement `%s` did not throw any exception."
+msgstr "L'instruction `%s` n'a pas levé d'exception."
+
 #: src/i18n.c:21
+#, fuzzy, c-format
+msgid "The statement `%s` threw some exception."
+msgstr "L'instruction `%1$s` a levé une exception."
+
+#: src/i18n.c:24
 #, c-format
 msgid "The file contents of %1$s does not match the string \"%2$s\"."
 msgstr ""
 "Le contenu du fichier %1$s ne correspond pas à la chaine de caractères \"%2$s"
 "\"."
 
-#: src/i18n.c:22
+#: src/i18n.c:25
 #, c-format
 msgid "The statement `%1$s` did throw an instance of the `%2$s` exception."
 msgstr "L'instruction `%1$s` a levé une instance de l'exception `%2$s`."
 
-#: src/i18n.c:23
+#: src/i18n.c:26
 #, c-format
 msgid "The statement `%1$s` did not throw an instance of the `%2$s` exception."
 msgstr "L'instruction `%1$s` n'a pas levé d'instance de l'exception `%2$s`."
diff --git a/samples/outputs/asserts.cc.bin.err.expected b/samples/outputs/asserts.cc.bin.err.expected
@@ -3,7 +3,7 @@
 [[0;34m----[0m] [0;1masserts.cc[0m:[0;31m13[0m: Assertion failed: assert is fatal, expect isn't
 [[0;34m----[0m] [0;1masserts.cc[0m:[0;31m14[0m: Assertion failed: This assert runs
 [[0;31mFAIL[0m] asserts::base: (0.00s)
-[[0;34m----[0m] [0;1masserts.cc[0m:[0;31m89[0m: Assertion failed: The conditions for this assertion were not met.
+[[0;34m----[0m] [0;1masserts.cc[0m:[0;31m89[0m: Assertion failed: The statement `throw std::exception()` did throw an instance of the `std::bad_alloc` exception.
 [[0;31mFAIL[0m] asserts::exception: (0.00s)
 [[0;34m----[0m] [0;1masserts.cc[0m:[0;31m19[0m: Assertion failed: You can fail an assertion with a message from anywhere
 [[0;34m----[0m] [0;1masserts.cc[0m:[0;31m20[0m: Assertion failed: The conditions for this assertion were not met.

diff --git a/samples/tests/failmessages.cc b/samples/tests/failmessages.cc
@@ -26,6 +26,8 @@ Test(messages, default) {
 
     cr_expect_throw(throw std::exception(), std::bad_alloc);
     cr_expect_no_throw(throw std::exception(), std::exception);
+    cr_expect_any_throw({});
+    cr_expect_none_throw(throw std::exception());
 }
 
 Test(messages, user) {
@@ -53,4 +55,6 @@ Test(messages, user) {
 
     cr_expect_throw(throw std::exception(), std::bad_alloc, "foo %s", "bar");
     cr_expect_no_throw(throw std::exception(), std::exception, "foo %s", "bar");
+    cr_expect_any_throw({}, "foo %s", "bar");
+    cr_expect_none_throw(throw std::exception(), "foo %s", "bar");
 }
diff --git a/samples/tests/outputs/failmessages.cc.bin.err.expected b/samples/tests/outputs/failmessages.cc.bin.err.expected
@@ -0,0 +1,49 @@
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m5[0m: Assertion failed: The expression 0 is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m6[0m: Assertion failed: The expression (0) == (1) is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m7[0m: Assertion failed: The expression (1) != (1) is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m8[0m: Assertion failed: The expression (2) < (1) is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m9[0m: Assertion failed: The expression (2) <= (1) is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m10[0m: Assertion failed: The expression (1) > (2) is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m11[0m: Assertion failed: The expression (1) >= (2) is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m12[0m: Assertion failed: "" is not null.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m13[0m: Assertion failed: __null is null.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m15[0m: Assertion failed: The expression (2) - (1) <= (0.1) && (1) - (2) <= (0.1) is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m16[0m: Assertion failed: The expression (2) - (2) > (0.1) || (2) - (2) > (0.1) is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m18[0m: Assertion failed: "foo" is not empty.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m19[0m: Assertion failed: "" is empty.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m20[0m: Assertion failed: The expression (as strings) ("abc") == ("abd") is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m21[0m: Assertion failed: The expression (as strings) ("abc") != ("abc") is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m22[0m: Assertion failed: The expression (as strings) ("abc") < ("aba") is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m23[0m: Assertion failed: The expression (as strings) ("abc") <= ("aba") is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m24[0m: Assertion failed: The expression (as strings) ("abc") > ("abd") is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m25[0m: Assertion failed: The expression (as strings) ("abc") >= ("abd") is false.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m27[0m: Assertion failed: The statement `throw std::exception()` did not throw an instance of the `std::bad_alloc` exception.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m28[0m: Assertion failed: The statement `throw std::exception()` did throw an instance of the `std::exception` exception.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m29[0m: Assertion failed: The statement `{}` did not throw any exception.
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m30[0m: Assertion failed: The statement `throw std::exception()` threw some exception.
+[[0;31mFAIL[0m] messages::default: (0.00s)
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m34[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m35[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m36[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m37[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m38[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m39[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m40[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m41[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m42[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m44[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m45[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m47[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m48[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m49[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m50[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m51[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m52[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m53[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m54[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m56[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m57[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m58[0m: Assertion failed: foo bar
+[[0;34m----[0m] [0;1mfailmessages.cc[0m:[0;31m59[0m: Assertion failed: foo bar
+[[0;31mFAIL[0m] messages::user: (0.00s)
+[[0;34m====[0m] [0;1mSynthesis: Tested: [0;34m2[0;1m | Passing: [0;32m0[0;1m | Failing: [0;31m2[0;1m | Crashing: [0;31m0[0;1m [0m
diff --git a/samples/tests/outputs/failmessages.cc.bin.out.expected b/samples/tests/outputs/failmessages.cc.bin.out.expected
diff --git a/src/i18n.c b/src/i18n.c
@@ -17,6 +17,9 @@ char *translate_assert_msg(int msg_index, ...) {
         [CRITERION_ASSERT_MSG_IS_NOT_NULL] = N_("%s is not null."),
         [CRITERION_ASSERT_MSG_IS_EMPTY] = N_("%s is empty."),
         [CRITERION_ASSERT_MSG_IS_NOT_EMPTY] = N_("%s is not empty."),
+        [CRITERION_ASSERT_MSG_ANY_THROW] = N_("The statement `%s` did not throw any exception."),
+        [CRITERION_ASSERT_MSG_NONE_THROW] = N_("The statement `%s` threw some exception."),
+
 #ifdef ENABLE_NLS
         [CRITERION_ASSERT_MSG_FILE_STR_MATCH] = N_("The file contents of %1$s does not match the string \"%2$s\"."),
         [CRITERION_ASSERT_MSG_THROW] = N_("The statement `%1$s` did throw an instance of the `%2$s` exception."),