AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test: remove QSKIP and remove whole test cases instead.

Browse Source 
Change-Id: I8b625d20a2cf9215cbfdb96cd252bf1c81bba522
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
This commit is contained in:
Caroline Chao 2012-10-16 12:01:16 +02:00 committed by The Qt Project
parent ceb5474d5f
commit 8a2d1ce2c6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
View File

@ -119,8 +119,10 @@ private slots:
void symetricConstructors();
void checkMultipleNames();
void checkMultipleCodes();
#ifndef Q_OS_MAC
void mnemonic_data();
void mnemonic();
#endif
void toString_data();
void toString();
void toStringFromKeycode_data();
@ -137,8 +139,10 @@ private slots:
void standardKeys_data();
void standardKeys();
void keyBindings();
#if !defined (Q_OS_MAC) && !defined (Q_OS_WINCE)
void translated_data();
void translated();
#endif
void i18nKeys_data();
void i18nKeys();
@ -396,6 +400,7 @@ void tst_QKeySequence::keyBindings()
QCOMPARE(bindings, expected);
}
#ifndef Q_OS_MAC
void tst_QKeySequence::mnemonic_data()
{
QTest::addColumn<QString>("string");
@ -417,9 +422,6 @@ void tst_QKeySequence::mnemonic_data()
void tst_QKeySequence::mnemonic()
{
#ifdef Q_OS_MAC
QSKIP("mnemonics are not used on Mac OS X");
#endif
QFETCH(QString, string);
QFETCH(QString, key);
QFETCH(bool, warning);
@ -438,6 +440,7 @@ void tst_QKeySequence::mnemonic()
QCOMPARE(seq, res);
}
#endif
void tst_QKeySequence::toString_data()
{
@ -628,6 +631,7 @@ void tst_QKeySequence::fromString()
QCOMPARE(ks4, ks1);
}
#if !defined (Q_OS_MAC) && !defined (Q_OS_WINCE)
void tst_QKeySequence::translated_data()
{
qApp->installTranslator(ourTranslator);
@ -659,11 +663,6 @@ void tst_QKeySequence::translated()
{
QFETCH(QString, transKey);
QFETCH(QString, compKey);
#ifdef Q_OS_MAC
QSKIP("No need to translate modifiers on Mac OS X");
#elif defined(Q_OS_WINCE)
QSKIP("No need to translate modifiers on WinCE");
#endif
qApp->installTranslator(ourTranslator);
qApp->installTranslator(qtTranslator);
@ -674,7 +673,7 @@ void tst_QKeySequence::translated()
qApp->removeTranslator(ourTranslator);
qApp->removeTranslator(qtTranslator);
}
#endif
void tst_QKeySequence::i18nKeys_data()
{