From 1d70f19ddc688a9b4e8582c685cdf58c79a2f122 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 16 May 2018 08:37:16 +0200 Subject: winrt: Fix/blacklist failing text related auto tests winrt still has some issues with some character sets. These tests are skipped/blacklisted for now and will be investigated. Task-number: QTBUG-68297 Change-Id: I898e3383a4673b6dc87815a75e705f3302a4cbba Reviewed-by: Joerg Bornemann --- tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp | 3 +++ .../text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp | 12 ++++++++++++ .../gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp | 7 +++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp index 21b2697b90..b7f014d0e2 100644 --- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp +++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp @@ -731,6 +731,9 @@ void tst_QGlyphRun::mixedScripts() layout.endLayout(); QList glyphRuns = layout.glyphRuns(); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Hangul character not rendered on winrt", Continue); +#endif QCOMPARE(glyphRuns.size(), 2); } diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index ed69802d95..3e354b7523 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -1692,6 +1692,9 @@ void tst_QTextDocumentFragment::html_bodyBackground() const char html[] = "Foo"; doc->setHtml(html); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Fails on winrt. Investigate - QTBUG-68297", Continue); +#endif QCOMPARE(doc->rootFrame()->frameFormat().background().style(), Qt::TexturePattern); } @@ -1706,6 +1709,9 @@ void tst_QTextDocumentFragment::html_tableCellBackground() QVERIFY(table); QTextTableCell cell = table->cellAt(0, 0); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Fails on winrt. Investigate - QTBUG-68297", Continue); +#endif QCOMPARE(cell.format().background().style(), Qt::TexturePattern); } @@ -1714,6 +1720,9 @@ void tst_QTextDocumentFragment::css_bodyBackground() const char html[] = "Foo"; doc->setHtml(html); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Fails on winrt. Investigate - QTBUG-68297", Continue); +#endif QCOMPARE(doc->rootFrame()->frameFormat().background().style(), Qt::TexturePattern); } @@ -1728,6 +1737,9 @@ void tst_QTextDocumentFragment::css_tableCellBackground() QVERIFY(table); QTextTableCell cell = table->cellAt(0, 0); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Fails on winrt. Investigate - QTBUG-68297", Continue); +#endif QCOMPARE(cell.format().background().style(), Qt::TexturePattern); } diff --git a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp index 082d16f62d..c79f787547 100644 --- a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp +++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp @@ -299,8 +299,11 @@ void tst_QTextDocumentLayout::imageAtRightAlignedTab() imgFormat.setName(name); cursor.insertImage(imgFormat); - // Everything should fit into the 300 pixels - QCOMPARE(doc->idealWidth(), 300.0); + // Everything should fit into the 300 pixels +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Fails on winrt. Figure out why - QTBUG-68297", Continue); +#endif + QCOMPARE(doc->idealWidth(), 300.0); } void tst_QTextDocumentLayout::blockVisibility() -- cgit v1.2.3