1 files changed, 92 insertions, 7 deletions

diff --git a/tests/auto/client/datadevicev1/tst_datadevicev1.cpp b/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
index d4dfa2da0..50d78130a 100644
--- a/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
+++ b/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
@@ -1,9 +1,8 @@
 // Copyright (C) 2018 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "mockcompositor.h"
 
-#include <QtOpenGL/QOpenGLWindow>
 #include <QtGui/QRasterWindow>
 #include <QtGui/QClipboard>
 #include <QtGui/QDrag>
@@ -32,6 +31,8 @@ private slots:
     void initTestCase();
     void pasteAscii();
     void pasteUtf8();
+    void pasteMozUrl();
+    void pasteSingleUtf8MozUrl();
     void destroysPreviousSelection();
     void destroysSelectionWithSurface();
     void destroysSelectionOnLeave();
@@ -64,13 +65,13 @@ void tst_datadevicev1::pasteAscii()
     exec([&] {
         auto *client = xdgSurface()->resource()->client();
         auto *offer = dataDevice()->sendDataOffer(client, {"text/plain"});
-        connect(offer, &DataOffer::receive, [](QString mimeType, int fd) {
+        connect(offer, &DataOffer::receive, offer, [](QString mimeType, int fd) {
             QFile file;
             file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle);
             QCOMPARE(mimeType, "text/plain");
             file.write(QByteArray("normal ascii"));
             file.close();
-        });
+        }, Qt::DirectConnection);
         dataDevice()->sendSelection(offer);
 
         auto *surface = xdgSurface()->m_surface;
@@ -102,13 +103,13 @@ void tst_datadevicev1::pasteUtf8()
     exec([&] {
         auto *client = xdgSurface()->resource()->client();
         auto *offer = dataDevice()->sendDataOffer(client, {"text/plain", "text/plain;charset=utf-8"});
-        connect(offer, &DataOffer::receive, [](QString mimeType, int fd) {
+        connect(offer, &DataOffer::receive, offer, [](QString mimeType, int fd) {
             QFile file;
             file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle);
             QCOMPARE(mimeType, "text/plain;charset=utf-8");
             file.write(QByteArray("face with tears of joy: 😂"));
             file.close();
-        });
+        }, Qt::DirectConnection);
         dataDevice()->sendSelection(offer);
 
         auto *surface = xdgSurface()->m_surface;
@@ -124,6 +125,90 @@ void tst_datadevicev1::pasteUtf8()
     QTRY_COMPARE(window.m_text, "face with tears of joy: 😂");
 }
 
+void tst_datadevicev1::pasteMozUrl()
+{
+    class Window : public QRasterWindow {
+    public:
+        void mousePressEvent(QMouseEvent *) override { m_urls = QGuiApplication::clipboard()->mimeData()->urls(); }
+        QList<QUrl> m_urls;
+    };
+
+    Window window;
+    window.resize(64, 64);
+    window.show();
+
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
+    exec([&] {
+        auto *client = xdgSurface()->resource()->client();
+        auto *offer = dataDevice()->sendDataOffer(client, {"text/x-moz-url"});
+        connect(offer, &DataOffer::receive, offer, [](QString mimeType, int fd) {
+            QFile file;
+            file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle);
+            QCOMPARE(mimeType, "text/x-moz-url");
+            const QString content("https://www.qt.io/\nQt\nhttps://www.example.com/\nExample Website");
+            // Need UTF-16.
+            file.write(reinterpret_cast<const char *>(content.data()), content.size() * 2);
+            file.close();
+        }, Qt::DirectConnection);
+        dataDevice()->sendSelection(offer);
+
+        auto *surface = xdgSurface()->m_surface;
+        keyboard()->sendEnter(surface); // Need to set keyboard focus according to protocol
+
+        pointer()->sendEnter(surface, {32, 32});
+        pointer()->sendFrame(client);
+        pointer()->sendButton(client, BTN_LEFT, 1);
+        pointer()->sendFrame(client);
+        pointer()->sendButton(client, BTN_LEFT, 0);
+        pointer()->sendFrame(client);
+    });
+
+    QTRY_COMPARE(window.m_urls.count(), 2);
+    QCOMPARE(window.m_urls.at(0), QUrl("https://www.qt.io/"));
+    QCOMPARE(window.m_urls.at(1), QUrl("https://www.example.com/"));
+}
+
+void tst_datadevicev1::pasteSingleUtf8MozUrl()
+{
+    class Window : public QRasterWindow {
+    public:
+        void mousePressEvent(QMouseEvent *) override { m_urls = QGuiApplication::clipboard()->mimeData()->urls(); }
+        QList<QUrl> m_urls;
+    };
+
+    Window window;
+    window.resize(64, 64);
+    window.show();
+
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
+    exec([&] {
+        auto *client = xdgSurface()->resource()->client();
+        auto *offer = dataDevice()->sendDataOffer(client, {"text/x-moz-url"});
+        connect(offer, &DataOffer::receive, offer, [](QString mimeType, int fd) {
+            QFile file;
+            file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle);
+            QCOMPARE(mimeType, "text/x-moz-url");
+            const QString content("https://www.qt.io/");
+            file.write(content.toUtf8());
+            file.close();
+        }, Qt::DirectConnection);
+        dataDevice()->sendSelection(offer);
+
+        auto *surface = xdgSurface()->m_surface;
+        keyboard()->sendEnter(surface); // Need to set keyboard focus according to protocol
+
+        pointer()->sendEnter(surface, {32, 32});
+        pointer()->sendFrame(client);
+        pointer()->sendButton(client, BTN_LEFT, 1);
+        pointer()->sendFrame(client);
+        pointer()->sendButton(client, BTN_LEFT, 0);
+        pointer()->sendFrame(client);
+    });
+
+    QTRY_COMPARE(window.m_urls.count(), 1);
+    QCOMPARE(window.m_urls.at(0), QUrl("https://www.qt.io/"));
+}
+
 void tst_datadevicev1::destroysPreviousSelection()
 {
     QRasterWindow window;
@@ -213,7 +298,7 @@ void tst_datadevicev1::destroysSelectionOnLeave()
         keyboard()->sendLeave(surface);
     });
 
-    QTRY_COMPARE(dataChangedSpy.count(), 1);
+    QTRY_COMPARE(dataChangedSpy.size(), 1);
     QVERIFY(!QGuiApplication::clipboard()->mimeData(QClipboard::Clipboard)->hasText());
 }