From cffba828bc53fab284f030b8131ea47913108618 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Mon, 7 Jan 2019 17:40:26 +0100 Subject: Test: port tests to QRegularExpression This patch updates the tests to use QRegularExpression in place of QRegExp which is to be considered deprecated. Fixes: QTBUG-72596 Change-Id: Idebd9595b60d653974aa6ac49a75e2f90fea184f Reviewed-by: Kai Koehne --- tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp') diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index 29df3444c..0541eefc1 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -1000,7 +1001,7 @@ void tst_QQuickWebEngineView::changeLocale() QVERIFY(waitForLoadFailed(viewDE.data())); QTRY_VERIFY(!evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").isNull()); - errorLines = evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").toString().split(QRegExp("[\r\n]"), QString::SkipEmptyParts); + errorLines = evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").toString().split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts); QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar")); QLocale::setDefault(QLocale("en")); @@ -1009,7 +1010,7 @@ void tst_QQuickWebEngineView::changeLocale() QVERIFY(waitForLoadFailed(viewEN.data())); QTRY_VERIFY(!evaluateJavaScriptSync(viewEN.data(), "document.body.innerText").isNull()); - errorLines = evaluateJavaScriptSync(viewEN.data(), "document.body.innerText").toString().split(QRegExp("[\r\n]"), QString::SkipEmptyParts); + errorLines = evaluateJavaScriptSync(viewEN.data(), "document.body.innerText").toString().split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts); QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("This site can\xE2\x80\x99t be reached")); // Reset error page @@ -1021,7 +1022,7 @@ void tst_QQuickWebEngineView::changeLocale() QVERIFY(waitForLoadFailed(viewDE.data())); QTRY_VERIFY(!evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").isNull()); - errorLines = evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").toString().split(QRegExp("[\r\n]"), QString::SkipEmptyParts); + errorLines = evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").toString().split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts); QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar")); } -- cgit v1.2.3