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

Timestamp:

Jul 9, 2009 11:58:45 AM (16 years ago)

Author:

vboxsync

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

49824

Message:

GuestHost/SharedClipboard: test for correct update notifications about available X11 targets

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (4 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp

@@ -423 +423 @@
                                  size_t cTargets)
 {
-    bool changed = true;
+    bool changed = false;
 
     Log3 (("%s: called\n", __PRETTY_FUNCTION__));
@@ -433 +433 @@
         clipReportFormatsToVBox(pCtx);
 }
+
+#ifdef TESTCASE
+static bool clipTestTargetUpdate(CLIPBACKEND *pCtx)
+{
+    bool success = true;
+    bool changed = true;
+    clipGetFormatsFromTargets(pCtx, NULL, 0, &changed);
+    clipGetFormatsFromTargets(pCtx, NULL, 0, &changed);  /* twice */
+    if (changed)
+        success = false;
+    Atom targets[3];
+    targets[0] = clipGetAtom(NULL, "COMPOUND_TEXT");
+    targets[1] = clipGetAtom(NULL, "text/plain");
+    targets[2] = clipGetAtom(NULL, "TARGETS");
+    clipGetFormatsFromTargets(pCtx, targets, RT_ELEMENTS(targets), &changed);
+    if (!changed)
+        success = false;
+    clipGetFormatsFromTargets(pCtx, targets, RT_ELEMENTS(targets), &changed);
+    if (changed)
+        success = false;
+    return success;
+}
+#endif
 
 /**
@@ -1479 +1502 @@
          * arrive. */
         clipReportFormatsToVBox(pCtx);
-    else
-        clipReportEmptyX11CB(pCtx);
+    // else
+    //     clipReportEmptyX11CB(pCtx);
     LogFlowFunc(("rc=%Rrc\n", rc));
 }
@@ -2412 +2435 @@
 
     /*** X11 text format conversion ***/
-    RTPrintf(TEST_NAME ": TESTING selection of X11 text formats\n");
+    RTPrintf(TEST_NAME ": TESTING handling of X11 selection targets\n");
     if (!clipTestTextFormatConversion(pCtx))
     {
         RTPrintf(TEST_NAME ": Failed to select the right X11 text formats\n");
+        ++cErrs;
+    }
+    if (!clipTestTargetUpdate(pCtx))
+    {
+        RTPrintf(TEST_NAME ": Incorrect reporting of new selection targets\n");
         ++cErrs;
     }