Changeset 64340 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Oct 20, 2016 6:38:21 PM (8 years ago)

Author:

vboxsync

Message:

IPRT: Introducing RTStrPrintf2, RTStrPrintf2V, RTStrPrintf2Ex, and RTStrPrintf2ExV. The existing RTStrPrintf* interfaces are deprecated and unwanted in new code.

File:

• trunk/src/VBox/Runtime/testcase/tstRTStrFormat.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/testcase/tstRTStrFormat.cpp

@@ -113 +113 @@
 
     /* simple */
+    static const char s_szSimpleExpect[] = "u32=16 u64=256 u64=0x100";
     size_t cch = RTStrPrintf(pszBuf, BUF_SIZE, "u32=%d u64=%lld u64=%#llx", u32, u64, u64);
+    if (strcmp(pszBuf, s_szSimpleExpect))
+        RTTestIFailed("error: '%s'\n"
+                      "wanted '%s'\n", pszBuf, s_szSimpleExpect);
+    else if (cch != sizeof(s_szSimpleExpect) - 1)
+        RTTestIFailed("error: got %zd, expected %zd (#1)\n", cch, sizeof(s_szSimpleExpect) - 1);
+
+    ssize_t cch2 = RTStrPrintf2(pszBuf, BUF_SIZE, "u32=%d u64=%lld u64=%#llx", u32, u64, u64);
     if (strcmp(pszBuf, "u32=16 u64=256 u64=0x100"))
-    {
-        RTTestIFailed("error: '%s'\n"
-                      "wanted 'u32=16 u64=256 u64=0x100'\n", pszBuf);
-    }
+        RTTestIFailed("error: '%s' (#2)\n"
+                      "wanted '%s' (#2)\n", pszBuf, s_szSimpleExpect);
+    else if (cch2 != sizeof(s_szSimpleExpect) - 1)
+        RTTestIFailed("error: got %zd, expected %zd (#2)\n", cch2, sizeof(s_szSimpleExpect) - 1);
 
     /* just big. */
@@ -171 +179 @@
     RTTestSub(hTest, "RTStrAPrintf");
     char *psz = (char *)~0;
-    int cch2 = RTStrAPrintf(&psz, "Hey there! %s%s", "This is a test", "!");
-    if (cch2 < 0)
-        RTTestIFailed("RTStrAPrintf failed, cch2=%d\n", cch2);
+    int cch3 = RTStrAPrintf(&psz, "Hey there! %s%s", "This is a test", "!");
+    if (cch3 < 0)
+        RTTestIFailed("RTStrAPrintf failed, cch3=%d\n", cch3);
     else if (strcmp(psz, "Hey there! This is a test!"))
         RTTestIFailed("RTStrAPrintf failed\n"
@@ -179 +187 @@
                       "wanted: 'Hey there! This is a test!'\n",
                       psz);
-    else if ((int)strlen(psz) != cch2)
-        RTTestIFailed("RTStrAPrintf failed, cch2 == %d expected %u\n", cch2, strlen(psz));
+    else if ((int)strlen(psz) != cch3)
+        RTTestIFailed("RTStrAPrintf failed, cch3 == %d expected %u\n", cch3, strlen(psz));
     RTStrFree(psz);
 
+/* This used to be very simple, but is not doing overflow handling checks and two APIs. */
 #define CHECK42(fmt, arg, out) \
     do { \
-        cch = RTStrPrintf(pszBuf, BUF_SIZE, fmt " 42=%d " fmt " 42=%d", arg, 42, arg, 42); \
-        if (strcmp(pszBuf, out " 42=42 " out " 42=42")) \
+        static const char g_szCheck42Fmt[]    = fmt " 42=%d " fmt " 42=%d" ; \
+        static const char g_szCheck42Expect[] = out " 42=42 " out " 42=42" ; \
+        \
+        cch = RTStrPrintf(pszBuf, BUF_SIZE, g_szCheck42Fmt, arg, 42, arg, 42); \
+        if (memcmp(pszBuf, g_szCheck42Expect, sizeof(g_szCheck42Expect)) != 0) \
             RTTestIFailed("at line %d: format '%s'\n" \
                           "    output: '%s'\n"  \
                           "    wanted: '%s'\n", \
-                          __LINE__, fmt, pszBuf, out " 42=42 " out " 42=42"); \
-        else if (cch != sizeof(out " 42=42 " out " 42=42") - 1) \
+                          __LINE__, fmt, pszBuf, g_szCheck42Expect); \
+        else if (cch != sizeof(g_szCheck42Expect) - 1) \
             RTTestIFailed("at line %d: Invalid length %d returned, expected %u!\n", \
-                          __LINE__, cch, sizeof(out " 42=42 " out " 42=42") - 1); \
+                          __LINE__, cch, sizeof(g_szCheck42Expect) - 1); \
+        \
+        RTTestIDisableAssertions(); \
+        for (size_t cbBuf = 0; cbBuf <= BUF_SIZE; cbBuf++) \
+        { \
+            memset(pszBuf, 0xcc, BUF_SIZE); \
+            const char   chAfter    = cbBuf != 0 ? '\0' : 0xcc; \
+            const size_t cchCompare = cbBuf >= sizeof(g_szCheck42Expect) ? sizeof(g_szCheck42Expect) - 1 \
+                                    : cbBuf > 0 ? cbBuf - 1 : 0; \
+            /*size_t       cch1Expect = cchCompare; */ \
+            ssize_t      cch2Expect = cbBuf >= sizeof(g_szCheck42Expect) \
+                                    ? sizeof(g_szCheck42Expect) - 1 : -(ssize_t)sizeof(g_szCheck42Expect); \
+            \
+            cch2 = RTStrPrintf(pszBuf, cbBuf, g_szCheck42Fmt, arg, 42, arg, 42);\
+            if (   memcmp(pszBuf, g_szCheck42Expect, cchCompare) != 0 \
+                || pszBuf[cchCompare] != chAfter) \
+                RTTestIFailed("at line %d: format '%s' (#1, cbBuf=%zu)\n" \
+                              "    output: '%s'\n"  \
+                              "    wanted: '%s'\n", \
+                              __LINE__, fmt, cbBuf, cbBuf ? pszBuf : "", g_szCheck42Expect); \
+            /*if (cch != cch1Expect) - code is buggy */ \
+            /*     RTTestIFailed("at line %d: Invalid length %d returned for cbBuf=%zu, expected %zd! (%#1)\n", */ \
+            /*                   __LINE__, cch, cbBuf, cch1Expect); */ \
+            \
+            cch2 = RTStrPrintf2(pszBuf, cbBuf, g_szCheck42Fmt, arg, 42, arg, 42);\
+            if (   memcmp(pszBuf, g_szCheck42Expect, cchCompare) != 0 \
+                || pszBuf[cchCompare] != chAfter) \
+                RTTestIFailed("at line %d: format '%s' (#2, cbBuf=%zu)\n" \
+                              "    output: '%s'\n"  \
+                              "    wanted: '%s'\n", \
+                              __LINE__, fmt, cbBuf, cbBuf ? pszBuf : "", g_szCheck42Expect); \
+            if (cch2 != cch2Expect) \
+                RTTestIFailed("at line %d: Invalid length %d returned for cbBuf=%zu, expected %zd! (%#2)\n", \
+                               __LINE__, cch2, cbBuf, cch2Expect); \
+        } \
+        RTTestIRestoreAssertions(); \
     } while (0)