diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-03-08 14:15:31 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-03-15 08:32:12 +0000 |
| commit | ba644fdd92f1e1871b33af74999f8f6a7f5f6eaf (patch) | |
| tree | 9d355086d72e5c790fa18f1ff4f414af7a441e37 /tests/auto/quick | |
| parent | 6c2c6a48fbd914ee0f98e774c09f615576d6e179 (diff) | |
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 <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qquickwebengineview/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 6 |
2 files changed, 3 insertions, 6 deletions
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<QQuickWebEngineView> 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() |