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

Timestamp:

Jul 5, 2019 8:37:19 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131852

Message:

IPRT: Added RTSTRCONVERTHEXBYTES_F_SEP_COLON as well as a RTStrConvertHexBytesEx variant. bugref:9288

File:

• trunk/src/VBox/Runtime/testcase/tstStrToNum.cpp (modified) (5 diffs)

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

@@ -25 +25 @@
  */
 
-#include <iprt/initterm.h>
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#include <iprt/test.h>
 #include <iprt/string.h>
 #include <iprt/stream.h>
@@ -69 +73 @@
         int rc = Fun(Test.psz, NULL, Test.uBase, &Result); \
         if (Result != Test.Result) \
-        { \
-            RTPrintf("failure: '%s' -> " Fmt " expected " Fmt ". (%s/%u)\n", Test.psz, Result, Test.Result, #Fun, iTest); \
-            cErrors++; \
-        } \
+            RTTestIFailed("'%s' -> " Fmt " expected " Fmt ". (%s/%u)\n", Test.psz, Result, Test.Result, #Fun, iTest); \
         else if (rc != Test.rc) \
-        { \
-            RTPrintf("failure: '%s' -> rc=%Rrc expected %Rrc. (%s/%u)\n", Test.psz, rc, Test.rc, #Fun, iTest); \
-            cErrors++; \
-        } \
+            RTTestIFailed("'%s' -> rc=%Rrc expected %Rrc. (%s/%u)\n", Test.psz, rc, Test.rc, #Fun, iTest); \
     } while (0)
 
@@ -92 +90 @@
 int main()
 {
-    RTR3InitExeNoArguments(0);
-
-    int cErrors = 0;
+    RTTEST     hTest;
+    RTEXITCODE rcExit = RTTestInitAndCreate("tstRTStrToNum", &hTest);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        return rcExit;
+
     static const struct TstU64 aTstU64[] =
     {
@@ -159 +159 @@
 
 
-
     static const struct TstI32 aTstI32[] =
     {
@@ -223 +222 @@
     RUN_TESTS(aTstU32, uint32_t, "%#x", RTStrToUInt32Ex);
 
+
+    /*
+     * Test the some hex stuff too.
+     */
+    static const struct
+    {
+        const char *pszHex;
+        size_t      cbOut;
+        size_t      offNext;
+        uint8_t     bLast;
+        bool        fColon;
+        int         rc;
+    } s_aConvertHexTests[] =
+    {
+        { "00",          1,  2, 0x00,  true, VINF_SUCCESS },
+        { "00",          1,  2, 0x00, false, VINF_SUCCESS },
+        { "000102",      3,  6, 0x02,  true, VINF_SUCCESS },
+        { "00019",       2,  4, 0x01, false, VERR_UNEVEN_INPUT },
+        { "00019",       2,  4, 0x01,  true, VERR_UNEVEN_INPUT },
+        { "0001:9",      3,  6, 0x09,  true, VINF_SUCCESS},
+        { "000102",      3,  6, 0x02, false, VINF_SUCCESS },
+        { "0:1",         2,  3, 0x01,  true, VINF_SUCCESS },
+        { ":",           2,  1, 0x00,  true, VINF_SUCCESS },
+        { "0:01",        2,  4, 0x01,  true, VINF_SUCCESS },
+        { "00:01",       2,  5, 0x01,  true, VINF_SUCCESS },
+        { ":1:2:3:4:5",  6, 10, 0x05,  true, VINF_SUCCESS },
+        { ":1:2:3::5",   6,  9, 0x05,  true, VINF_SUCCESS },
+        { ":1:2:3:4:",   6,  9, 0x00,  true, VINF_SUCCESS },
+    };
+    for (unsigned i = 0; i < RT_ELEMENTS(s_aConvertHexTests); i++)
+    {
+        uint8_t abBuf[1024];
+        memset(abBuf, 0xf6, sizeof(abBuf));
+        const char *pszExpectNext = &s_aConvertHexTests[i].pszHex[s_aConvertHexTests[i].offNext];
+        const char *pszNext       = "";
+        size_t      cbReturned    = 77777;
+        int rc = RTStrConvertHexBytesEx(s_aConvertHexTests[i].pszHex, abBuf, s_aConvertHexTests[i].cbOut,
+                                        s_aConvertHexTests[i].fColon ? RTSTRCONVERTHEXBYTES_F_SEP_COLON : 0,
+                                        &pszNext, &cbReturned);
+        if (   rc      != s_aConvertHexTests[i].rc
+            || pszNext != pszExpectNext
+            || abBuf[s_aConvertHexTests[i].cbOut - 1] != s_aConvertHexTests[i].bLast
+            )
+            RTTestFailed(hTest, "RTStrConvertHexBytesEx/#%u %s -> %Rrc %p %#zx %#02x, expected %Rrc %p %#zx %#02x\n",
+                         i, s_aConvertHexTests[i].pszHex,
+                         rc, pszNext, cbReturned, abBuf[s_aConvertHexTests[i].cbOut - 1],
+                         s_aConvertHexTests[i].rc, pszExpectNext, s_aConvertHexTests[i].cbOut, s_aConvertHexTests[i].bLast);
+    }
+
+
     /*
      * Summary.
      */
-    if (!cErrors)
-        RTPrintf("tstStrToNum: SUCCESS\n");
-    else
-        RTPrintf("tstStrToNum: FAILURE - %d errors\n", cErrors);
-    return !!cErrors;
+    return RTTestSummaryAndDestroy(hTest);
 }