Changeset 36809 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/testcase

Timestamp:

Apr 21, 2011 11:03:07 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/seamless: no more std::autoptr or std::vector, use the new STL-vector-in-C instead - this time the right testcase

File:

• trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -15 +15 @@
  */
 
-#include <iostream>
 #include <stdlib.h> /* exit() */
 
@@ -594 +593 @@
         ++cErrs;
     }
-    std::auto_ptr<std::vector<RTRECT> > rects = subject.getRects();
-    if (rects->size() != pFixture->cReportedRects)
+    RTRECT *pRects = subject.getRects();
+    size_t cRects = subject.getRectCount();
+    if (cRects != pFixture->cReportedRects)
     {
         RTPrintf("%s: fixture: %s.  Wrong number of rectangles reported after processing event (expected %u, got %u).\n",
                  g_pszTestName, pszDesc, pFixture->cReportedRects,
-                 (*rects).size());
+                 cRects);
         ++cErrs;
     }
     else
-        for (unsigned i = 0; i < rects->size(); ++i)
-            if (!smlsCompRect(&(*rects)[i], &pFixture->paReportedRects[i]))
+        for (unsigned i = 0; i < cRects; ++i)
+            if (!smlsCompRect(&pRects[i], &pFixture->paReportedRects[i]))
             {
                 RTPrintf("%s: fixture: %s.  Rectangle %u wrong after processing event.\n",
                          g_pszTestName, pszDesc, i);
                 smlsPrintDiffRects(&pFixture->paReportedRects[i],
-                                   &(*rects)[i]);
+                                   &pRects[i]);
                 ++cErrs;
                 break;
@@ -615 +615 @@
     subject.stop();
     subject.start();
-    if (rects->size() != pFixture->cReportedRects)
+    if (cRects != pFixture->cReportedRects)
     {
         RTPrintf("%s: fixture: %s.  Wrong number of rectangles reported without processing event (expected %u, got %u).\n",
                  g_pszTestName, pszDesc, pFixture->cReportedRects,
-                 (*rects).size());
+                 cRects);
         ++cErrs;
     }
     else
-        for (unsigned i = 0; i < rects->size(); ++i)
-            if (!smlsCompRect(&(*rects)[i], &pFixture->paReportedRects[i]))
+        for (unsigned i = 0; i < cRects; ++i)
+            if (!smlsCompRect(&pRects[i], &pFixture->paReportedRects[i]))
             {
                 RTPrintf("%s: fixture: %s.  Rectangle %u wrong without processing event.\n",
                          g_pszTestName, pszDesc, i);
                 smlsPrintDiffRects(&pFixture->paReportedRects[i],
-                                   &(*rects)[i]);
+                                   &pRects[i]);
                 ++cErrs;
                 break;