From 8ac79692b35d7b245e4bc369d8f38d64788eb900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 28 Jun 2018 14:48:17 +0200 Subject: Android: QEXPECT_FAIL a failing condition Task-number: QTBUG-69193 Change-Id: I1df92b78306b86161028d78dad2fbeba2a867823 Reviewed-by: Jesus Fernandez --- tests/auto/gui/painting/qbrush/tst_qbrush.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp index a2f7a3aa07..9098bb0f6e 100644 --- a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp +++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp @@ -439,6 +439,9 @@ void tst_QBrush::textureBrushStream() QCOMPARE(loadedBrush1.style(), Qt::TexturePattern); QCOMPARE(loadedBrush2.style(), Qt::TexturePattern); +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("", "QTBUG-69193", Continue); +#endif QCOMPARE(loadedBrush1.texture(), pixmap_source); QCOMPARE(loadedBrush2.textureImage(), image_source); } -- cgit v1.2.3 From 6bd40bedd1b4f853d7eac301368ef8e2b92a8e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 29 Jun 2018 13:42:27 +0200 Subject: Android: tst_QFont: QEXPECT_FAIL a couple failing checks Task-number: QTBUG-69214 Task-number: QTBUG-69215 Change-Id: I566fe086adec059251aa367c4ef41f42e119f764 Reviewed-by: Jesus Fernandez --- tests/auto/gui/text/qfont/tst_qfont.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 7d230d3bb3..8090f38a2c 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -300,6 +300,9 @@ void tst_QFont::resetFont() child->setFont(QFont()); // reset font QCOMPARE(child->font().resolve(), uint(0)); +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("", "QTBUG-69214", Continue); +#endif QCOMPARE(child->font().pointSize(), parent.font().pointSize()); QVERIFY(parent.font().resolve() != 0); } @@ -539,6 +542,9 @@ void tst_QFont::defaultFamily() } } +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("serif", "QTBUG-69215", Continue); +#endif QVERIFY2(isAcceptable, msgNotAcceptableFont(familyForHint, acceptableFamilies)); } -- cgit v1.2.3 From 67e209f59fed638e93402bf2eb63fba56195e244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 29 Jun 2018 15:12:42 +0200 Subject: Android: QEXPECT_FAIL tst_QFontDatabase::condensedFontMatching Task-number: QTBUG-69216 Change-Id: I7da5396a62b87109609749f9ef7e9a1a7b6c6db8 Reviewed-by: Jesus Fernandez --- tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index ebe9d3b992..79058e5073 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -335,6 +335,9 @@ void tst_QFontDatabase::condensedFontMatching() QEXPECT_FAIL("","No matching of sub-family by stretch on Windows", Continue); #endif +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("", "QTBUG-69216", Continue); +#endif QCOMPARE(QFontMetrics(tfcByStretch).horizontalAdvance(testString()), QFontMetrics(tfcByStyleName).horizontalAdvance(testString())); -- cgit v1.2.3 From eeaae34c99d9994e53a6addf7c8d30a070cc4f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 29 Jun 2018 15:29:55 +0200 Subject: Android: QEXPECT_FAIL in tst_QRawFont::fallbackFontsOrder Task-number: QTBUG-69217 Change-Id: Ibd78b7e2271d4066bee8e7b1224d309e5cb89132 Reviewed-by: Jesus Fernandez --- tests/auto/gui/text/qrawfont/tst_qrawfont.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp index 373ad7fef9..a32fb1d25b 100644 --- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp +++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp @@ -1039,6 +1039,9 @@ void tst_QRawFont::fallbackFontsOrder() QList glyphRuns = layout.glyphRuns(); +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("", "QTBUG-69217", Continue); +#endif // Since QtBidiTestFont does not support Arabic nor the space, both should map to // the same font. If this fails, it is an indication that the list of fallbacks fonts // is not sorted by writing system support. -- cgit v1.2.3 From 61dabf97f24159f1a1f6c927b39b5c26c59e6c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 29 Jun 2018 16:02:58 +0200 Subject: Android: tst_QStaticText: QEXPECT_FAIL some tests Task-number: QTBUG-69218 Task-number: QTBUG-69220 Change-Id: Ib41d330653cdfccc2852a337d400f29a88bdd00a Reviewed-by: Jesus Fernandez --- tests/auto/gui/text/qstatictext/tst_qstatictext.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index 45cc94afad..0089aeb43e 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -403,6 +403,9 @@ void tst_QStaticText::rotatedPainter() QVERIFY(imageDrawText.toImage() != m_whiteSquare); +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("", "QTBUG-69218", Continue); +#endif if (!supportsTransformations()) QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort); QCOMPARE(imageDrawStaticText, imageDrawText); @@ -560,6 +563,9 @@ void tst_QStaticText::transformationChanged() QVERIFY(imageDrawText.toImage() != m_whiteSquare); +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("", "QTBUG-69220", Continue); +#endif if (!supportsTransformations()) QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort); QCOMPARE(imageDrawStaticText, imageDrawText); -- cgit v1.2.3 From de0977e1c00374343227f9ae6c14fa023edebd36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 2 Jul 2018 16:54:46 +0200 Subject: Android: QEXPECT_FAIL tst_QTextDocument::task240325 Task-number: QTBUG-69242 Change-Id: Ib63fc17b3f8ffb73e36c77a00d55b8200d058ef1 Reviewed-by: Jesus Fernandez --- tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index ebdb5a56af..3f602f5aae 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -619,7 +619,11 @@ void tst_QTextDocument::task240325() QCOMPARE(doc->blockCount(), 1); for (QTextBlock block = doc->begin() ; block!=doc->end() ; block = block.next()) { QTextLayout *layout = block.layout(); +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("", "QTBUG-69242", Abort); +#endif QCOMPARE(layout->lineCount(), 4); + for (int lineIdx=0;lineIdxlineCount();++lineIdx) { QTextLine line = layout->lineAt(lineIdx); -- cgit v1.2.3