Changeset a4e78743 in mainline

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.

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/test/main.c (modified) (1 diff)
• c/test/stdlib.c (modified) (2 diffs)
• c/test/strtol.c (added)
• pcut/include/pcut/asserts.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -212 +212 @@
         test/str.c \
         test/string.c \
+        test/strtol.c \
         test/uuid.c
 

uspace/lib/c/test/main.c

@@ -53 +53 @@
 PCUT_IMPORT(str);
 PCUT_IMPORT(string);
+PCUT_IMPORT(strtol);
 PCUT_IMPORT(table);
 PCUT_IMPORT(uuid);

uspace/lib/c/test/stdlib.c

@@ -63 +63 @@
 }
 
-/** atoi function */
-PCUT_TEST(atoi)
-{
-        int i;
-
-        i = atoi(" \t42");
-        PCUT_ASSERT_TRUE(i == 42);
-}
-
-/** atol function */
-PCUT_TEST(atol)
-{
-        long li;
-
-        li = atol(" \t42");
-        PCUT_ASSERT_TRUE(li == 42);
-}
-
-/** atoll function */
-PCUT_TEST(atoll)
-{
-        long long lli;
-
-        lli = atoll(" \t42");
-        PCUT_ASSERT_TRUE(lli == 42);
-}
-
 /** strtold function */
 #include <stdio.h>
@@ -101 +74 @@
         printf("ld=%.10lf\n", (double)ld);
         PCUT_ASSERT_TRUE(ld == 42.0);
-}
-
-/** strtol function */
-PCUT_TEST(strtol)
-{
-        long li;
-        char *ep;
-
-        li = strtol(" \t42x", &ep, 10);
-        PCUT_ASSERT_TRUE(li == 42);
-        PCUT_ASSERT_TRUE(*ep == 'x');
-}
-
-/** strtol function with auto-detected base 10 */
-PCUT_TEST(strtol_dec_auto)
-{
-        long li;
-        char *ep;
-
-        li = strtol(" \t42x", &ep, 0);
-        PCUT_ASSERT_TRUE(li == 42);
-        PCUT_ASSERT_TRUE(*ep == 'x');
-}
-
-/** strtol function with octal number */
-PCUT_TEST(strtol_oct)
-{
-        long li;
-        char *ep;
-
-        li = strtol(" \t052x", &ep, 8);
-        PCUT_ASSERT_TRUE(li == 052);
-        PCUT_ASSERT_TRUE(*ep == 'x');
-}
-
-/** strtol function with octal number with prefix */
-#include <stdio.h>
-PCUT_TEST(strtol_oct_prefix)
-{
-        long li;
-        char *ep;
-
-        li = strtol(" \t052x", &ep, 0);
-        printf("li=%ld (0%lo)\n", li, li);
-        PCUT_ASSERT_TRUE(li == 052);
-        PCUT_ASSERT_TRUE(*ep == 'x');
-}
-
-/** strtol function with hex number */
-PCUT_TEST(strtol_hex)
-{
-        long li;
-        char *ep;
-
-        li = strtol(" \t2ax", &ep, 16);
-        PCUT_ASSERT_TRUE(li == 0x2a);
-        PCUT_ASSERT_TRUE(*ep == 'x');
-}
-
-/** strtol function with hex number with hex prefix */
-PCUT_TEST(strtol_hex_prefixed)
-{
-        long li;
-        char *ep;
-
-        li = strtol(" \t0x2ax", &ep, 0);
-        PCUT_ASSERT_TRUE(li == 0x2a);
-        PCUT_ASSERT_TRUE(*ep == 'x');
-}
-
-/** strtol function with base 16 and number with 0x prefix */
-PCUT_TEST(strtol_base16_prefix)
-{
-        long li;
-        char *ep;
-
-        li = strtol(" \t0x1y", &ep, 16);
-        printf("li=%ld\n", li);
-        PCUT_ASSERT_TRUE(li == 1);
-        PCUT_ASSERT_TRUE(*ep == 'y');
-}
-
-/** strtol function with base 36 number */
-PCUT_TEST(strtol_base36)
-{
-        long li;
-        char *ep;
-
-        li = strtol(" \tz1.", &ep, 36);
-        PCUT_ASSERT_TRUE(li == 35 * 36 + 1);
-        PCUT_ASSERT_TRUE(*ep == '.');
 }
 

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)