Changeset 100685 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardGH-X11.cpp

Timestamp:

Jul 21, 2023 3:04:49 PM (18 months ago)

Author:

vboxsync

Message:

Shared Clipboard/X11: Enabled a minimal subset of the testcases again, to have at least a tiny bit of testing. bugref:9437

File:

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

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

@@ -95 +95 @@
 static void *g_tst_pvDataVBox = NULL;
 static uint32_t g_tst_cbDataVBox = 0;
-
+static SHCLEVENTSOURCE g_EventSource;
+
+#if 0
 /* Set empty data in the simulated VBox clipboard. */
 static void tstClipEmptyVBox(PSHCLX11CTX pCtx, int retval)
@@ -128 +130 @@
     return VINF_SUCCESS;
 }
+#endif
 
 Display *XtDisplay(Widget w) { NOREF(w); return (Display *) 0xffff; }
@@ -244 +247 @@
 }
 
+#if 0
 static void tstClipInvalidateFormats(void)
 {
     g_tst_uX11Formats = ~0;
 }
+#endif
 
 /* Does our clipboard code currently own the selection? */
@@ -274 +279 @@
 }
 
+#if 0
 void XtDisownSelection(Widget widget, Atom selection, Time time)
 {
@@ -308 +314 @@
     return true;
 }
+#endif
 
 /* Set the current X selection data */
@@ -331 +338 @@
 }
 
+#if 0
 /* Configure if and how the X11 TARGETS clipboard target will fail. */
 static void tstClipSetTargetsFailure(void)
@@ -336 +344 @@
     g_tst_cTargets = 0;
 }
+#endif
 
 char *XtMalloc(Cardinal size)
@@ -385 +394 @@
 static int g_tst_rcCompleted = VINF_SUCCESS;
 static int g_tst_cbCompleted = 0;
-static SHCLX11REQUEST *g_tst_pCompletedReq = NULL;
+//static SHCLX11REQUEST *g_tst_pCompletedReq = NULL;
 static char g_tst_abCompletedBuf[TESTCASE_MAX_BUF_SIZE];
 
@@ -424 +433 @@
         g_tst_rcCompleted = VERR_BUFFER_OVERFLOW;
     g_tst_cbCompleted = cb;
-    g_tst_pCompletedReq = pData->pReq;
+    //g_tst_pCompletedReq = pData->pReq;
 
     return VINF_SUCCESS;
@@ -447 +456 @@
 }
 
+#if 0
 static bool tstClipTextFormatConversion(PSHCLX11CTX pCtx)
 {
@@ -464 +474 @@
     return fSuccess;
 }
-
+#endif
+
+/*
 static void tstClipGetCompletedRequest(int *prc, char ** ppc, uint32_t *pcb, SHCLX11REQREAD **ppReq)
 {
@@ -472 +484 @@
     *ppReq = g_tst_pCompletedReq;
 }
+*/
 
 static void tstStringFromX11(RTTEST hTest, PSHCLX11CTX pCtx,
@@ -484 +497 @@
     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, RT_MS_30SEC, 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;
@@ -503 +509 @@
             RTUTF16 *pwcExp = wcExp;
             size_t cwc = 0;
-            rc = RTStrToUtf16Ex(pcszExp, RTSTR_MAX, &pwcExp,
-                                RT_ELEMENTS(wcExp), &cwc);
+            rc = RTStrToUtf16Ex(pcszExp, RTSTR_MAX, &pwcExp, RT_ELEMENTS(wcExp), &cwc);
+            AssertRC(rc);
             size_t cbExp = cwc * 2 + 2;
-            AssertRC(rc);
             if (RT_SUCCESS(rc))
             {
                 if (cbActual != cbExp)
                 {
-                    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,
-                                 pcszExp, cbExp);
+                    RTTestFailed(hTest, "Returned string is the wrong size: got size %u, expected %u\n", cbActual, cbActual);
                 }
                 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);
                 }
             }
@@ -531 +534 @@
 }
 
+#if 0
 static void tstLatin1FromX11(RTTEST hTest, PSHCLX11CTX pCtx,
                              const char *pcszExp, int rcExp)
@@ -669 +673 @@
     }
 }
+#endif
 
 int main()
@@ -694 +699 @@
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
 
-    char *pc;
-    uint32_t cbActual;
-    SHCLX11REQREAD *pReq = (SHCLX11REQREAD *)&pReq, *pReqRet = NULL;
+    RTTESTI_CHECK_RC_OK(ShClEventSourceCreate(&g_EventSource, 0 /* ID */));
 
     /* UTF-8 from X11 */
     RTTestSub(hTest, "reading UTF-8 from X11");
     /* Simple test */
-    tstClipSetSelectionValues("UTF8_STRING", XA_STRING, "hello world",
-                              sizeof("hello world"), 8);
+    tstClipSetSelectionValues("UTF8_STRING", XA_STRING, "hello world", sizeof("hello world"), 8);
     tstStringFromX11(hTest, &X11Ctx, "hello world", VINF_SUCCESS);
+
+#if 0
     /* With an embedded carriage return */
     tstClipSetSelectionValues("text/plain;charset=UTF-8", XA_STRING,
@@ -934 +938 @@
                         sizeof("hello world") * 2);
     tstNoSelectionOwnership(&X11Ctx, "reading from VBox, headless clipboard");
-
+#endif
     ShClX11Destroy(&X11Ctx);
+    ShClEventSourceDestroy(&g_EventSource);
 
     return RTTestSummaryAndDestroy(hTest);