Improve QWebEngineCertificateError api

* remove const ref from QWebEngineCertificateError

  Q_GADGET is a value type, QWebEngineCertificateError is pass
  as const reference from api. This is not so useful since, in qml this
  will be anyway copied and for c++ this is not useful since
  reject, ignore, defer methods are all const. Therefore simply
  pass it by value.

* make consistent naming defer(), acceptCertificate(), rejectCertificate()
* remove properties 'differed', 'answered' which are use internally,
  user knows if he calls functions.
* error.errorDescription -> error.description()
* error.error() -> error.type()

[ChangeLog] In QWebEngineCertificateError use acceptCertificate()
instead of ignoreCertificiateError()

Change-Id: I9ffa500a0a455d98445b066252dd283872740731
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

3 files changed, 23 insertions, 29 deletions

diff --git a/tests/auto/quick/certificateerror/tst_certificateerror.cpp b/tests/auto/quick/certificateerror/tst_certificateerror.cpp
index 6652fd511..3e2dc85fb 100644
--- a/tests/auto/quick/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/quick/certificateerror/tst_certificateerror.cpp
@@ -99,7 +99,7 @@ void tst_CertificateError::handleError()
     }
 
     if (acceptCertificate)
-        error.ignoreCertificateError();
+        error.acceptCertificate();
     else
         error.rejectCertificate();
 
@@ -110,16 +110,12 @@ void tst_CertificateError::handleError()
     QCOMPARE(chain[1].serialNumber(), "6d:52:fb:b4:57:3b:b2:03:c8:62:7b:7e:44:45:5c:d3:08:87:74:17");
 
     if (deferError) {
-      QVERIFY(error.deferred());
-      QVERIFY(!error.answered());
       QVERIFY(!m_handler->loadSuccess());
 
       if (acceptCertificate)
-        error.ignoreCertificateError();
+          error.acceptCertificate();
       else
-        error.rejectCertificate();
-
-      QVERIFY(error.answered());
+          error.rejectCertificate();
     }
     QTRY_COMPARE_WITH_TIMEOUT(m_handler->loadSuccess(), acceptCertificate, 3000);
 }
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index e5f5bf27d..83ae3f0cd 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -121,28 +121,26 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineAuthenticationDialogRequest.realm --> QString"
     << "QQuickWebEngineAuthenticationDialogRequest.type --> AuthenticationType"
     << "QQuickWebEngineAuthenticationDialogRequest.url --> QUrl"
-    << "QWebEngineCertificateError.CertificateAuthorityInvalid --> Error"
-    << "QWebEngineCertificateError.CertificateCommonNameInvalid --> Error"
-    << "QWebEngineCertificateError.CertificateContainsErrors --> Error"
-    << "QWebEngineCertificateError.CertificateDateInvalid --> Error"
-    << "QWebEngineCertificateError.CertificateInvalid --> Error"
-    << "QWebEngineCertificateError.CertificateKnownInterceptionBlocked --> Error"
-    << "QWebEngineCertificateError.CertificateNameConstraintViolation --> Error"
-    << "QWebEngineCertificateError.CertificateNoRevocationMechanism --> Error"
-    << "QWebEngineCertificateError.CertificateNonUniqueName --> Error"
-    << "QWebEngineCertificateError.CertificateRevoked --> Error"
-    << "QWebEngineCertificateError.CertificateTransparencyRequired --> Error"
-    << "QWebEngineCertificateError.CertificateUnableToCheckRevocation --> Error"
-    << "QWebEngineCertificateError.CertificateValidityTooLong --> Error"
-    << "QWebEngineCertificateError.CertificateWeakKey --> Error"
-    << "QWebEngineCertificateError.CertificateWeakSignatureAlgorithm --> Error"
-    << "QWebEngineCertificateError.SslPinnedKeyNotInCertificateChain --> Error"
-    << "QWebEngineCertificateError.answered --> bool"
-    << "QWebEngineCertificateError.deferred --> bool"
+    << "QWebEngineCertificateError.CertificateAuthorityInvalid --> Type"
+    << "QWebEngineCertificateError.CertificateCommonNameInvalid --> Type"
+    << "QWebEngineCertificateError.CertificateContainsErrors --> Type"
+    << "QWebEngineCertificateError.CertificateDateInvalid --> Type"
+    << "QWebEngineCertificateError.CertificateInvalid --> Type"
+    << "QWebEngineCertificateError.CertificateKnownInterceptionBlocked --> Type"
+    << "QWebEngineCertificateError.CertificateNameConstraintViolation --> Type"
+    << "QWebEngineCertificateError.CertificateNoRevocationMechanism --> Type"
+    << "QWebEngineCertificateError.CertificateNonUniqueName --> Type"
+    << "QWebEngineCertificateError.CertificateRevoked --> Type"
+    << "QWebEngineCertificateError.CertificateTransparencyRequired --> Type"
+    << "QWebEngineCertificateError.CertificateUnableToCheckRevocation --> Type"
+    << "QWebEngineCertificateError.CertificateValidityTooLong --> Type"
+    << "QWebEngineCertificateError.CertificateWeakKey --> Type"
+    << "QWebEngineCertificateError.CertificateWeakSignatureAlgorithm --> Type"
+    << "QWebEngineCertificateError.SslPinnedKeyNotInCertificateChain --> Type"
     << "QWebEngineCertificateError.defer() --> void"
     << "QWebEngineCertificateError.description --> QString"
-    << "QWebEngineCertificateError.error --> Error"
-    << "QWebEngineCertificateError.ignoreCertificateError() --> void"
+    << "QWebEngineCertificateError.type --> Type"
+    << "QWebEngineCertificateError.acceptCertificate() --> void"
     << "QWebEngineCertificateError.overridable --> bool"
     << "QWebEngineCertificateError.rejectCertificate() --> void"
     << "QWebEngineCertificateError.url --> QUrl"
diff --git a/tests/auto/quick/qmltests/data/tst_certificateError.qml b/tests/auto/quick/qmltests/data/tst_certificateError.qml
index 0629be175..a4bd9597a 100644
--- a/tests/auto/quick/qmltests/data/tst_certificateError.qml
+++ b/tests/auto/quick/qmltests/data/tst_certificateError.qml
@@ -42,7 +42,7 @@ TestWebEngineView {
         if (deferError)
             error.defer()
         else if (acceptCertificate)
-            error.ignoreCertificateError()
+            error.acceptCertificate()
         else
             error.rejectCertificate()
     }
@@ -97,7 +97,7 @@ TestWebEngineView {
 
                 let error = spyError.signalArguments[0][0]
                 if (data.acceptCertificate)
-                    error.ignoreCertificateError()
+                    error.acceptCertificate()
                 else
                     error.rejectCertificate()
             }