From 4343bf8fafc3407a87f6c1e3b05476676b405b1c Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Mon, 25 Nov 2013 15:37:06 +0100 Subject: WebPage: Implement javaScriptConsoleMessage And unskip the corresponding autotest. Change-Id: Ida2dcee38b261b2ba4ad0c5c016f5510ed1590a4 Reviewed-by: Jocelyn Turcotte --- tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/auto') 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 levels; QStringList messages; QList 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 { -- cgit v1.2.3