From ba644fdd92f1e1871b33af74999f8f6a7f5f6eaf Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Wed, 8 Mar 2017 14:15:31 +0100 Subject: Unblacklist changeLocale auto tests Do the error message comparison with utf-8 enconding since the localized error messages are stored in utf-8 format (error_page_strings.grdp). This also stabilizes the test because it doesn't depend on the encoding used by the Chromium. Change-Id: I24addc1c18d5b4325f4c0270e675e02c3f4e0812 Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/qquickwebengineview/BLACKLIST | 3 --- tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 6 +++--- tests/auto/widgets/qwebengineview/BLACKLIST | 3 --- tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 6 +++--- 4 files changed, 6 insertions(+), 12 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/quick/qquickwebengineview/BLACKLIST b/tests/auto/quick/qquickwebengineview/BLACKLIST index 6cfd71635..2cde59454 100644 --- a/tests/auto/quick/qquickwebengineview/BLACKLIST +++ b/tests/auto/quick/qquickwebengineview/BLACKLIST @@ -3,6 +3,3 @@ windows [inputEventForwardingDisabledWhenActiveFocusOnPressDisabled] * - -[changeLocale] -windows diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index a6818c6ef..2f9063ea5 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -695,7 +695,7 @@ void tst_QQuickWebEngineView::changeLocale() QTRY_VERIFY(!bodyInnerText(viewDE.data()).isEmpty()); errorLines = bodyInnerText(viewDE.data()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("Diese Website ist nicht erreichbar")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Diese Website ist nicht erreichbar")); QLocale::setDefault(QLocale("en")); QScopedPointer viewEN(newWebEngineView()); @@ -704,7 +704,7 @@ void tst_QQuickWebEngineView::changeLocale() QTRY_VERIFY(!bodyInnerText(viewEN.data()).isEmpty()); errorLines = bodyInnerText(viewEN.data()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("This site can\u2019t be reached")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("This site can\xE2\x80\x99t be reached")); // Reset error page viewDE->setUrl(QUrl("about:blank")); @@ -716,7 +716,7 @@ void tst_QQuickWebEngineView::changeLocale() QTRY_VERIFY(!bodyInnerText(viewDE.data()).isEmpty()); errorLines = bodyInnerText(viewDE.data()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("Diese Website ist nicht erreichbar")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Diese Website ist nicht erreichbar")); } void tst_QQuickWebEngineView::userScripts() diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST index d249ac141..0a909d0f6 100644 --- a/tests/auto/widgets/qwebengineview/BLACKLIST +++ b/tests/auto/widgets/qwebengineview/BLACKLIST @@ -1,5 +1,2 @@ [doNotSendMouseKeyboardEventsWhenDisabled] windows -[changeLocale] -windows -linux diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index e51171437..42dd23a9c 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -926,7 +926,7 @@ void tst_QWebEngineView::changeLocale() QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty()); errorLines = toPlainTextSync(viewDE.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("Diese Website ist nicht erreichbar")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Diese Website ist nicht erreichbar")); QLocale::setDefault(QLocale("en")); QWebEngineView viewEN; @@ -936,7 +936,7 @@ void tst_QWebEngineView::changeLocale() QTRY_VERIFY(!toPlainTextSync(viewEN.page()).isEmpty()); errorLines = toPlainTextSync(viewEN.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("This site can\u2019t be reached")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("This site can\xE2\x80\x99t be reached")); // Reset error page viewDE.load(QUrl("about:blank")); @@ -949,7 +949,7 @@ void tst_QWebEngineView::changeLocale() QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty()); errorLines = toPlainTextSync(viewDE.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("Diese Website ist nicht erreichbar")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Diese Website ist nicht erreichbar")); } void tst_QWebEngineView::inputMethodsTextFormat_data() -- cgit v1.2.3