From 721c561c1334048a89af0882e1d3b7184b8f4ca9 Mon Sep 17 00:00:00 2001
From: Adam Kallai <kadam@inf.u-szeged.hu>
Date: Tue, 27 Jan 2015 15:21:10 +0100
Subject: Update the expected list of public API testcase

- Also fix the qtwebengineglobal_p.h header include in quickwebneignedownloaditem_p.h,
  because it is searched for wrong manner from the tst_publicapi testcase.

Change-Id: I8997fafbf198f19a3d54b194f3408def6370417e
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
 src/webengine/api/qquickwebenginedownloaditem_p.h |  2 +-
 tests/auto/quick/publicapi/tst_publicapi.cpp      | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/webengine/api/qquickwebenginedownloaditem_p.h b/src/webengine/api/qquickwebenginedownloaditem_p.h
index 8ea9f0850..71cca2ee6 100644
--- a/src/webengine/api/qquickwebenginedownloaditem_p.h
+++ b/src/webengine/api/qquickwebenginedownloaditem_p.h
@@ -37,7 +37,7 @@
 #ifndef QQUICKWEBENGINEDOWNLOADITEM_P_H
 #define QQUICKWEBENGINEDOWNLOADITEM_P_H
 
-#include <qtwebengineglobal_p.h>
+#include "qtwebengineglobal_p.h"
 #include <QObject>
 #include <QScopedPointer>
 #include <QString>
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 28a837260..e5989f167 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -46,8 +46,10 @@
 #include <QMetaType>
 #include <QtTest/QtTest>
 #include <private/qquickwebengineview_p.h>
+#include <private/qquickwebenginedownloaditem_p.h>
 #include <private/qquickwebengineloadrequest_p.h>
 #include <private/qquickwebenginenavigationrequest_p.h>
+#include <private/qquickwebenginenewviewrequest_p.h>
 #include <private/qquickwebengineprofile_p.h>
 
 class tst_publicapi : public QObject {
@@ -58,8 +60,10 @@ private Q_SLOTS:
 
 static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>()
     << &QQuickWebEngineView::staticMetaObject
+    << &QQuickWebEngineDownloadItem::staticMetaObject
     << &QQuickWebEngineLoadRequest::staticMetaObject
     << &QQuickWebEngineNavigationRequest::staticMetaObject
+    << &QQuickWebEngineNewViewRequest::staticMetaObject
     << &QQuickWebEngineProfile::staticMetaObject
     ;
 
@@ -124,6 +128,19 @@ static QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.zoomFactorChanged(double) --> void"
     << "QQuickWebEngineView.setZoomFactor(double) --> void"
     << "QQuickWebEngineView.profile --> QQuickWebEngineProfile*"
+    << "QQuickWebEngineView.newViewRequested(QQuickWebEngineNewViewRequest*) --> void"
+    << "QQuickWebEngineDownloadItem.id --> uint"
+    << "QQuickWebEngineDownloadItem.state --> DownloadState"
+    << "QQuickWebEngineDownloadItem.progress --> int"
+    << "QQuickWebEngineDownloadItem.path --> QString"
+    << "QQuickWebEngineDownloadItem.DownloadInProgress --> DownloadState"
+    << "QQuickWebEngineDownloadItem.DownloadCompleted --> DownloadState"
+    << "QQuickWebEngineDownloadItem.DownloadCancelled --> DownloadState"
+    << "QQuickWebEngineDownloadItem.DownloadInterrupted --> DownloadState"
+    << "QQuickWebEngineDownloadItem.stateChanged() --> void"
+    << "QQuickWebEngineDownloadItem.progressChanged() --> void"
+    << "QQuickWebEngineDownloadItem.pathChanged() --> void"
+    << "QQuickWebEngineDownloadItem.cancel() --> void"
     << "QQuickWebEngineLoadRequest.url --> QUrl"
     << "QQuickWebEngineLoadRequest.status --> QQuickWebEngineView::LoadStatus"
     << "QQuickWebEngineLoadRequest.errorString --> QString"
@@ -134,6 +151,9 @@ static QStringList expectedAPI = QStringList()
     << "QQuickWebEngineNavigationRequest.action --> QQuickWebEngineView::NavigationRequestAction"
     << "QQuickWebEngineNavigationRequest.navigationType --> QQuickWebEngineView::NavigationType"
     << "QQuickWebEngineNavigationRequest.actionChanged() --> void"
+    << "QQuickWebEngineNewViewRequest.destination --> QQuickWebEngineView::NewViewDestination"
+    << "QQuickWebEngineNewViewRequest.userInitiated --> bool"
+    << "QQuickWebEngineNewViewRequest.openIn(QQuickWebEngineView*) --> void"
     << "QQuickWebEngineProfile.MemoryHttpCache --> HttpCacheType"
     << "QQuickWebEngineProfile.DiskHttpCache --> HttpCacheType"
     << "QQuickWebEngineProfile.NoPersistentCookies --> PersistentCookiesPolicy"
@@ -155,6 +175,8 @@ static QStringList expectedAPI = QStringList()
     << "QQuickWebEngineProfile.httpCacheTypeChanged() --> void"
     << "QQuickWebEngineProfile.persistentCookiesPolicyChanged() --> void"
     << "QQuickWebEngineProfile.httpCacheMaxSizeChanged() --> void"
+    << "QQuickWebEngineProfile.downloadStarted(QQuickWebEngineDownloadItem*) --> void"
+    << "QQuickWebEngineProfile.downloadFinished(QQuickWebEngineDownloadItem*) --> void"
     ;
 
 static bool isCheckedEnum(const QByteArray &typeName)
-- 
cgit v1.2.3