1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Remove QSKIP from tst_QClipboard::copy_exit_paste()

Browse Source 
Change-Id: Ib64680dbd966940c56ab089ff1b7727b237fdaee
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
This commit is contained in:
Sergio Ahumada 2012-10-22 00:12:14 +02:00 committed by The Qt Project
parent cd0c6d69fa
commit cdd75e9e4b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
View File

@ -57,7 +57,9 @@ private slots:
void cleanupTestCase(); void cleanupTestCase();
#else #else
void init(); void init();
#if defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_QNX)
void copy_exit_paste(); void copy_exit_paste();
#endif
void capabilityFunctions(); void capabilityFunctions();
void modes(); void modes();
void testSignals(); void testSignals();
@ -191,6 +193,7 @@ void tst_QClipboard::testSignals()
QCOMPARE(dataChangedSpy.count(), 1); QCOMPARE(dataChangedSpy.count(), 1);
} }
#if defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_QNX)
static bool runHelper(const QString &program, const QStringList &arguments, QByteArray *errorMessage) static bool runHelper(const QString &program, const QStringList &arguments, QByteArray *errorMessage)
{ {
QProcess process; QProcess process;
@ -230,13 +233,11 @@ static bool runHelper(const QString &program, const QStringList &arguments, QByt
} }
// Test that pasted text remains on the clipboard after a Qt application exits. // Test that pasted text remains on the clipboard after a Qt application exits.
// This test does not make sense on X11 and embedded, copied data disappears from the clipboard when the application exits
void tst_QClipboard::copy_exit_paste() void tst_QClipboard::copy_exit_paste()
{ {
#ifndef QT_NO_PROCESS #ifndef QT_NO_PROCESS
#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) && !defined(Q_OS_QNX)
QSKIP("This test does not make sense on X11 and embedded, copied data disappears from the clipboard when the application exits ");
// ### It's still possible to test copy/paste - just keep the apps running // ### It's still possible to test copy/paste - just keep the apps running
#endif
if (!PlatformClipboard::isAvailable()) if (!PlatformClipboard::isAvailable())
QSKIP("Native clipboard not working in this setup"); QSKIP("Native clipboard not working in this setup");
const QStringList stringArgument(QStringLiteral("Test string.")); const QStringList stringArgument(QStringLiteral("Test string."));
@ -246,11 +247,12 @@ void tst_QClipboard::copy_exit_paste()
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// The Pasteboard needs a moment to breathe (at least on older Macs). // The Pasteboard needs a moment to breathe (at least on older Macs).
QTest::qWait(100); QTest::qWait(100);
#endif #endif // Q_OS_MAC
QVERIFY2(runHelper(QStringLiteral("paster/paster"), stringArgument, &errorMessage), QVERIFY2(runHelper(QStringLiteral("paster/paster"), stringArgument, &errorMessage),
errorMessage.constData()); errorMessage.constData());
#endif #endif // QT_NO_PROCESS
} }
#endif // Q_OS_WIN || Q_OS_MAC || Q_OS_QNX
void tst_QClipboard::setMimeData() void tst_QClipboard::setMimeData()
{ {