Changeset 86371 in vbox for trunk

Timestamp:

Oct 1, 2020 5:23:53 AM (4 years ago)

Author:

vboxsync

Message:

tstGuestCtrlParseBuffer: Must disable assertions when doing test expected to trigger some. bugref:9841

File:

• trunk/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp (modified) (10 diffs)

trunk/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp

@@ -65 +65 @@
     const char *pbData;
     size_t      cbData;
-    uint32_t    uOffsetStart;
-    uint32_t    uOffsetAfter;
-    uint32_t    uMapElements;
+    uint32_t    offStart;
+    uint32_t    offAfter;
+    uint32_t    cMapElements;
     int         iResult;
-} g_aTestBlock[] =
+} g_aTestBlocks[] =
 {
     /*
@@ -119 +119 @@
     size_t      cbData;
     /** Number of data blocks retrieved. These are separated by "\0\0". */
-    uint32_t    uNumBlocks;
+    uint32_t    cBlocks;
     /** Overall result when done parsing. */
     int         iResult;
-} g_aTestStream[] =
+} const g_aTestStream[] =
 {
     /* No blocks. */
@@ -140 +140 @@
         const char *pbData;
         size_t      cbData;
-        uint32_t    uOffsetStart;
-        uint32_t    uOffsetAfter;
-        uint32_t    uMapElements;
+        uint32_t    offStart;
+        uint32_t    offAfter;
+        uint32_t    cMapElements;
         int         iResult;
-    } s_aTest[] =
+    } const s_aTest[] =
     {
         { "test5=test5\0t51=t51",           sizeof("test5=test5\0t51=t51"),                            0,  sizeof("test5=test5\0") - 1,                   1, VERR_MORE_DATA },
@@ -175 +175 @@
 {
     RTTEST hTest;
-    int rc = RTTestInitAndCreate("tstParseBuffer", &hTest);
-    if (rc)
-        return rc;
+    RTEXITCODE rcExit = RTTestInitAndCreate("tstParseBuffer", &hTest);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        return rcExit;
     RTTestBanner(hTest);
 
@@ -195 +195 @@
 
     if (sizeof("sizecheck") != 10)
-        RTTestFailed(hTest, "Basic size test #1 failed (%u <-> 10)", sizeof("sizecheck"));
+        RTTestFailed(hTest, "Basic size test #1 failed (%zu <-> 10)", sizeof("sizecheck"));
     if (sizeof("off=rab") != 8)
-        RTTestFailed(hTest, "Basic size test #2 failed (%u <-> 7)", sizeof("off=rab"));
+        RTTestFailed(hTest, "Basic size test #2 failed (%zu <-> 7)", sizeof("off=rab"));
     if (sizeof("off=rab\0\0") != 10)
-        RTTestFailed(hTest, "Basic size test #3 failed (%u <-> 10)", sizeof("off=rab\0\0"));
+        RTTestFailed(hTest, "Basic size test #3 failed (%zu <-> 10)", sizeof("off=rab\0\0"));
 
     RTTestIPrintf(RTTESTLVL_INFO, "Doing line tests ...\n");
@@ -208 +208 @@
 
     unsigned iTest;
-    for (iTest = 0; iTest < RT_ELEMENTS(g_aTestBlock); iTest++)
+    for (iTest = 0; iTest < RT_ELEMENTS(g_aTestBlocks); iTest++)
     {
         RTTestIPrintf(RTTESTLVL_DEBUG, "=> Test #%u\n", iTest);
 
         GuestProcessStream stream;
-        int iResult = stream.AddData((BYTE*)g_aTestBlock[iTest].pbData, g_aTestBlock[iTest].cbData);
+        if (RT_FAILURE(g_aTestBlocks[iTest].iResult))
+            RTTestDisableAssertions(hTest);
+        int iResult = stream.AddData((BYTE *)g_aTestBlocks[iTest].pbData, g_aTestBlocks[iTest].cbData);
+        if (RT_FAILURE(g_aTestBlocks[iTest].iResult))
+            RTTestRestoreAssertions(hTest);
         if (RT_SUCCESS(iResult))
         {
             GuestProcessStreamBlock curBlock;
             iResult = stream.ParseBlock(curBlock);
-            if (iResult != g_aTestBlock[iTest].iResult)
-            {
-                RTTestFailed(hTest, "\tReturned %Rrc, expected %Rrc\n",
-                             iResult, g_aTestBlock[iTest].iResult);
-            }
-            else if (stream.GetOffset() != g_aTestBlock[iTest].uOffsetAfter)
-            {
-                RTTestFailed(hTest, "\tOffset %zu wrong, expected %u\n",
-                             stream.GetOffset(), g_aTestBlock[iTest].uOffsetAfter);
-            }
+            if (iResult != g_aTestBlocks[iTest].iResult)
+                RTTestFailed(hTest, "\tReturned %Rrc, expected %Rrc\n", iResult, g_aTestBlocks[iTest].iResult);
+            else if (stream.GetOffset() != g_aTestBlocks[iTest].offAfter)
+                RTTestFailed(hTest, "\tOffset %zu wrong, expected %u\n", stream.GetOffset(), g_aTestBlocks[iTest].offAfter);
             else if (iResult == VERR_MORE_DATA)
-            {
                 RTTestIPrintf(RTTESTLVL_DEBUG, "\tMore data (Offset: %zu)\n", stream.GetOffset());
-            }
-
-            if (  (   RT_SUCCESS(iResult)
-                   || iResult == VERR_MORE_DATA))
-            {
-                if (curBlock.GetCount() != g_aTestBlock[iTest].uMapElements)
-                {
+
+            if (RT_SUCCESS(iResult) || iResult == VERR_MORE_DATA)
+                if (curBlock.GetCount() != g_aTestBlocks[iTest].cMapElements)
                     RTTestFailed(hTest, "\tMap has %u elements, expected %u\n",
-                                 curBlock.GetCount(), g_aTestBlock[iTest].uMapElements);
-                }
-            }
+                                 curBlock.GetCount(), g_aTestBlocks[iTest].cMapElements);
 
             /* There is remaining data left in the buffer (which needs to be merged
              * with a following buffer) -- print it. */
             size_t off = stream.GetOffset();
-            size_t cbToWrite = g_aTestBlock[iTest].cbData - off;
+            size_t cbToWrite = g_aTestBlocks[iTest].cbData - off;
             if (cbToWrite)
             {
@@ -254 +245 @@
                  * Hack alert: Using RTEnvGet for now. */
                 if (!RTStrICmp(RTEnvGet("IPRT_TEST_MAX_LEVEL"), "debug"))
-                    RTStrmWriteEx(g_pStdOut, &g_aTestBlock[iTest].pbData[off], cbToWrite - 1, NULL);
+                    RTStrmWriteEx(g_pStdOut, &g_aTestBlocks[iTest].pbData[off], cbToWrite - 1, NULL);
             }
         }
@@ -269 +260 @@
         if (RT_SUCCESS(iResult))
         {
-            uint32_t uNumBlocks = 0;
+            uint32_t cBlocks = 0;
             uint8_t uSafeCouunter = 0;
             do
@@ -280 +271 @@
                     /* Only count block which have at least one pair. */
                     if (curBlock.GetCount())
-                        uNumBlocks++;
+                        cBlocks++;
                 }
                 if (uSafeCouunter++ > 32)
@@ -287 +278 @@
 
             if (iResult != g_aTestStream[iTest].iResult)
-            {
-                RTTestFailed(hTest, "\tReturned %Rrc, expected %Rrc\n",
-                             iResult, g_aTestStream[iTest].iResult);
-            }
-            else if (uNumBlocks != g_aTestStream[iTest].uNumBlocks)
-            {
-                RTTestFailed(hTest, "\tReturned %u blocks, expected %u\n",
-                             uNumBlocks, g_aTestStream[iTest].uNumBlocks);
-            }
+                RTTestFailed(hTest, "\tReturned %Rrc, expected %Rrc\n", iResult, g_aTestStream[iTest].iResult);
+            else if (cBlocks != g_aTestStream[iTest].cBlocks)
+                RTTestFailed(hTest, "\tReturned %u blocks, expected %u\n", cBlocks, g_aTestStream[iTest].cBlocks);
         }
         else