Changeset 85660 in vbox

Timestamp:

Aug 10, 2020 11:29:43 AM (5 years ago)

Author:

vboxsync

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

139787

Message:

DnD/GuestHost: Fixed testcases.

Location:

trunk/src/VBox/GuestHost/DragAndDrop/testcase

Files:

• tstDnDPath.cpp (modified) (1 diff)
• tstDnDTransferList.cpp (modified) (2 diffs)

trunk/src/VBox/GuestHost/DragAndDrop/testcase/tstDnDPath.cpp

@@ -41 +41 @@
         /* Actual rebasing. */
         { "old/foo", "old", "new", VINF_SUCCESS, "new/foo" },
+        /* Note: DnDPathRebase intentionally does not do any path conversions. */
+#ifdef RT_OS_WINDOWS
         { "old\\foo", "old", "new", VINF_SUCCESS, "new/foo" },
         { "\\totally\\different\\path\\foo", "/totally/different/path", "/totally/different/path", VINF_SUCCESS, "/totally/different/path/foo" },
         { "\\old\\path\\foo", "", "/new/root/", VINF_SUCCESS, "/new/root/old/path/foo" },
         { "\\\\old\\path\\\\foo", "", "/new/root/", VINF_SUCCESS, "/new/root/old/path\\\\foo" }
+#else
+        { "old/foo", "old", "new", VINF_SUCCESS, "new/foo" },
+        { "/totally/different/path/foo", "/totally/different/path", "/totally/different/path", VINF_SUCCESS, "/totally/different/path/foo" },
+        { "/old/path/foo", "", "/new/root/", VINF_SUCCESS, "/new/root/old/path/foo" },
+        { "//old/path//foo", "", "/new/root/", VINF_SUCCESS, "/new/root/old/path//foo" }
+#endif
     };
 

trunk/src/VBox/GuestHost/DragAndDrop/testcase/tstDnDTransferList.cpp

@@ -112 +112 @@
     RTStrPrintf(szPathTest, sizeof(szPathTest), "%s/foo", szPathWellKnownURI);
     RTTEST_CHECK_RC(hTest, DnDTransferListAppendPath(&list, DNDTRANSFERLISTFMT_URI, szPathWellKnownURI, DNDTRANSFERLIST_FLAGS_NONE), VINF_SUCCESS);
-    RTTEST_CHECK_RC(hTest, DnDTransferListAppendPath(&list, DNDTRANSFERLISTFMT_URI, szPathTest, DNDTRANSFERLIST_FLAGS_NONE), VERR_FILE_NOT_FOUND);
+    RTTEST_CHECK_RC(hTest, DnDTransferListAppendPath(&list, DNDTRANSFERLISTFMT_URI, szPathTest, DNDTRANSFERLIST_FLAGS_NONE), VERR_PATH_NOT_FOUND);
     RTTEST_CHECK_RC(hTest, DnDTransferListGetRootsEx(&list, DNDTRANSFERLISTFMT_NATIVE, "" /* pszBasePath */, "\n", &pszBuf, &cbBuf), VINF_SUCCESS);
     RTTestPrintf(hTest, RTTESTLVL_DEBUG, "Roots (native):\n%s\n", pszBuf);
@@ -126 +126 @@
 
     /* From URI data. */
-    const char szURI[] = "file:///C:/Windows/System32/Boot/\r\n"
-                         "file:///C:/Windows/System/\r\n";
+    const char szURI[] =
+#ifdef RT_OS_WINDOWS
+    "file:///C:/Windows/System32/Boot/\r\n"
+    "file:///C:/Windows/System/\r\n";
+#else
+    "file:///bin/\r\n"
+    "file:///usr/bin/\r\n";
+#endif
 
     RTTEST_CHECK_RC(hTest, DnDTransferListAppendPathsFromBuffer(&list, DNDTRANSFERLISTFMT_URI, szURI, sizeof(szURI), "\r\n",