summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-11-25 15:37:06 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-30 11:57:54 +0100
commit4343bf8fafc3407a87f6c1e3b05476676b405b1c (patch)
tree87513685c6d1c08cfe5c94e83b938662d621f9b8 /tests/auto
parent284003c590e79404ebcdd7665f61f7a533bdc0a7 (diff)
WebPage: Implement javaScriptConsoleMessage
And unskip the corresponding autotest. Change-Id: Ida2dcee38b261b2ba4ad0c5c016f5510ed1590a4 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index addb2bb85..c6c217a39 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -399,13 +399,15 @@ class ConsolePage : public QWebEnginePage
public:
ConsolePage(QObject* parent = 0) : QWebEnginePage(parent) {}
- virtual void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
+ virtual void javaScriptConsoleMessage(int level, const QString& message, int lineNumber, const QString& sourceID)
{
+ levels.append(level);
messages.append(message);
lineNumbers.append(lineNumber);
sourceIDs.append(sourceID);
}
+ QList<int> levels;
QStringList messages;
QList<int> lineNumbers;
QStringList sourceIDs;
@@ -413,15 +415,11 @@ public:
void tst_QWebEnginePage::consoleOutput()
{
-#if !defined(QWEBENGINEPAGE_JAVASCRIPTCONSOLEMESSAGE)
- QSKIP("QWEBENGINEPAGE_JAVASCRIPTCONSOLEMESSAGE");
-#else
ConsolePage page;
// We don't care about the result but want this to be synchronous
evaluateJavaScriptSync(&page, "this is not valid JavaScript");
QCOMPARE(page.messages.count(), 1);
QCOMPARE(page.lineNumbers.at(0), 1);
-#endif
}
class TestPage : public QWebEnginePage {