From 8a2d1ce2c67607abb7ca919da22307923fd3a924 Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@digia.com>
Date: Tue, 16 Oct 2012 12:01:16 +0200
Subject: Test: remove QSKIP and remove whole test cases instead.

Change-Id: I8b625d20a2cf9215cbfdb96cd252bf1c81bba522
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---
 tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index 601847270e..f7930550cc 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -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()
 {
-- 
cgit v1.2.3