From 3712ecc7295b91176f51763a048a83a9c7b98d01 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 5 Apr 2014 10:11:02 +0200 Subject: QX11Info: add nextStartupId/setNextStartupId - for startup-notification MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This controls what the next window to be shown will send as startup-notification message. http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt Change-Id: Ia1b5e6ba004d61ca6fdfd6683d2e22dfcd0c42fb Reviewed-by: Jędrzej Nowacki Reviewed-by: Richard J. Moore --- tests/auto/qx11info/tst_qx11info.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'tests') diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp index 602de1d..8334690 100644 --- a/tests/auto/qx11info/tst_qx11info.cpp +++ b/tests/auto/qx11info/tst_qx11info.cpp @@ -52,6 +52,7 @@ class tst_QX11Info : public QObject private slots: void staticFunctionsBeforeQApplication(); + void startupId(); void isPlatformX11(); void appTime(); }; @@ -110,6 +111,34 @@ void tst_QX11Info::staticFunctionsBeforeQApplication() QCOMPARE(appTime, 0ul); } +static const char idFromEnv[] = "startupid_TIME123456"; +void initialize() +{ + qputenv("DESKTOP_STARTUP_ID", idFromEnv); +} +Q_CONSTRUCTOR_FUNCTION(initialize) + +void tst_QX11Info::startupId() +{ + int argc = 0; + QApplication app(argc, 0); + + // This relies on the fact that no widget was shown yet, + // so please make sure this method is always the first test. + QCOMPARE(QString(QX11Info::nextStartupId()), QString(idFromEnv)); + QWidget w; + w.show(); + QVERIFY(QX11Info::nextStartupId().isEmpty()); + + QByteArray idSecondWindow = "startupid2_TIME234567"; + QX11Info::setNextStartupId(idSecondWindow); + QCOMPARE(QX11Info::nextStartupId(), idSecondWindow); + + QWidget w2; + w2.show(); + QVERIFY(QX11Info::nextStartupId().isEmpty()); +} + void tst_QX11Info::isPlatformX11() { int argc = 0; -- cgit v1.2.1