Changeset 100204 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardHttpServer.cpp

Timestamp:

Jun 19, 2023 9:11:37 AM (18 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Unified root list entry code to also use the generic list entry code, a lot of updates for the cross OS transfer handling code, more updates for HTTP server transfer handling.

This also changed the handling of how that transfers are being initiated, as we needed to have this for X11: Before, transfers were initiated as soon as on side announced the URI list format -- now we postpone initiating the transfer until the receiving side requests the data as URI list.

bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardHttpServer.cpp (modified) (2 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardHttpServer.cpp

@@ -178 +178 @@
     RTTEST_CHECK(hTest, ShClTransferHttpServerIsRunning(&HttpSrv) == false);
     if (uPort)
-        rc = ShClTransferHttpServerCreateEx(&HttpSrv, uPort);
+        rc = ShClTransferHttpServerStartEx(&HttpSrv, uPort);
     else
-        rc = ShClTransferHttpServerCreate(&HttpSrv, 32 /* cMaxAttempts */, &uPort);
+        rc = ShClTransferHttpServerStart(&HttpSrv, 32 /* cMaxAttempts */, &uPort);
     RTTEST_CHECK_RC_OK(hTest, rc);
-    RTTEST_CHECK(hTest, ShClTransferHttpServerHasTransfer(&HttpSrv, 0) == false);
-    RTTEST_CHECK(hTest, ShClTransferHttpServerHasTransfer(&HttpSrv, 42) == false);
+    RTTEST_CHECK(hTest, ShClTransferHttpServerGetTransfer(&HttpSrv, 0) == false);
+    RTTEST_CHECK(hTest, ShClTransferHttpServerGetTransfer(&HttpSrv, 42) == false);
 
     char *pszSrvAddr = ShClTransferHttpServerGetAddressA(&HttpSrv);
@@ -208 +208 @@
                 RTTEST_CHECK_RC_OK(hTest, ShClTransferCreate(&pTx));
                 RTTEST_CHECK_RC_OK(hTest, ShClTransferInit(pTx, SHCLTRANSFERDIR_TO_REMOTE, SHCLSOURCE_LOCAL));
-                RTTEST_CHECK_RC_OK(hTest, ShClTransferRootsSetAsFile(pTx, ValueUnion.psz));
+                RTTEST_CHECK_RC_OK(hTest, ShClTransferRootsInitFromFile(pTx, ValueUnion.psz));
                 RTTEST_CHECK_RC_OK(hTest, ShClTransferCtxTransferRegister(&TxCtx, pTx, NULL));
                 RTTEST_CHECK_RC_OK(hTest, ShClTransferHttpServerRegisterTransfer(&HttpSrv, pTx));