From 5b53f5c7629e44c61e8017caa1605dd3b2048333 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Mon, 28 Oct 2019 12:05:09 +0100
Subject: [PATCH] Client: Add test for a compositor with no outputs

This needs to be a separate test and can't be part of tst_output because there
is special screen handling at platform integration initialization, which only
happens once per test process.

Task-number: QTBUG-79111
Change-Id: Iad9f98be6807c9071c783db1fa8e8c81a7de08be
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 tests/auto/wayland/client.pro                |  1 +
 tests/auto/wayland/nooutput/nooutput.pro     |  5 ++
 tests/auto/wayland/nooutput/tst_nooutput.cpp | 68 ++++++++++++++++++++
 tests/auto/wayland/shared/mockcompositor.cpp |  2 +-
 4 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/wayland/nooutput/nooutput.pro
 create mode 100644 tests/auto/wayland/nooutput/tst_nooutput.cpp

diff --git a/tests/auto/wayland/client.pro b/tests/auto/wayland/client.pro
index 4b1eb245809..cda1765e3b1 100644
--- a/tests/auto/wayland/client.pro
+++ b/tests/auto/wayland/client.pro
@@ -5,6 +5,7 @@ SUBDIRS += \
     datadevicev1 \
     fullscreenshellv1 \
     iviapplication \
+    nooutput \
     output \
     primaryselectionv1 \
     seatv4 \
diff --git a/tests/auto/wayland/nooutput/nooutput.pro b/tests/auto/wayland/nooutput/nooutput.pro
new file mode 100644
index 00000000000..1d8dc562663
--- /dev/null
+++ b/tests/auto/wayland/nooutput/nooutput.pro
@@ -0,0 +1,5 @@
+include (../shared/shared.pri)
+
+TARGET = tst_nooutput
+SOURCES += tst_nooutput.cpp
+
diff --git a/tests/auto/wayland/nooutput/tst_nooutput.cpp b/tests/auto/wayland/nooutput/tst_nooutput.cpp
new file mode 100644
index 00000000000..098d88d9908
--- /dev/null
+++ b/tests/auto/wayland/nooutput/tst_nooutput.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mockcompositor.h"
+#include <QtGui/QScreen>
+#include <QtGui/QRasterWindow>
+
+using namespace MockCompositor;
+
+class NoOutputCompositor : public DefaultCompositor {
+public:
+    NoOutputCompositor()
+    {
+        exec([this] { removeAll<Output>(); });
+        m_config.autoConfigure = true;
+    }
+};
+
+class tst_nooutput : public QObject, private NoOutputCompositor
+{
+    Q_OBJECT
+private slots:
+    void cleanup()
+    {
+        // There should be no wl_outputs in this test
+        QCOMPOSITOR_COMPARE(getAll<Output>().size(), 0);
+        QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage()));
+    }
+    void noScreens();
+};
+
+void tst_nooutput::noScreens()
+{
+    QRasterWindow window;
+    window.resize(16, 16);
+    window.show();
+
+    // We have to handle showing a window when there are no real outputs
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
+}
+
+QCOMPOSITOR_TEST_MAIN(tst_nooutput)
+#include "tst_nooutput.moc"
diff --git a/tests/auto/wayland/shared/mockcompositor.cpp b/tests/auto/wayland/shared/mockcompositor.cpp
index e44cea63c11..dca9dac49ae 100644
--- a/tests/auto/wayland/shared/mockcompositor.cpp
+++ b/tests/auto/wayland/shared/mockcompositor.cpp
@@ -52,7 +52,7 @@ DefaultCompositor::DefaultCompositor()
                     // Pretend we made a copy of the buffer and just release it immediately
                     surface->m_committed.buffer->send_release();
                 }
-                if (m_config.autoEnter && surface->m_outputs.empty())
+                if (m_config.autoEnter && get<Output>() && surface->m_outputs.empty())
                     surface->sendEnter(get<Output>());
                 wl_display_flush_clients(m_display);
             });