Changeset 19205 in vbox

Timestamp:

Apr 27, 2009 10:03:40 AM (16 years ago)

Author:

vboxsync

Message:

tstUuid: Updated to RTTest and added tests for the new Utf16 functions.

File:

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

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

@@ -34 +34 @@
 *******************************************************************************/
 #include <iprt/uuid.h>
+#include <iprt/test.h>
 #include <iprt/stream.h>
 #include <iprt/err.h>
@@ -43 +44 @@
 {
     int rc;
-    int cErrors = 0;
-
-    rc = RTR3Init();
-    if (rc)
+    RTTEST hTest;
+    if (    RT_FAILURE(rc = RTR3Init())
+        ||  RT_FAILURE(rc = RTTestCreate("tstUuid", &hTest)))
     {
-        RTPrintf("RTR3Init failed: %Rrc\n", rc);
+        RTPrintf("tstUuid: RTR3Init or RTTestCreate failed: %Rrc\n", rc);
         return 1;
     }
-
-#define CHECK_RC()      \
-    do { if (RT_FAILURE(rc)) { RTPrintf("tstUuid(%d): rc=%Rrc!\n", __LINE__, rc); cErrors++; } } while (0)
-#define CHECK_EXPR(expr) \
-    do { const bool f = !!(expr); if (!f) { RTPrintf("tstUuid(%d): %s!\n", __LINE__, #expr); cErrors++; } } while (0)
-
+    RTTestBanner(hTest);
+
+
+#define CHECK_RC() \
+    do { if (RT_FAILURE(rc)) { RTTestFailed(hTest, "line %d: rc=%Rrc", __LINE__, rc); } } while (0)
+
+    RTTestSub(hTest, "RTUuidClear & RTUuisIsNull");
     RTUUID UuidNull;
     rc = RTUuidClear(&UuidNull); CHECK_RC();
-    CHECK_EXPR(RTUuidIsNull(&UuidNull));
-    CHECK_EXPR(RTUuidCompare(&UuidNull, &UuidNull) == 0);
-
+
+    RTTEST_CHECK(hTest, RTUuidIsNull(&UuidNull));
+    RTTEST_CHECK(hTest, RTUuidCompare(&UuidNull, &UuidNull) == 0);
+
+    RTTestSub(hTest, "RTUuidCreate");
     RTUUID Uuid;
     rc = RTUuidCreate(&Uuid); CHECK_RC();
-    CHECK_EXPR(!RTUuidIsNull(&Uuid));
-    CHECK_EXPR(RTUuidCompare(&Uuid, &Uuid) == 0);
-    CHECK_EXPR(RTUuidCompare(&Uuid, &UuidNull) > 0);
-    CHECK_EXPR(RTUuidCompare(&UuidNull, &Uuid) < 0);
-
+    RTTEST_CHECK(hTest, !RTUuidIsNull(&Uuid));
+    RTTEST_CHECK(hTest, RTUuidCompare(&Uuid, &Uuid) == 0);
+    RTTEST_CHECK(hTest, RTUuidCompare(&Uuid, &UuidNull) > 0);
+    RTTEST_CHECK(hTest, RTUuidCompare(&UuidNull, &Uuid) < 0);
+
+    RTTestSub(hTest, "RTUuidToStr");
     char sz[RTUUID_STR_LENGTH];
     rc = RTUuidToStr(&Uuid, sz, sizeof(sz)); CHECK_RC();
+    RTTEST_CHECK(hTest, strlen(sz) == RTUUID_STR_LENGTH - 1);
+    RTTestPrintf(hTest, RTTESTLVL_INFO, "UUID=%s\n", sz);
+
+    RTTestSub(hTest, "RTUuidFromStr");
     RTUUID Uuid2;
     rc = RTUuidFromStr(&Uuid2, sz); CHECK_RC();
-    CHECK_EXPR(RTUuidCompare(&Uuid, &Uuid2) == 0);
-
-    RTPrintf("tstUuid: Created {%s}\n", sz);
+    RTTEST_CHECK(hTest, RTUuidCompare(&Uuid, &Uuid2) == 0);
+
+    RTTestSub(hTest, "RTUuidToUtf16");
+    RTUTF16 wsz[RTUUID_STR_LENGTH];
+    rc = RTUuidToUtf16(&Uuid, wsz, sizeof(wsz)); CHECK_RC();
+    RTTEST_CHECK(hTest, RTUtf16Len(wsz) == RTUUID_STR_LENGTH - 1);
+
+    RTTestSub(hTest, "RTUuidFromUtf16");
+    rc = RTUuidFromUtf16(&Uuid2, wsz); CHECK_RC();
+    RTTEST_CHECK(hTest, RTUuidCompare(&Uuid, &Uuid2) == 0);
+
 
     /*
      * Check the binary representation.
      */
+    RTTestSub(hTest, "Binary representation");
     RTUUID Uuid3;
     Uuid3.au8[0]  = 0x01;
@@ -101 +118 @@
     const char *pszUuid3 = "67452301-ab89-4fcd-90b2-547698badcfe";
     rc = RTUuidToStr(&Uuid3, sz, sizeof(sz)); CHECK_RC();
-    CHECK_EXPR(strcmp(sz, pszUuid3) == 0);
+    RTTEST_CHECK(hTest, strcmp(sz, pszUuid3) == 0);
     rc = RTUuidFromStr(&Uuid, pszUuid3); CHECK_RC();
-    CHECK_EXPR(RTUuidCompare(&Uuid, &Uuid3) == 0);
-    CHECK_EXPR(memcmp(&Uuid3, &Uuid, sizeof(Uuid)) == 0);
+    RTTEST_CHECK(hTest, RTUuidCompare(&Uuid, &Uuid3) == 0);
+    RTTEST_CHECK(hTest, memcmp(&Uuid3, &Uuid, sizeof(Uuid)) == 0);
 
     /*
      * checking the clock seq and time hi and version bits...
      */
+    RTTestSub(hTest, "Clock seq, time hi, version bits");
     RTUUID Uuid4Changes;
     Uuid4Changes.au64[0] = 0;
@@ -167 +185 @@
     Uuid4Fixed.au64[0] = ~Uuid4Changes.au64[0];
     Uuid4Fixed.au64[1] = ~Uuid4Changes.au64[1];
-    RTPrintf("tstUuid: fixed bits: %RTuuid (mask)\n", &Uuid4Fixed);
-    RTPrintf("tstUuid:        raw: %.*Rhxs\n", sizeof(Uuid4Fixed), &Uuid4Fixed);
+    RTTestPrintf(hTest, RTTESTLVL_INFO, "fixed bits: %RTuuid (mask)\n", &Uuid4Fixed);
+    RTTestPrintf(hTest, RTTESTLVL_INFO, "tstUuid:        raw: %.*Rhxs\n", sizeof(Uuid4Fixed), &Uuid4Fixed);
 
     Uuid4Prev.au64[0] &= Uuid4Fixed.au64[0];
     Uuid4Prev.au64[1] &= Uuid4Fixed.au64[1];
-    RTPrintf("tstUuid: fixed bits: %RTuuid (value)\n", &Uuid4Prev);
-    RTPrintf("tstUuid:        raw: %.*Rhxs\n", sizeof(Uuid4Prev), &Uuid4Prev);
+    RTTestPrintf(hTest, RTTESTLVL_INFO, "tstUuid: fixed bits: %RTuuid (value)\n", &Uuid4Prev);
+    RTTestPrintf(hTest, RTTESTLVL_INFO, "tstUuid:        raw: %.*Rhxs\n", sizeof(Uuid4Prev), &Uuid4Prev);
 
     /*
      * Summary.
      */
-    if (!cErrors)
-        RTPrintf("tstUuid: SUCCESS {%s}\n", sz);
-    else
-        RTPrintf("tstUuid: FAILED - %d errors\n", cErrors);
-    return !!cErrors;
+    return RTTestSummaryAndDestroy(hTest);
 }