summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@edeltech.ch>2015-03-02 21:13:35 +0100
committerSamuel Gaist <samuel.gaist@idiap.ch>2019-12-02 18:18:22 +0100
commitf81f21151d30a37f955aa4af2398a96507626b15 (patch)
tree353e081908710f3a40b39542a7fde3194fa7b046 /tests
parent7a55a984d8d0da6a6cf6fdc440d4cccf7fb42c3d (diff)
Session management for macOS
This patch aims to implement the session management available on macOS. Currently applicationShouldTerminate is just a go through that closes everything and ends the application. The new implementation calls first appCommitData and cancels the termination properly if required. This means that if a user wishes to logout, Qt applications can now cancel that like e.g. answering to Safari asking whether it is ok to close because of a number of opened tab/window. Fixes: QTBUG-33034 Change-Id: Id5d7416cb74c762c5424a77c9c7664f0749da7f6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/other/sessionmanagement_macos/sessionmanagement_macos.pro10
-rw-r--r--tests/auto/other/sessionmanagement_macos/tst_sessionmanagement_macos.mm61
2 files changed, 71 insertions, 0 deletions
diff --git a/tests/auto/other/sessionmanagement_macos/sessionmanagement_macos.pro b/tests/auto/other/sessionmanagement_macos/sessionmanagement_macos.pro
new file mode 100644
index 0000000000..cef53bdf28
--- /dev/null
+++ b/tests/auto/other/sessionmanagement_macos/sessionmanagement_macos.pro
@@ -0,0 +1,10 @@
+CONFIG += testcase
+TARGET = tst_sessionmanagement_macos
+
+OBJECTIVE_SOURCES += tst_sessionmanagement_macos.mm
+
+QT = testlib gui core
+LIBS += -framework AppKit
+
+requires(mac)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/other/sessionmanagement_macos/tst_sessionmanagement_macos.mm b/tests/auto/other/sessionmanagement_macos/tst_sessionmanagement_macos.mm
new file mode 100644
index 0000000000..934b15ca44
--- /dev/null
+++ b/tests/auto/other/sessionmanagement_macos/tst_sessionmanagement_macos.mm
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Samuel Gaist <samuel.gaist@idiap.ch>
+** 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 <QtTest/QtTest>
+#include <QSignalSpy>
+#include <QSessionManager>
+#include <AppKit/AppKit.h>
+
+// Q_DECLARE_METATYPE(QSessionManager)
+
+class tst_SessionManagement_macOS : public QObject
+{
+ Q_OBJECT
+
+private slots:
+ void stopApplication();
+};
+
+/*
+ Test that session handling code is properly called
+*/
+void tst_SessionManagement_macOS::stopApplication()
+{
+ int argc = 0;
+ QGuiApplication app(argc, nullptr);
+ QSignalSpy spy(&app, &QGuiApplication::commitDataRequest);
+ QTimer::singleShot(1000, []() {
+ [NSApp terminate:nil];
+ });
+ app.exec();
+ QCOMPARE(spy.count(), 1);
+}
+
+QTEST_APPLESS_MAIN(tst_SessionManagement_macOS)
+#include "tst_sessionmanagement_macos.moc"