Introduce mock UIDelegates for testing.

Switch JS dialogs test to using this over the testsupport
plugin.

This is a less intrusive approach that lives as self contained qml
modules within the test infrastructure. As an added benefit, it
covers the UI delegation logic from end to end, including what
happens in ui_delegates_manager.cpp.

Change-Id: I1cc0afaf5514d53e1f3b4b0682379dd2d8d8a913
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 0 insertions, 50 deletions

diff --git a/src/webengine/api/qquickwebenginetestsupport.cpp b/src/webengine/api/qquickwebenginetestsupport.cpp
index 0bb16ae14..d85e56e59 100644
--- a/src/webengine/api/qquickwebenginetestsupport.cpp
+++ b/src/webengine/api/qquickwebenginetestsupport.cpp
@@ -39,34 +39,6 @@
 #include "qquickwebengineloadrequest_p.h"
 
 QT_BEGIN_NAMESPACE
-using namespace QtWebEngineCore;
-
-QQuickWebEngineJavaScriptDialog::QQuickWebEngineJavaScriptDialog(QSharedPointer<JavaScriptDialogController> controller)
-{
-    m_dialogController = controller;
-}
-
-QString QQuickWebEngineJavaScriptDialog::message() const
-{
-    return m_dialogController->message();
-}
-
-QString QQuickWebEngineJavaScriptDialog::defaultValue() const
-{
-    return m_dialogController->defaultPrompt();
-}
-
-void QQuickWebEngineJavaScriptDialog::reject()
-{
-    QMetaObject::invokeMethod(m_dialogController.data(), "reject");
-}
-
-void QQuickWebEngineJavaScriptDialog::accept(const QString &input)
-{
-    if (!input.isNull())
-        QMetaObject::invokeMethod(m_dialogController.data(), "textProvided", Q_ARG(QString, input));
-    QMetaObject::invokeMethod(m_dialogController.data(), "accept");
-}
 
 QQuickWebEngineErrorPage::QQuickWebEngineErrorPage()
 {
@@ -98,28 +70,6 @@ QQuickWebEngineErrorPage *QQuickWebEngineTestSupport::errorPage() const
     return m_errorPage.data();
 }
 
-void QQuickWebEngineTestSupport::testDialog(QSharedPointer<JavaScriptDialogController> dialogController)
-{
-    Q_ASSERT(!dialogController.isNull());
-
-    QQuickWebEngineJavaScriptDialog dialog(dialogController);
-    switch (dialogController->type()) {
-    case WebContentsAdapterClient::AlertDialog:
-        Q_EMIT alertDialog(&dialog);
-        break;
-    case WebContentsAdapterClient::ConfirmDialog:
-        Q_EMIT confirmDialog(&dialog);
-        break;
-    case WebContentsAdapterClient::PromptDialog:
-        Q_EMIT promptDialog(&dialog);
-        break;
-    case WebContentsAdapterClient::InternalAuthorizationDialog:
-        break;
-    default:
-        Q_UNREACHABLE();
-    }
-}
-
 QT_END_NAMESPACE
 
 #include "moc_qquickwebenginetestsupport_p.cpp"