Changeset 74194 in vbox for trunk/src

Timestamp:

Sep 11, 2018 11:38:01 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: More array tests. bugref:9167

File:

• trunk/src/VBox/Runtime/testcase/tstRTCRest-1.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/testcase/tstRTCRest-1.cpp

@@ -1535 +1535 @@
         RTTESTI_CHECK_RC(Arr2.insert(2, new MyRestInt16(2)), VINF_SUCCESS);
         verifyArray(Arr2, __LINE__, 10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
+        RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size(), ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size()));
 
         RTTESTI_CHECK(Arr2.size() == 10);
@@ -1541 +1542 @@
         {
             MyRestInt16 *pCur = Arr2.at(i);
-            RTTESTI_CHECK(pCur->m_iValue == i);
+            RTTESTI_CHECK(pCur->m_iValue == (int16_t)i);
 
             MyRestInt16 const *pCur2 = pConstArr2->at(i);
-            RTTESTI_CHECK(pCur2->m_iValue == i);
+            RTTESTI_CHECK(pCur2->m_iValue == (int16_t)i);
         }
 
@@ -1558 +1559 @@
         RTTESTI_CHECK_RC(Arr2.replaceCopy(2, MyRestInt16(2)), VWRN_ALREADY_EXISTS);
         verifyArray(Arr2, __LINE__, 11, 0, 1, 2, 3, 4, 5, 6, 77, 8, 9, 10);
+        RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size(), ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size()));
 
         /* copy constructor: */
@@ -1565 +1567 @@
         }
         verifyArray(Arr2, __LINE__, 11, 0, 1, 2, 3, 4, 5, 6, 77, 8, 9, 10);
+        RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size(), ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size()));
 
         {
@@ -1573 +1576 @@
         }
         verifyArray(Arr2, __LINE__, 11, 0, 1, 2, 3, 4, 5, 6, 77, 8, 9, 10);
-
-        /* copy method: */
+        RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size(), ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size()));
+
+        /* copy method + clear: */
         {
             RTCRestArray<MyRestInt16> Arr2Copy3;
@@ -1586 +1590 @@
         }
         verifyArray(Arr2, __LINE__, 11, 0, 1, 2, 3, 4, 5, 6, 77, 8, 9, 10);
+        RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size(), ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size()));
+
+        /* Check setNull and resetToDefaults with copies: */
+        {
+            RTCRestArray<MyRestInt16> Arr2Copy4(Arr2);
+            verifyArray(Arr2Copy4, __LINE__, 11, 0, 1, 2, 3, 4, 5, 6, 77, 8, 9, 10);
+
+            RTTESTI_CHECK_RC(Arr2Copy4.setNull(), VINF_SUCCESS);
+            verifyArray(Arr2Copy4, __LINE__, 0);
+            RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size(), ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size()));
+            RTTESTI_CHECK(Arr2Copy4.isNull() == true);
+
+            RTTESTI_CHECK_RC(Arr2Copy4.resetToDefault(), VINF_SUCCESS);
+            RTTESTI_CHECK(Arr2Copy4.isNull() == false);
+            verifyArray(Arr2Copy4, __LINE__, 0);
+        }
+        verifyArray(Arr2, __LINE__, 11, 0, 1, 2, 3, 4, 5, 6, 77, 8, 9, 10);
+        {
+            RTCRestArray<MyRestInt16> Arr2Copy5(Arr2);
+            verifyArray(Arr2Copy5, __LINE__, 11, 0, 1, 2, 3, 4, 5, 6, 77, 8, 9, 10);
+
+            RTTESTI_CHECK_RC(Arr2Copy5.resetToDefault(), VINF_SUCCESS);
+            verifyArray(Arr2Copy5, __LINE__, 0);
+            RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size(), ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size()));
+            RTTESTI_CHECK(Arr2Copy5.isNull() == false);
+
+            RTTESTI_CHECK_RC(Arr2Copy5.setNull(), VINF_SUCCESS);
+            RTTESTI_CHECK(Arr2Copy5.isNull() == true);
+
+            RTTESTI_CHECK_RC(Arr2Copy5.append(new MyRestInt16(100)), VINF_SUCCESS);
+            RTTESTI_CHECK(Arr2Copy5.isNull() == false);
+            verifyArray(Arr2Copy5, __LINE__, 1, 100);
+            RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size() + 1, ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size() + 1));
+        }
+        verifyArray(Arr2, __LINE__, 11, 0, 1, 2, 3, 4, 5, 6, 77, 8, 9, 10);
+
         RTTESTI_CHECK_MSG(MyRestInt16::s_cInstances == Arr2.size(), ("%zu vs %zu\n", MyRestInt16::s_cInstances, Arr2.size()));
     }
@@ -1640 +1680 @@
             RTTESTI_CHECK_RC(Arr3.removeAt(i), VINF_SUCCESS);
             cElements--;
-            RTTESTI_CHECK(Arr3.size() == cElements);
+            RTTESTI_CHECK((ssize_t)Arr3.size() == cElements);
         }