Changeset 13971 in vbox for trunk/src/VBox/HostServices/GuestProperties/testcase

Timestamp:

Nov 7, 2008 4:07:57 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

39008

Message:

HostServices/GuestProperties: added blocking waits for notifications

File:

• trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp

@@ -735 +735 @@
     }
 
-    /* Test when no new events are available */
-    pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL,
-                    GET_NOTIFICATION, 3, paParms);
-    if (   RT_FAILURE(callHandle.rc)
-        || RT_FAILURE(paParms[0].getUInt64 (&u64Timestamp))
-        || u64Timestamp != 0
-       )
-    {
-        RTPrintf("Failed to signal properly that no new notifications are available.\n");
-        rc = VERR_UNRESOLVED_ERROR;
-    }
-
     /* Test a query with an unknown timestamp */
     paParms[0].setUInt64 (1);
@@ -775 +763 @@
  * @note    prints its own diagnostic information to stdout.
  */
-int testNoNotifications(VBOXHGCMSVCFNTABLE *pTable)
+int testNoNotifications(VBOXHGCMSVCFNTABLE *pTable, VBOXHGCMCALLHANDLE_TYPEDEF *callHandle,
+                        VBOXHGCMSVCPARM *paParms, char *pchBuffer, size_t cchBuffer)
 {
     int rc = VINF_SUCCESS;
-    VBOXHGCMCALLHANDLE_TYPEDEF callHandle = { VINF_SUCCESS };
-    char chBuffer[MAX_NAME_LEN + MAX_VALUE_LEN + MAX_FLAGS_LEN];
-
-    RTPrintf("Testing the GET_NOTIFICATION call when no notifications are available.\n");
+
+    RTPrintf("Testing the asynchronous GET_NOTIFICATION call with no notifications are available.\n");
     uint64_t u64Timestamp = 0;
     uint32_t u32Size = 0;
-    VBOXHGCMSVCPARM paParms[3];
 
     paParms[0].setUInt64 (u64Timestamp);
-    paParms[1].setPointer ((void *) chBuffer, sizeof(chBuffer));
-    pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL,
+    paParms[1].setPointer ((void *) pchBuffer, cchBuffer);
+    callHandle->rc = VINF_HGCM_ASYNC_EXECUTE;
+    pTable->pfnCall(pTable->pvService, callHandle, 0, NULL,
                     GET_NOTIFICATION, 3, paParms);
-    if (   RT_FAILURE(callHandle.rc)
-        || RT_FAILURE(paParms[0].getUInt64 (&u64Timestamp))
-        || u64Timestamp != 0
-       )
-    {
-        RTPrintf("Failed to signal properly that no new notifications are available.\n");
+    if (callHandle->rc != VINF_HGCM_ASYNC_EXECUTE)
+    {
+        RTPrintf("GET_NOTIFICATION call completed when new notifications should be available.\n");
         rc = VERR_UNRESOLVED_ERROR;
     }
@@ -805 +789 @@
     VBOXHGCMSVCFNTABLE svcTable;
     VBOXHGCMSVCHELPERS svcHelpers;
+    /* Paramters for the asynchronous guest notification call */
+    VBOXHGCMSVCPARM aParm[3];
+    char chBuffer[MAX_NAME_LEN + MAX_VALUE_LEN + MAX_FLAGS_LEN];
+    VBOXHGCMCALLHANDLE_TYPEDEF callHandleStruct;
+
     initTable(&svcTable, &svcHelpers);
     RTR3Init();
@@ -819 +808 @@
     if (RT_FAILURE(testEnumPropsHost(&svcTable)))
         return 1;
-    if (RT_FAILURE(testNoNotifications(&svcTable)))
+    /* Asynchronous notification call */
+    if (RT_FAILURE(testNoNotifications(&svcTable, &callHandleStruct, aParm,
+                   chBuffer, sizeof(chBuffer))))
         return 1;
     if (RT_FAILURE(testSetProp(&svcTable)))
         return 1;
+    RTPrintf("Checking the data returned by the asynchronous notification call.\n");
+    /* Our previous notification call should have completed by now. */
+    uint64_t u64Timestamp;
+    uint32_t u32Size;
+    if (   callHandleStruct.rc != VINF_SUCCESS
+        || RT_FAILURE(aParm[0].getUInt64 (&u64Timestamp))
+        || RT_FAILURE(aParm[2].getUInt32 (&u32Size))
+        || u32Size != getNotifications[0].cchBuffer
+        || memcmp(chBuffer, getNotifications[0].pchBuffer, u32Size) != 0
+       )
+    {
+        RTPrintf("Asynchronous GET_NOTIFICATION call did not complete as expected, rc=%Rrc\n",
+                 callHandleStruct.rc);
+        return 1;
+    }
     if (RT_FAILURE(testDelProp(&svcTable)))
         return 1;