Changeset 86357 in vbox

Timestamp:

Sep 30, 2020 6:07:34 PM (4 years ago)

Author:

vboxsync

Message:

tstRTStrFormat: More cleanup.

File:

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

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

@@ -146 +146 @@
 
 
+
+static void testAllocPrintf(RTTEST hTest)
+{
+    RTTestSub(hTest, "RTStrAPrintf");
+    char *psz = (char *)~0;
+    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"
+                      "got   : '%s'\n"
+                      "wanted: 'Hey there! This is a test!'\n",
+                      psz);
+    else if ((int)strlen(psz) != cch3)
+        RTTestIFailed("RTStrAPrintf failed, cch3 == %d expected %u\n", cch3, strlen(psz));
+    RTStrFree(psz);
+}
 
 
@@ -834 +851 @@
 }
 
+static void testX86RegisterFormatter(RTTEST hTest, char *pszBuf)
+{
+
+    RTTestSub(hTest, "x86 register format types (%RAx86[*])");
+    CHECK42("%RAx86[cr0]",  UINT64_C(0x80000011), "80000011{PE,ET,PG}");
+    CHECK42("%RAx86[cr0]",  UINT64_C(0x80000001), "80000001{PE,PG}");
+    CHECK42("%RAx86[cr0]",  UINT64_C(0x00000001), "00000001{PE}");
+    CHECK42("%RAx86[cr0]",  UINT64_C(0x80000000), "80000000{PG}");
+    CHECK42("%RAx86[cr4]",  UINT64_C(0x80000001), "80000001{VME,unkn=80000000}");
+    CHECK42("%#RAx86[cr4]", UINT64_C(0x80000001), "0x80000001{VME,unkn=0x80000000}");
+}
+
 static void testCustomTypes(RTTEST hTest, char *pszBuf)
 {
@@ -917 +946 @@
      * allocation
      */
-    RTTestSub(hTest, "RTStrAPrintf");
-    char *psz = (char *)~0;
-    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"
-                      "got   : '%s'\n"
-                      "wanted: 'Hey there! This is a test!'\n",
-                      psz);
-    else if ((int)strlen(psz) != cch3)
-        RTTestIFailed("RTStrAPrintf failed, cch3 == %d expected %u\n", cch3, strlen(psz));
-    RTStrFree(psz);
+    testAllocPrintf(hTest);
 
     /*
@@ -970 +987 @@
      * x86 register formatting.
      */
-    RTTestSub(hTest, "x86 register format types (%RAx86[*])");
-    CHECK42("%RAx86[cr0]", UINT64_C(0x80000011),    "80000011{PE,ET,PG}");
-    CHECK42("%RAx86[cr0]", UINT64_C(0x80000001),    "80000001{PE,PG}");
-    CHECK42("%RAx86[cr0]", UINT64_C(0x00000001),    "00000001{PE}");
-    CHECK42("%RAx86[cr0]", UINT64_C(0x80000000),    "80000000{PG}");
-    CHECK42("%RAx86[cr4]", UINT64_C(0x80000001),    "80000001{VME,unkn=80000000}");
-    CHECK42("%#RAx86[cr4]", UINT64_C(0x80000001),    "0x80000001{VME,unkn=0x80000000}");
+    testX86RegisterFormatter(hTest, pszBuf);
 
     /*