whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revise QClipboard auto tests 

Use PlatformClipboard::isAvailable() and fix build
when QT_NO_CLIPBOARD is defined.

Change-Id: I18c3af42fe39cf7618c2530723149848a10db985
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
bb10
J-P Nurmi 2012-09-19 10:12:15 +02:00 committed by The Qt Project
parent 13fe38ebb9
commit b0b7d9cf6b
3 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/gui/kernel/qclipboard/copier/main.cpp
View File

@ -51,6 +51,8 @@ int main(int argc, char **argv)
if (arguments.size() > 1)
paste = arguments.at(1);
#endif
#ifndef QT_NO_CLIPBOARD
QGuiApplication::clipboard()->setText(paste);
#endif
return 0;
}

6
tests/auto/gui/kernel/qclipboard/paster/main.cpp
View File

@ -51,5 +51,9 @@ int main(int argc, char **argv)
if (arguments.size() > 1)
expected = arguments.at(1);
#endif
return QGuiApplication::clipboard()->text() == expected ? 0 : 1;
QString actual;
#ifndef QT_NO_CLIPBOARD
actual = QGuiApplication::clipboard()->text();
#endif
return actual == expected ? 0 : 1;
}

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

@ -46,14 +46,16 @@
#include <QtCore/QDir>
#include <QtGui/QGuiApplication>
#include <QtGui/QClipboard>
#ifdef Q_OS_MAC
#include <Carbon/Carbon.h>
#endif
#include "../../../shared/platformclipboard.h"
class tst_QClipboard : public QObject
{
Q_OBJECT
private slots:
#ifdef QT_NO_CLIPBOARD
void initTestCase();
void cleanupTestCase();
#else
void init();
void copy_exit_paste();
void capabilityFunctions();
@ -61,29 +63,28 @@ private slots:
void testSignals();
void setMimeData();
void clearBeforeSetText();
private:
bool nativeClipboardWorking();
#endif
};
#ifdef QT_NO_CLIPBOARD
void tst_QClipboard::initTestCase()
{
QSKIP("This test requires clipboard support");
}
void tst_QClipboard::cleanupTestCase()
{
QSKIP("This test requires clipboard support");
}
#else
void tst_QClipboard::init()
{
const QString testdataDir = QFileInfo(QFINDTESTDATA("copier")).absolutePath();
QVERIFY2(QDir::setCurrent(testdataDir), qPrintable("Could not chdir to " + testdataDir));
}
bool tst_QClipboard::nativeClipboardWorking()
{
#ifdef Q_OS_MAC
PasteboardRef pasteboard;
OSStatus status = PasteboardCreate(0, &pasteboard);
if (status == noErr)
CFRelease(pasteboard);
return status == noErr;
#endif
return true;
}
Q_DECLARE_METATYPE(QClipboard::Mode)
/*
@ -109,7 +110,7 @@ void tst_QClipboard::modes()
{
QClipboard * const clipboard = QGuiApplication::clipboard();
if (!nativeClipboardWorking())
if (!PlatformClipboard::isAvailable())
QSKIP("Native clipboard not working in this setup");
const QString defaultMode = "default mode text;";
@ -139,7 +140,7 @@ void tst_QClipboard::testSignals()
{
qRegisterMetaType<QClipboard::Mode>("QClipboard::Mode");
if (!nativeClipboardWorking())
if (!PlatformClipboard::isAvailable())
QSKIP("Native clipboard not working in this setup");
QClipboard * const clipboard = QGuiApplication::clipboard();
@ -236,7 +237,7 @@ void tst_QClipboard::copy_exit_paste()
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
#endif
if (!nativeClipboardWorking())
if (!PlatformClipboard::isAvailable())
QSKIP("Native clipboard not working in this setup");
const QStringList stringArgument(QStringLiteral("Test string."));
QByteArray errorMessage;
@ -253,7 +254,7 @@ void tst_QClipboard::copy_exit_paste()
void tst_QClipboard::setMimeData()
{
if (!nativeClipboardWorking())
if (!PlatformClipboard::isAvailable())
QSKIP("Native clipboard not working in this setup");
QMimeData *mimeData = new QMimeData;
const QString TestName(QLatin1String("tst_QClipboard::setMimeData() mimeData"));
@ -339,7 +340,7 @@ void tst_QClipboard::clearBeforeSetText()
{
QGuiApplication::processEvents();
if (!nativeClipboardWorking())
if (!PlatformClipboard::isAvailable())
QSKIP("Native clipboard not working in this setup");
const QString text = "tst_QClipboard::clearBeforeSetText()";
@ -371,6 +372,8 @@ void tst_QClipboard::clearBeforeSetText()
QCOMPARE(QGuiApplication::clipboard()->text(), text);
}
#endif
QTEST_MAIN(tst_QClipboard)
#include "tst_qclipboard.moc"