diff options
author | Liang Qi <liang.qi@qt.io> | 2019-01-26 08:35:40 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-26 08:35:40 +0100 |
commit | 980567b3a32b2e2f00c86f2d627cd82b5230dd0f (patch) | |
tree | bc8cc4005b2e07cbc5cad8ba30f8c9fa4f236c3d /src/testlib | |
parent | e81acde7d0cf5fb44a3fb2cf0bf7aaa2c65f807e (diff) | |
parent | 730cbad8824bcfcb7ab60371a6563cfb6dd5658d (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/android/templates/AndroidManifest.xml
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/doc/qttestlib.qdocconf | 8 | ||||
-rw-r--r-- | src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp | 63 | ||||
-rw-r--r-- | src/testlib/qtestcase.cpp | 4 | ||||
-rw-r--r-- | src/testlib/qtestcase.qdoc | 22 | ||||
-rw-r--r-- | src/testlib/qtestevent.qdoc | 2 | ||||
-rw-r--r-- | src/testlib/qxmltestlogger.cpp | 9 |
6 files changed, 101 insertions, 7 deletions
diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf index 6d5d3442a3..5fdf6d9415 100644 --- a/src/testlib/doc/qttestlib.qdocconf +++ b/src/testlib/doc/qttestlib.qdocconf @@ -31,8 +31,16 @@ depends += qtcore qtdoc qtwidgets qtgui qmake qtqmltest headerdirs += .. +headers += ../../corelib/kernel/qtestsupport_core.h \ + ../../gui/kernel/qtestsupport_gui.h \ + ../../widgets/kernel/qtestsupport_widgets.h + sourcedirs += .. +sources += ../../corelib/kernel/qtestsupport_core.cpp \ + ../../gui/kernel/qtestsupport_gui.cpp \ + ../../widgets/kernel/qtestsupport_widgets.cpp + exampledirs += ../../../examples/qtestlib \ ../ \ snippets diff --git a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp new file mode 100644 index 0000000000..e793cb1f55 --- /dev/null +++ b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [0] + MyObject obj; + obj.startup(); + QTest::qWaitFor([&]() { + return obj.isReady(); + }, 3000); +//! [0] + +//! [1] + int i = 0; + while (myNetworkServerNotResponding() && i++ < 50) + QTest::qWait(250); +//! [1] diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 15e123bdb7..4263f9f049 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2426,7 +2426,7 @@ bool QTest::currentTestFailed() Sleeps for \a ms milliseconds, blocking execution of the test. qSleep() will not do any event processing and leave your test unresponsive. Network communication might time out while - sleeping. Use \l qWait() to do non-blocking sleeping. + sleeping. Use \l {QTest::qWait()} to do non-blocking sleeping. \a ms must be greater than 0. @@ -2437,7 +2437,7 @@ bool QTest::currentTestFailed() Example: \snippet code/src_qtestlib_qtestcase.cpp 23 - \sa qWait() + \sa {QTest::qWait()} */ void QTest::qSleep(int ms) { diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc index 31903ea29c..2af016304d 100644 --- a/src/testlib/qtestcase.qdoc +++ b/src/testlib/qtestcase.qdoc @@ -995,6 +995,22 @@ */ /*! + \fn char *QTest::toString(const QCborError &c) + \overload + \since 5.12 + + Returns a textual representation of the given CBOR error \a c. +*/ + +/*! + \fn template <class... Types> char *QTest::toString(const std::tuple<Types...> &tuple) + \overload + \since 5.12 + + Returns a textual representation of the given \a tuple. +*/ + +/*! \fn char *QTest::toString(const QTime &time) \overload @@ -1113,6 +1129,12 @@ */ /*! + \fn template <typename Tuple, int... I> char *QTest::toString(const Tuple &tuple, QtPrivate::IndexesList<I...> ) + \internal + \since 5.12 +*/ + +/*! \fn QTouchDevice *QTest::createTouchDevice(QTouchDevice::DeviceType devType = QTouchDevice::TouchScreen) \since 5.8 diff --git a/src/testlib/qtestevent.qdoc b/src/testlib/qtestevent.qdoc index f0d3bff162..af84f2ac2b 100644 --- a/src/testlib/qtestevent.qdoc +++ b/src/testlib/qtestevent.qdoc @@ -133,7 +133,7 @@ Adds a \a msecs milliseconds delay. - \sa QTest::qWait() + \sa {QTest::qWait()} */ /*! \fn void QTestEventList::simulate(QWidget *w) diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp index 72cb53bca7..7153c016c5 100644 --- a/src/testlib/qxmltestlogger.cpp +++ b/src/testlib/qxmltestlogger.cpp @@ -136,8 +136,9 @@ void QXmlTestLogger::startLogging() void QXmlTestLogger::stopLogging() { QTestCharBuffer buf; - QTest::qt_asprintf(&buf, - "<Duration msecs=\"%f\"/>\n", QTestLog::msecsTotalTime()); + + QTest::qt_asprintf(&buf, "<Duration msecs=\"%s\"/>\n", + QString::number(QTestLog::msecsTotalTime()).toUtf8().constData()); outputString(buf.constData()); if (xmlmode == QXmlTestLogger::Complete) { outputString("</TestCase>\n"); @@ -159,9 +160,9 @@ void QXmlTestLogger::leaveTestFunction() { QTestCharBuffer buf; QTest::qt_asprintf(&buf, - " <Duration msecs=\"%f\"/>\n" + " <Duration msecs=\"%s\"/>\n" "</TestFunction>\n", - QTestLog::msecsFunctionTime()); + QString::number(QTestLog::msecsFunctionTime()).toUtf8().constData()); outputString(buf.constData()); } |