Changeset a4e78743 in mainline for uspace/lib/pcut/include

Timestamp:

2019-02-26T16:10:39Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

951e451

Parents:

5e801dc

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-26 16:07:08)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-26 16:10:39)

Message:

Move string-to-int conversion tests to a separate file, and add a few

Some of the newly added tests detect bugs in current implementation.
Fixes and more tests are WIP.

File:

• uspace/lib/pcut/include/pcut/asserts.h (modified) (1 diff)

uspace/lib/pcut/include/pcut/asserts.h

@@ -192 +192 @@
                                 pcut_expected_eval, pcut_actual_eval, \
                                 #expected, #actual); \
+                } \
+        } while (0)
+
+/** Assertion for checking that two integers are equal.
+ *
+ * @param expected Expected (correct) value.
+ * @param actual Actually obtained (computed) value we wish to test.
+ */
+#define PCUT_ASSERT_UINT_EQUALS(expected, actual) \
+        do {\
+                unsigned long long pcut_expected_eval = (expected); \
+                unsigned long long pcut_actual_eval = (actual); \
+                if (pcut_expected_eval != pcut_actual_eval) { \
+                        PCUT_ASSERTION_FAILED("Expected <%llu> but got <%llu> (%s != %s)", \
+                                pcut_expected_eval, pcut_actual_eval, \
+                                #expected, #actual); \
+                } \
+        } while (0)
+
+/** Assertion for checking that two pointers are equal.
+ *
+ * @param expected Expected (correct) value.
+ * @param actual Actually obtained (computed) value we wish to test.
+ */
+#define PCUT_ASSERT_PTR_EQUALS(expected, actual) \
+        do {\
+                const void *pcut_expected_eval = (expected); \
+                const void *pcut_actual_eval = (actual); \
+                if (pcut_expected_eval != pcut_actual_eval) { \
+                        PCUT_ASSERTION_FAILED("Expected '" #actual "' = '" #expected "' = <%p> but got '" #actual "' = <%p>", \
+                                pcut_expected_eval, pcut_actual_eval); \
                 } \
         } while (0)