From 83f5c8f61a0456d2f1e1589837ac376b4edbf5db Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 19 Oct 2018 13:16:12 +0200
Subject: [PATCH] Test world-ids over 11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Add a test that we can have larger world ids.
Change-Id: Ibc8a0eb5e6f56aa41183adb3726b2c3141197c84
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
.../qwebenginescript/tst_qwebenginescript.cpp | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 6ce4623d6..0fe0ec6cf 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -35,6 +35,7 @@ class tst_QWebEngineScript: public QObject {
private Q_SLOTS:
void domEditing();
void loadEvents();
+ void scriptWorld_data();
void scriptWorld();
void scriptModifications();
#if QT_CONFIG(webengine_webchannel)
@@ -185,8 +186,18 @@ void tst_QWebEngineScript::loadEvents()
QCOMPARE(profile.pages.back().eval("window.log", QWebEngineScript::ApplicationWorld).toStringList(), expected);
}
+void tst_QWebEngineScript::scriptWorld_data()
+{
+ QTest::addColumn<int>("worldId");
+
+ QTest::newRow("ApplicationWorld") << static_cast<int>(QWebEngineScript::ApplicationWorld);
+ QTest::newRow("UserWorld") << static_cast<int>(QWebEngineScript::UserWorld);
+ QTest::newRow("150") << 150;
+}
+
void tst_QWebEngineScript::scriptWorld()
{
+ QFETCH(int, worldId);
QWebEnginePage page;
QWebEngineScript script;
script.setInjectionPoint(QWebEngineScript::DocumentCreation);
@@ -197,14 +208,14 @@ void tst_QWebEngineScript::scriptWorld()
QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
QVERIFY(spyFinished.wait());
QCOMPARE(evaluateJavaScriptSync(&page, "typeof(userScriptTest) != \"undefined\" && userScriptTest == 1;"), QVariant::fromValue(true));
- QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "typeof(userScriptTest) == \"undefined\"", QWebEngineScript::ApplicationWorld), QVariant::fromValue(true));
- script.setWorldId(QWebEngineScript::ApplicationWorld);
+ QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "typeof(userScriptTest) == \"undefined\"", worldId), QVariant::fromValue(true));
+ script.setWorldId(worldId);
page.scripts().clear();
page.scripts().insert(script);
page.load(QUrl("about:blank"));
QVERIFY(spyFinished.wait());
QCOMPARE(evaluateJavaScriptSync(&page, "typeof(userScriptTest) == \"undefined\""), QVariant::fromValue(true));
- QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "typeof(userScriptTest) != \"undefined\" && userScriptTest == 1;", QWebEngineScript::ApplicationWorld), QVariant::fromValue(true));
+ QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "typeof(userScriptTest) != \"undefined\" && userScriptTest == 1;", worldId), QVariant::fromValue(true));
}
void tst_QWebEngineScript::scriptModifications()
--
GitLab