summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-10-28 09:51:04 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-10-28 09:53:31 +0100
commite280d6794a2b9fc6b9280f2f91016e5f95570d9d (patch)
tree11a7f0944721f84a5e72a9b48d4e8893091d72bd /tests
parentfd73b33893e0acb22c6082a1754b01bf9f5c436e (diff)
parent09a341f4a62a0fe244dc188a75d77d0067ad1fe7 (diff)
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts: src/3rdparty Change-Id: I49acdd9b5ca94f2807b0c13a97f508a67f1c5750
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/qwebengineprofile/qwebengineprofile.pro3
-rw-r--r--tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp76
-rw-r--r--tests/auto/widgets/widgets.pro5
3 files changed, 82 insertions, 2 deletions
diff --git a/tests/auto/widgets/qwebengineprofile/qwebengineprofile.pro b/tests/auto/widgets/qwebengineprofile/qwebengineprofile.pro
new file mode 100644
index 000000000..e56bbe8f7
--- /dev/null
+++ b/tests/auto/widgets/qwebengineprofile/qwebengineprofile.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
+QT *= core-private gui-private
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
new file mode 100644
index 000000000..09929d33f
--- /dev/null
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../util.h"
+#include <QtTest/QtTest>
+#include <qwebengineprofile.h>
+
+class tst_QWebEngineProfile : public QObject
+{
+ Q_OBJECT
+
+private Q_SLOTS:
+ void defaultProfile();
+ void profileConstructors();
+};
+
+void tst_QWebEngineProfile::defaultProfile()
+{
+ QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
+ QVERIFY(profile);
+ QVERIFY(!profile->isOffTheRecord());
+ QCOMPARE(profile->storageName(), QStringLiteral("Default"));
+ QCOMPARE(profile->httpCacheType(), QWebEngineProfile::DiskHttpCache);
+ QCOMPARE(profile->persistentCookiesPolicy(), QWebEngineProfile::AllowPersistentCookies);
+}
+
+void tst_QWebEngineProfile::profileConstructors()
+{
+ QWebEngineProfile otrProfile;
+ QWebEngineProfile diskProfile(QStringLiteral("Test"));
+
+ QVERIFY(otrProfile.isOffTheRecord());
+ QVERIFY(!diskProfile.isOffTheRecord());
+ QCOMPARE(diskProfile.storageName(), QStringLiteral("Test"));
+ QCOMPARE(otrProfile.httpCacheType(), QWebEngineProfile::MemoryHttpCache);
+ QCOMPARE(diskProfile.httpCacheType(), QWebEngineProfile::DiskHttpCache);
+ QCOMPARE(otrProfile.persistentCookiesPolicy(), QWebEngineProfile::NoPersistentCookies);
+ QCOMPARE(diskProfile.persistentCookiesPolicy(), QWebEngineProfile::AllowPersistentCookies);
+
+}
+
+QTEST_MAIN(tst_QWebEngineProfile)
+#include "tst_qwebengineprofile.moc"
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
index b2df0880d..aaafcb6e5 100644
--- a/tests/auto/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets.pro
@@ -5,8 +5,9 @@ CONFIG += ordered
SUBDIRS += \
qwebengineaccessibility \
qwebenginepage \
- qwebenginehistoryinterface \
- qwebengineview \
qwebenginehistory \
+ qwebenginehistoryinterface \
qwebengineinspector \
+ qwebengineprofile \
qwebenginescript \
+ qwebengineview