Changeset 102466 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Dec 5, 2023 9:42:18 AM (14 months ago)

Author:

vboxsync

Message:

Shared Clipboard/testcases: Re-enabled (+ adapted) formerly disabled testcases of tstClipboardGH-X11. bugref:10384

File:

• trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardGH-X11.cpp (modified) (24 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardGH-X11.cpp

@@ -97 +97 @@
 static SHCLEVENTSOURCE g_EventSource;
 
-#if 0
 /* Set empty data in the simulated VBox clipboard. */
 static void tstClipEmptyVBox(PSHCLX11CTX pCtx, int retval)
@@ -130 +129 @@
     return VINF_SUCCESS;
 }
-#endif
 
 Display *XtDisplay(Widget w) { NOREF(w); return (Display *) 0xffff; }
@@ -247 +245 @@
 }
 
-#if 0
 static void tstClipInvalidateFormats(void)
 {
     g_tst_uX11Formats = ~0;
 }
-#endif
-
+
+static RTMSINTERVAL g_msTimeout = RT_MS_5SEC;
 /* Does our clipboard code currently own the selection? */
 static bool g_tst_fOwnsSel = false;
@@ -279 +276 @@
 }
 
-#if 0
 void XtDisownSelection(Widget widget, Atom selection, Time time)
 {
@@ -314 +310 @@
     return true;
 }
-#endif
 
 /* Set the current X selection data */
@@ -338 +333 @@
 }
 
-#if 0
 /* Configure if and how the X11 TARGETS clipboard target will fail. */
 static void tstClipSetTargetsFailure(void)
@@ -344 +338 @@
     g_tst_cTargets = 0;
 }
-#endif
 
 char *XtMalloc(Cardinal size)
@@ -394 +387 @@
 static int g_tst_rcCompleted = VINF_SUCCESS;
 static int g_tst_cbCompleted = 0;
-//static SHCLX11REQUEST *g_tst_pCompletedReq = NULL;
 static char g_tst_abCompletedBuf[TESTCASE_MAX_BUF_SIZE];
 
@@ -433 +425 @@
         g_tst_rcCompleted = VERR_BUFFER_OVERFLOW;
     g_tst_cbCompleted = cb;
-    //g_tst_pCompletedReq = pData->pReq;
 
     return VINF_SUCCESS;
@@ -456 +447 @@
 }
 
-#if 0
 static bool tstClipTextFormatConversion(PSHCLX11CTX pCtx)
 {
@@ -474 +464 @@
     return fSuccess;
 }
-#endif
-
-/*
-static void tstClipGetCompletedRequest(int *prc, char ** ppc, uint32_t *pcb, SHCLX11REQREAD **ppReq)
-{
-    *prc = g_tst_rcCompleted;
-    *ppc = g_tst_abCompletedBuf;
-    *pcb = g_tst_cbCompleted;
-    *ppReq = g_tst_pCompletedReq;
-}
-*/
 
 static void tstStringFromX11(RTTEST hTest, PSHCLX11CTX pCtx,
@@ -499 +478 @@
         uint32_t cbActual = 0;
         uint8_t  abBuf[TESTCASE_MAX_BUF_SIZE];
-        int rc = ShClX11ReadDataFromX11(pCtx, &g_EventSource, RT_MS_30SEC, VBOX_SHCL_FMT_UNICODETEXT, abBuf, sizeof(abBuf), &cbActual);
+        int rc = ShClX11ReadDataFromX11(pCtx, &g_EventSource, g_msTimeout, VBOX_SHCL_FMT_UNICODETEXT, abBuf, sizeof(abBuf), &cbActual);
         if (rc != rcExp)
             RTTestFailed(hTest, "Wrong return code, expected %Rrc, got %Rrc\n", rcExp, rc);
@@ -534 +513 @@
 }
 
-#if 0
 static void tstLatin1FromX11(RTTEST hTest, PSHCLX11CTX pCtx,
                              const char *pcszExp, int rcExp)
@@ -545 +523 @@
     else
     {
-        char *pc;
-        SHCLX11REQREAD *pReq = (SHCLX11REQREAD *)&pReq, *pReqRet = NULL;
-        ShClX11ReadDataFromX11Async(pCtx, VBOX_SHCL_FMT_UNICODETEXT, pReq);
-        int rc = VINF_SUCCESS;
         uint32_t cbActual = 0;
-        tstClipGetCompletedRequest(&rc, &pc, &cbActual, &pReqRet);
+        uint8_t  abBuf[TESTCASE_MAX_BUF_SIZE];
+        int rc = ShClX11ReadDataFromX11(pCtx, &g_EventSource, g_msTimeout, VBOX_SHCL_FMT_UNICODETEXT, abBuf, sizeof(abBuf), &cbActual);
         if (rc != rcExp)
-            RTTestFailed(hTest, "Wrong return code, expected %Rrc, got %Rrc\n",
-                         rcExp, rc);
-        else if (pReqRet != pReq)
-            RTTestFailed(hTest, "Wrong returned request data, expected %p, got %p\n",
-                         pReq, pReqRet);
+            RTTestFailed(hTest, "Wrong return code, expected %Rrc, got %Rrc\n", rcExp, rc);
         else if (RT_FAILURE(rcExp))
             retval = true;
@@ -570 +541 @@
             {
                 RTTestFailed(hTest, "Returned string is the wrong size, string \"%.*ls\", size %u, expected \"%s\", size %u\n",
-                             RT_MIN(TESTCASE_MAX_BUF_SIZE, cbActual), pc, cbActual,
+                             RT_MIN(TESTCASE_MAX_BUF_SIZE, cbActual), abBuf, cbActual,
                              pcszExp, cbExp);
             }
             else
             {
-                if (memcmp(pc, wcExp, cbExp) == 0)
+                if (memcmp(abBuf, wcExp, cbExp) == 0)
                     retval = true;
                 else
                     RTTestFailed(hTest, "Returned string \"%.*ls\" does not match expected string \"%s\"\n",
-                                 TESTCASE_MAX_BUF_SIZE, pc, pcszExp);
+                                 TESTCASE_MAX_BUF_SIZE, abBuf, pcszExp);
             }
         }
@@ -622 +593 @@
 static void tstNoX11(PSHCLX11CTX pCtx, const char *pcszTestCtx)
 {
-    SHCLX11REQREAD *pReq = (SHCLX11REQREAD *)&pReq;
-    int rc = ShClX11ReadDataFromX11Async(pCtx, VBOX_SHCL_FMT_UNICODETEXT, pReq);
+    uint32_t cbActual = 0;
+    uint8_t  abBuf[TESTCASE_MAX_BUF_SIZE];
+    int rc = ShClX11ReadDataFromX11(pCtx, &g_EventSource, g_msTimeout, VBOX_SHCL_FMT_UNICODETEXT, abBuf, sizeof(abBuf), &cbActual);
     RTTESTI_CHECK_MSG(rc == VERR_NO_DATA, ("context: %s\n", pcszTestCtx));
 }
@@ -658 +630 @@
     else
     {
-        char *pc;
-        SHCLX11REQREAD *pReq = (SHCLX11REQREAD *)&pReq, *pReqRet = NULL;
-        ShClX11ReadDataFromX11Async(pCtx, 0xF000 /* vboxFormat */, pReq);  /* Bad format. */
-        int rc = VINF_SUCCESS;
         uint32_t cbActual = 0;
-        tstClipGetCompletedRequest(&rc, &pc, &cbActual, &pReqRet);
+        uint8_t  abBuf[TESTCASE_MAX_BUF_SIZE];
+        int rc = ShClX11ReadDataFromX11(pCtx, &g_EventSource, g_msTimeout, 0xF000 /* vboxFormat */, abBuf, sizeof(abBuf), &cbActual);
         if (rc != VERR_NOT_IMPLEMENTED)
             RTTestFailed(hTest, "Wrong return code, expected VERR_NOT_IMPLEMENTED, got %Rrc\n",
@@ -673 +642 @@
     }
 }
-#endif
 
 int main()
@@ -699 +667 @@
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
 
+    uint32_t cbActual = 0;
+    uint8_t  abBuf[TESTCASE_MAX_BUF_SIZE];
+
     RTTESTI_CHECK_RC_OK(ShClEventSourceCreate(&g_EventSource, 0 /* ID */));
 
@@ -707 +678 @@
     tstStringFromX11(hTest, &X11Ctx, "hello world", VINF_SUCCESS);
 
-#if 0
     /* With an embedded carriage return */
     tstClipSetSelectionValues("text/plain;charset=UTF-8", XA_STRING,
@@ -772 +742 @@
      * Timeout from X11
      */
-    RTTestSub(hTest, "X11 timeout");
+    RTTestSub(hTest, "X11 conversion failure (timeout)");
     tstClipSetSelectionValues("UTF8_STRING", XT_CONVERT_FAIL, NULL,0, 8);
     tstStringFromX11(hTest, &X11Ctx, "", VERR_NO_DATA);
@@ -780 +750 @@
      */
     RTTestSub(hTest, "a data request from an empty X11 clipboard");
-    tstClipSetSelectionValues("UTF8_STRING", XA_STRING, NULL,
-                              0, 8);
-    ShClX11ReadDataFromX11Async(&X11Ctx, VBOX_SHCL_FMT_UNICODETEXT, pReq);
-    tstClipGetCompletedRequest(&rc, &pc, &cbActual, &pReqRet);
+    tstClipSetSelectionValues("UTF8_STRING", XA_STRING, NULL, 0, 8);
+    rc = ShClX11ReadDataFromX11(&X11Ctx, &g_EventSource, g_msTimeout, VBOX_SHCL_FMT_UNICODETEXT, abBuf, sizeof(abBuf), &cbActual);
     RTTEST_CHECK_MSG(hTest, rc == VERR_NO_DATA,
                      (hTest, "Returned %Rrc instead of VERR_NO_DATA\n",
                       rc));
-    RTTEST_CHECK_MSG(hTest, pReqRet == pReq,
-                     (hTest, "Wrong returned request data, expected %p, got %p\n",
-                     pReq, pReqRet));
 
     /*
@@ -806 +771 @@
     /* Testing for 0xffff will go into handling VBOX_SHCL_FMT_UNICODETEXT, where we don't have
      * have any data at the moment so far, so this will return VERR_NO_DATA. */
-    ShClX11ReadDataFromX11Async(&X11Ctx, 0xffff /* vboxFormat */, pReq);
-    tstClipGetCompletedRequest(&rc, &pc, &cbActual, &pReqRet);
+    rc = ShClX11ReadDataFromX11(&X11Ctx, &g_EventSource, g_msTimeout, 0xffff /* vboxFormat */, abBuf, sizeof(abBuf), &cbActual);
     RTTEST_CHECK_MSG(hTest, rc == VERR_NO_DATA,
                      (hTest, "Returned %Rrc instead of VERR_NO_DATA\n",
                       rc));
-    RTTEST_CHECK_MSG(hTest, pReqRet == pReq,
-                     (hTest, "Wrong returned request data, expected %p, got %p\n",
-                     pReq, pReqRet));
-
     /*
      * Targets failure from X11
@@ -938 +898 @@
                         sizeof("hello world") * 2);
     tstNoSelectionOwnership(&X11Ctx, "reading from VBox, headless clipboard");
-#endif
+
     ShClX11Destroy(&X11Ctx);
     ShClEventSourceDestroy(&g_EventSource);