diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 12:53:13 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 01:20:29 +0200 |
commit | 27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch) | |
tree | 3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/gui/text | |
parent | 016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff) |
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit
removes the parameter from all calls to QSKIP.
Task-number: QTBUG-21851, QTBUG-21652
Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/gui/text')
6 files changed, 74 insertions, 108 deletions
diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 4e8085811d..822b5275da 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -1551,7 +1551,7 @@ void tst_QCssParser::gradient() void tst_QCssParser::extractFontFamily_data() { if (QFontInfo(QFont("Times New Roman")).family() != "Times New Roman") - QSKIP("'Times New Roman' font not found ", SkipAll); + QSKIP("'Times New Roman' font not found"); QTest::addColumn<QString>("css"); QTest::addColumn<QString>("expectedFamily"); @@ -1597,7 +1597,7 @@ void tst_QCssParser::extractFontFamily() // Note, we have to QSKIP rather than QEXPECT_FAIL because font lookup is broken // such that it may work or not work depending on the order in which fonts were // loaded from disk - QSKIP("QTBUG-20986 may fail on qpa", SkipSingle); + QSKIP("QTBUG-20986 may fail on qpa"); #endif QTEST(info.family(), "expectedFamily"); diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index d21c673b6d..3566342f00 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -167,8 +167,7 @@ void tst_QFont::exactMatch() QVERIFY(QFont("monospace").exactMatch()); #endif - QSKIP("This test is bogus on Unix with support for font aliases in fontconfig", SkipAll); - return; + QSKIP("This test is bogus on Unix with support for font aliases in fontconfig"); QFontDatabase fdb; @@ -538,9 +537,8 @@ void tst_QFont::setFontRaw() if (str.toLower() == "fixed") found = true; } - if (!found) { - QSKIP("Fixed font not available.", SkipSingle); - } + if (!found) + QSKIP("Fixed font not available."); QCOMPARE(QFontInfo(f).family().left(5).toLower(), QString("fixed")); } #endif @@ -654,7 +652,7 @@ void tst_QFont::defaultFamily() QFontDatabase db; if (!db.hasFamily(defaultFamily)) - QSKIP("Font family is not available on the system", SkipSingle); + QSKIP("Font family is not available on the system"); QFont f; f.setStyleHint(styleHint); diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index af6d822666..c3b942f331 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -157,7 +157,7 @@ void tst_QFontDatabase::fixedPitch() QFontDatabase fdb; if (!fdb.families().contains(font)) - QSKIP( "Font not installed", SkipSingle); + QSKIP( "Font not installed"); QCOMPARE(fdb.isFixedPitch(font), fixedPitch); @@ -181,7 +181,7 @@ void tst_QFontDatabase::trickyFonts() QFontDatabase fdb; if (!fdb.families().contains(font)) - QSKIP( "Font not installed", SkipSingle); + QSKIP( "Font not installed"); QFont qfont(font); QFontInfo fi(qfont); @@ -254,7 +254,7 @@ void tst_QFontDatabase::addAppFont() // addApplicationFont is supported on Mac, don't skip the test if it breaks. #ifndef Q_WS_MAC if (id == -1) - QSKIP("Skip the test since app fonts are not supported on this system", SkipSingle); + QSKIP("Skip the test since app fonts are not supported on this system"); #endif const QStringList addedFamilies = QFontDatabase::applicationFontFamilies(id); diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp index 4db01c91a2..256ea20a1c 100644 --- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp +++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp @@ -104,9 +104,8 @@ void tst_QGlyphRun::initTestCase() void tst_QGlyphRun::init() { - if (!m_testFont_ok) { - QSKIP("Test font is not working correctly", SkipAll); - } + if (!m_testFont_ok) + QSKIP("Test font is not working correctly"); } void tst_QGlyphRun::cleanupTestCase() diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index e8889f55c6..17955b36f2 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -1472,7 +1472,7 @@ void tst_QTextLayout::textWidthWithLineSeparator() void tst_QTextLayout::cursorInLigatureWithMultipleLines() { #if !defined(Q_WS_MAC) - QSKIP("This test can not be run on Mac", SkipAll); + QSKIP("This test can not be run on Mac"); #endif QTextLayout layout("first line finish", QFont("Times", 20)); layout.beginLayout(); @@ -1488,7 +1488,7 @@ void tst_QTextLayout::cursorInLigatureWithMultipleLines() void tst_QTextLayout::xToCursorForLigatures() { #if !defined(Q_WS_MAC) - QSKIP("This test can not be run on Mac", SkipAll); + QSKIP("This test can not be run on Mac"); #endif QTextLayout layout("fi", QFont("Times", 20)); layout.beginLayout(); diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index 4f9beb6f19..0149a0a0a0 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -207,9 +207,8 @@ static bool shaping( const QFont &f, const ShapeTable *s) #ifdef Q_WS_X11 void tst_QTextScriptEngine::devanagari() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Raghindi")) { @@ -259,9 +258,8 @@ void tst_QTextScriptEngine::devanagari() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Raghindi", SkipAll); - } + } else + QSKIP("couldn't find Raghindi"); } { @@ -311,9 +309,8 @@ void tst_QTextScriptEngine::devanagari() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find mangal", SkipAll); - } + } else + QSKIP("couldn't find mangal"); } } #endif @@ -321,9 +318,8 @@ void tst_QTextScriptEngine::devanagari() #ifdef Q_WS_X11 void tst_QTextScriptEngine::bengali() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Bengali).contains("Akaash")) { @@ -431,9 +427,8 @@ void tst_QTextScriptEngine::bengali() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Akaash", SkipAll); - } + } else + QSKIP("couldn't find Akaash"); } { if (QFontDatabase().families(QFontDatabase::Bengali).contains("Mukti Narrow")) { @@ -536,9 +531,8 @@ void tst_QTextScriptEngine::bengali() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Mukti", SkipAll); - } + } else + QSKIP("couldn't find Mukti"); } { if (QFontDatabase().families(QFontDatabase::Bengali).contains("Likhan")) { @@ -564,9 +558,8 @@ void tst_QTextScriptEngine::bengali() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Likhan", SkipAll); - } + } else + QSKIP("couldn't find Likhan"); } } #endif @@ -574,9 +567,8 @@ void tst_QTextScriptEngine::bengali() #ifdef Q_WS_X11 void tst_QTextScriptEngine::gurmukhi() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Gurmukhi).contains("Lohit Punjabi")) { @@ -593,9 +585,8 @@ void tst_QTextScriptEngine::gurmukhi() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Lohit Punjabi", SkipAll); - } + } else + QSKIP("couldn't find Lohit Punjabi"); } } #endif @@ -603,9 +594,8 @@ void tst_QTextScriptEngine::gurmukhi() #ifdef Q_WS_X11 void tst_QTextScriptEngine::oriya() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Oriya).contains("utkal")) { @@ -634,19 +624,17 @@ void tst_QTextScriptEngine::oriya() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find utkal", SkipAll); - } - } + } else + QSKIP("couldn't find utkal"); + } } #endif #ifdef Q_WS_X11 void tst_QTextScriptEngine::tamil() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Tamil).contains("AkrutiTml1")) { @@ -712,9 +700,8 @@ void tst_QTextScriptEngine::tamil() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find AkrutiTml1", SkipAll); - } + } else + QSKIP("couldn't find AkrutiTml1"); } } #endif @@ -722,9 +709,8 @@ void tst_QTextScriptEngine::tamil() #ifdef Q_WS_X11 void tst_QTextScriptEngine::telugu() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Telugu).contains("Pothana2000")) { @@ -761,9 +747,8 @@ void tst_QTextScriptEngine::telugu() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Pothana2000", SkipAll); - } + } else + QSKIP("couldn't find Pothana2000"); } } #endif @@ -805,9 +790,8 @@ void tst_QTextScriptEngine::kannada() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Sampige", SkipAll); - } + } else + QSKIP("couldn't find Sampige"); } { if (QFontDatabase().families(QFontDatabase::Kannada).contains("Tunga")) { @@ -836,9 +820,8 @@ void tst_QTextScriptEngine::kannada() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Tunga", SkipAll); - } + } else + QSKIP("couldn't find Tunga"); } } #endif @@ -846,9 +829,8 @@ void tst_QTextScriptEngine::kannada() #ifdef Q_WS_X11 void tst_QTextScriptEngine::malayalam() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Malayalam).contains("AkrutiMal2")) { @@ -897,9 +879,8 @@ void tst_QTextScriptEngine::malayalam() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find AkrutiMal2", SkipAll); - } + } else + QSKIP("couldn't find AkrutiMal2"); } { if (QFontDatabase().families(QFontDatabase::Malayalam).contains("Rachana")) { @@ -925,9 +906,8 @@ void tst_QTextScriptEngine::malayalam() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Rachana", SkipAll); - } + } else + QSKIP("couldn't find Rachana"); } } #endif @@ -935,9 +915,8 @@ void tst_QTextScriptEngine::malayalam() #ifdef Q_WS_X11 void tst_QTextScriptEngine::sinhala() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Sinhala).contains("Malithi Web")) { @@ -964,9 +943,8 @@ void tst_QTextScriptEngine::sinhala() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Malithi Web", SkipAll); - } + } else + QSKIP("couldn't find Malithi Web"); } } #endif @@ -974,9 +952,8 @@ void tst_QTextScriptEngine::sinhala() #ifdef Q_WS_X11 void tst_QTextScriptEngine::khmer() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Khmer).contains("Khmer OS")) { @@ -1009,9 +986,8 @@ void tst_QTextScriptEngine::khmer() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Khmer OS", SkipAll); - } + } else + QSKIP("couldn't find Khmer OS"); } } #endif @@ -1019,9 +995,8 @@ void tst_QTextScriptEngine::khmer() #ifdef Q_WS_X11 void tst_QTextScriptEngine::linearB() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Any).contains("Penuturesu")) { @@ -1038,9 +1013,8 @@ void tst_QTextScriptEngine::linearB() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Penuturesu", SkipAll); - } + } else + QSKIP("couldn't find Penuturesu"); } } #endif @@ -1095,9 +1069,8 @@ static bool decomposedShaping( const QFont &f, const QChar &ch) #ifdef Q_WS_X11 void tst_QTextScriptEngine::greek() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Any).contains("DejaVu Sans")) { @@ -1113,9 +1086,8 @@ void tst_QTextScriptEngine::greek() continue; QVERIFY( decomposedShaping(f, QChar(uc)) ); } - } else { - QSKIP("couldn't find DejaVu Sans", SkipAll); - } + } else + QSKIP("couldn't find DejaVu Sans"); } { @@ -1149,9 +1121,8 @@ void tst_QTextScriptEngine::greek() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find SBL_grk", SkipAll); - } + } else + QSKIP("couldn't find SBL_grk"); } } #endif @@ -1196,10 +1167,8 @@ void tst_QTextScriptEngine::combiningMarks_qtbug15675() #elif defined(Q_WS_X11) QFontDatabase db; - if (!db.families().contains("DejaVu Sans Mono")) { - QSKIP("Required font (DejaVu Sans Mono) doesn't exist, skip test.", SkipAll); - return; - } + if (!db.families().contains("DejaVu Sans Mono")) + QSKIP("Required font (DejaVu Sans Mono) doesn't exist, skip test."); QString s; s.append(QChar(0x0062)); |