diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2012-09-19 10:12:40 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 09:15:00 +0200 |
commit | 507b90ac868202d7ed7ef8d820003e51327e4222 (patch) | |
tree | 3db8b2b2c03ba77425d466f8cb30f14475180547 /tests/auto/widgets/widgets/qplaintextedit | |
parent | b0b7d9cf6b213cebcdc5be7583119af15feb5bf6 (diff) |
QtWidgets auto tests: revise clipboard related tests
Use PlatformClipboard::isAvailable() and omit relevant test
cases when QT_NO_CLIPBOARD is defined.
Change-Id: I7e7b20a0a18f1a82987564f0e5e6c76d9207bc4b
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qplaintextedit')
-rw-r--r-- | tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index f8fabdd22b..a71302096f 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -58,6 +58,7 @@ #include <qtextdocumentfragment.h> #include "qplaintextedit.h" +#include "../../../shared/platformclipboard.h" //Used in copyAvailable typedef QPair<Qt::Key, Qt::KeyboardModifier> keyPairType; @@ -66,10 +67,6 @@ Q_DECLARE_METATYPE(pairListType); Q_DECLARE_METATYPE(keyPairType); Q_DECLARE_METATYPE(QList<bool>); -#ifdef Q_OS_MAC -#include <Carbon/Carbon.h> -#endif - QT_FORWARD_DECLARE_CLASS(QPlainTextEdit) class tst_QPlainTextEdit : public QObject @@ -155,24 +152,11 @@ private: void createSelection(); int blockCount() const; int lineCount() const; - bool nativeClipboardWorking(); QPlainTextEdit *ed; qreal rootFrameMargin; }; -bool tst_QPlainTextEdit::nativeClipboardWorking() -{ -#ifdef Q_OS_MAC - PasteboardRef pasteboard; - OSStatus status = PasteboardCreate(0, &pasteboard); - if (status == noErr) - CFRelease(pasteboard); - return status == noErr; -#endif - return true; -} - // Testing get/set functions void tst_QPlainTextEdit::getSetCheck() { @@ -305,7 +289,7 @@ void tst_QPlainTextEdit::createSelection() #ifndef QT_NO_CLIPBOARD void tst_QPlainTextEdit::clearMustNotChangeClipboard() { - if (!nativeClipboardWorking()) + if (!PlatformClipboard::isAvailable()) QSKIP("Clipboard not working with cron-started unit tests"); ed->textCursor().insertText("Hello World"); QString txt("This is different text"); @@ -482,7 +466,7 @@ void tst_QPlainTextEdit::setTextCursor() #ifndef QT_NO_CLIPBOARD void tst_QPlainTextEdit::undoAvailableAfterPaste() { - if (!nativeClipboardWorking()) + if (!PlatformClipboard::isAvailable()) QSKIP("Clipboard not working with cron-started unit tests"); QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool))); @@ -675,7 +659,7 @@ void tst_QPlainTextEdit::preserveCharFormatInAppend() #ifndef QT_NO_CLIPBOARD void tst_QPlainTextEdit::copyAndSelectAllInReadonly() { - if (!nativeClipboardWorking()) + if (!PlatformClipboard::isAvailable()) QSKIP("Clipboard not working with cron-started unit tests"); ed->setReadOnly(true); @@ -1192,7 +1176,7 @@ void tst_QPlainTextEdit::selectWordsFromStringsContainingSeparators() #ifndef QT_NO_CLIPBOARD void tst_QPlainTextEdit::canPaste() { - if (!nativeClipboardWorking()) + if (!PlatformClipboard::isAvailable()) QSKIP("Clipboard not working with cron-started unit tests"); QApplication::clipboard()->setText(QString()); |