summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2017-03-08 14:15:31 +0100
committerPeter Varga <pvarga@inf.u-szeged.hu>2017-03-15 08:32:12 +0000
commitba644fdd92f1e1871b33af74999f8f6a7f5f6eaf (patch)
tree9d355086d72e5c790fa18f1ff4f414af7a441e37 /tests/auto/widgets
parent6c2c6a48fbd914ee0f98e774c09f615576d6e179 (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/widgets')
-rw-r--r--tests/auto/widgets/qwebengineview/BLACKLIST3
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp6
2 files changed, 3 insertions, 6 deletions
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()