diff options
Diffstat (limited to 'tests/auto')
244 files changed, 6822 insertions, 755 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index f539f012df..b864b065e6 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -2379,7 +2379,7 @@ void tst_QtConcurrentMap::stlContainers() InstanceCounter ic_fn(const InstanceCounter & ic) { return InstanceCounter(ic); -}; +} // Verify that held results are deleted when a future is // assigned over with operator == diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp index 2f1b56629a..6129184738 100644 --- a/tests/auto/corelib/global/qflags/tst_qflags.cpp +++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp @@ -39,6 +39,7 @@ private slots: void classEnum(); void initializerLists(); void testSetFlags(); + void adl(); }; void tst_QFlags::testFlag() const @@ -304,6 +305,27 @@ void tst_QFlags::testSetFlags() QVERIFY(!flags.testFlag(MyStrictEnum::StrictFour)); } +namespace SomeNS { +enum Foo { Foo_A = 1 << 0, Foo_B = 1 << 1, Foo_C = 1 << 2 }; + +Q_DECLARE_FLAGS(Foos, Foo) +Q_DECLARE_OPERATORS_FOR_FLAGS(Foos); + +Qt::Alignment alignment() +{ + // Checks that the operator| works, despite there is another operator| in this namespace. + return Qt::AlignLeft | Qt::AlignTop; +} +} + +void tst_QFlags::adl() +{ + SomeNS::Foos fl = SomeNS::Foo_B | SomeNS::Foo_C; + QVERIFY(fl & SomeNS::Foo_B); + QVERIFY(!(fl & SomeNS::Foo_A)); + QCOMPARE(SomeNS::alignment(), Qt::AlignLeft | Qt::AlignTop); +} + // (statically) check QTypeInfo for QFlags instantiations: enum MyEnum { Zero, One, Two, Four=4 }; Q_DECLARE_FLAGS( MyFlags, MyEnum ) diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro index e8071297b1..1e12a41dea 100644 --- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro +++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro @@ -1,25 +1,2 @@ -CONFIG += testcase -TARGET = tst_qresourceengine - -QT = core testlib -SOURCES = tst_qresourceengine.cpp -RESOURCES += testqrc/test.qrc - -qtPrepareTool(QMAKE_RCC, rcc, _DEP) -runtime_resource.target = runtime_resource.rcc -runtime_resource.depends = $$PWD/testqrc/test.qrc $$QMAKE_RCC_EXE -runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $$PWD/testqrc/test.qrc -o $${runtime_resource.target} -QMAKE_EXTRA_TARGETS = runtime_resource -PRE_TARGETDEPS += $${runtime_resource.target} -QMAKE_DISTCLEAN += $${runtime_resource.target} - -TESTDATA += \ - parentdir.txt \ - testqrc/* -GENERATED_TESTDATA = $${runtime_resource.target} - -android:!android-embedded { - RESOURCES += android_testdata.qrc -} - -builtin_testdata: DEFINES += BUILTIN_TESTDATA +TEMPLATE = subdirs +SUBDIRS = staticplugin qresourceengine_test.pro diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro new file mode 100644 index 0000000000..3838a72c21 --- /dev/null +++ b/tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro @@ -0,0 +1,33 @@ +CONFIG += testcase +TARGET = tst_qresourceengine + +QT = core testlib +SOURCES = tst_qresourceengine.cpp +RESOURCES += testqrc/test.qrc + +qtPrepareTool(QMAKE_RCC, rcc, _DEP) +runtime_resource.target = runtime_resource.rcc +runtime_resource.depends = $$PWD/testqrc/test.qrc $$QMAKE_RCC_EXE +runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $$PWD/testqrc/test.qrc -o $${runtime_resource.target} +QMAKE_EXTRA_TARGETS = runtime_resource +PRE_TARGETDEPS += $${runtime_resource.target} +QMAKE_DISTCLEAN += $${runtime_resource.target} + +TESTDATA += \ + parentdir.txt \ + testqrc/* +GENERATED_TESTDATA = $${runtime_resource.target} + +android:!android-embedded { + RESOURCES += android_testdata.qrc +} + +win32 { + CONFIG(debug, debug|release): LIBS += -Lstaticplugin/debug + else: LIBS += -Lstaticplugin/release +} else { + LIBS += -Lstaticplugin +} +LIBS += -lmoctestplugin + +builtin_testdata: DEFINES += BUILTIN_TESTDATA diff --git a/tests/auto/corelib/io/qresourceengine/staticplugin/.gitignore b/tests/auto/corelib/io/qresourceengine/staticplugin/.gitignore new file mode 100644 index 0000000000..c397dde6a5 --- /dev/null +++ b/tests/auto/corelib/io/qresourceengine/staticplugin/.gitignore @@ -0,0 +1 @@ +moctestplugin_plugin_resources.cpp diff --git a/tests/auto/corelib/io/qresourceengine/staticplugin/main.cpp b/tests/auto/corelib/io/qresourceengine/staticplugin/main.cpp new file mode 100644 index 0000000000..39a3a1e012 --- /dev/null +++ b/tests/auto/corelib/io/qresourceengine/staticplugin/main.cpp @@ -0,0 +1,9 @@ +#include <QObject> + +class PluginClass : public QObject +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.tests.moc" FILE "staticplugin.json") +}; + +#include "main.moc" diff --git a/tests/auto/corelib/io/qresourceengine/staticplugin/staticplugin.json b/tests/auto/corelib/io/qresourceengine/staticplugin/staticplugin.json new file mode 100644 index 0000000000..4103ecb18c --- /dev/null +++ b/tests/auto/corelib/io/qresourceengine/staticplugin/staticplugin.json @@ -0,0 +1 @@ +{ "Keys": [ "staticplugin" ] } diff --git a/tests/auto/corelib/io/qresourceengine/staticplugin/staticplugin.pro b/tests/auto/corelib/io/qresourceengine/staticplugin/staticplugin.pro new file mode 100644 index 0000000000..e19d884548 --- /dev/null +++ b/tests/auto/corelib/io/qresourceengine/staticplugin/staticplugin.pro @@ -0,0 +1,8 @@ +TEMPLATE = lib +TARGET = moctestplugin +CONFIG += plugin static +SOURCES = main.cpp +plugin_resource.files = main.cpp +plugin_resource.prefix = /staticplugin +RESOURCES += plugin_resource +QT = core diff --git a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp index b7e85e8f05..ffa7bab6d9 100644 --- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp +++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp @@ -57,6 +57,7 @@ private slots: void doubleSlashInRoot(); void setLocale(); void lastModified(); + void resourcesInStaticPlugins(); private: const QString m_runtimeResourceRcc; @@ -119,6 +120,7 @@ void tst_QResourceEngine::checkStructure_data() << QLatin1String("searchpath1") << QLatin1String("searchpath2") << QLatin1String("secondary_root") + << QLatin1String("staticplugin") << QLatin1String("test") << QLatin1String("withoutslashes"); @@ -520,6 +522,16 @@ void tst_QResourceEngine::lastModified() } } +Q_IMPORT_PLUGIN(PluginClass) +void tst_QResourceEngine::resourcesInStaticPlugins() +{ + // We built a separate static plugin and attempted linking against + // it. That should successfully register the resources linked into + // the plugin via moc generated Q_INIT_RESOURCE calls in a + // Q_CONSTRUCTOR_FUNCTION. + QVERIFY(QFile::exists(":/staticplugin/main.cpp")); +} + QTEST_MAIN(tst_QResourceEngine) #include "tst_qresourceengine.moc" diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index db756ada39..77c1211ab5 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -531,7 +531,7 @@ void tst_QSettings::ctor() // more details in QMacSettingsPrivate::QMacSettingsPrivate(), organization was comify()-ed caseSensitive = settings5.fileName().contains("SoftWare.ORG");; } else { - caseSensitive = pathconf(QDir::currentPath().toLatin1().constData(), _PC_CASE_SENSITIVE); + caseSensitive = pathconf(settings5.fileName().toLatin1().constData(), _PC_CASE_SENSITIVE); } #elif defined(Q_OS_WIN32) || defined(Q_OS_WINRT) caseSensitive = false; diff --git a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp index 8b1aa105de..1317489e2f 100644 --- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp +++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp @@ -80,7 +80,7 @@ static int qInfoPrinter(const char *format, ...) // flush QtMessageHandler qt_message_print = qInstallMessageHandler(0); qInstallMessageHandler(qt_message_print); // restore the handler - qt_message_print(QtInfoMsg, QMessageLogContext(), QString::fromLocal8Bit(buf)); + qt_message_print(QtInfoMsg, QMessageLogContext(), QString::fromLocal8Bit(buf).trimmed()); bufuse = 0; } diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 1acedf4271..8af6347f89 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -152,6 +152,10 @@ private slots: void emitLayoutChangedOnlyIfSortingChanged(); void checkSetNewModel(); + + void removeIntervals_data(); + void removeIntervals(); + protected: void buildHierarchy(const QStringList &data, QAbstractItemModel *model); void checkHierarchy(const QStringList &data, const QAbstractItemModel *model); @@ -4402,6 +4406,44 @@ void tst_QSortFilterProxyModel::emitLayoutChangedOnlyIfSortingChanged_data() QTest::newRow("many_changes_no_layoutChanged") << -1 << Qt::DisplayRole << "7,5,4,3,2,1,0,8" << "75432108" << "0248" << 0; } +// Custom version of QStringListModel which supports emitting dataChanged for many rows at once +class CustomStringListModel : public QAbstractListModel +{ +public: + bool setData(const QModelIndex &index, const QVariant &value, int role) override + { + if (index.row() >= 0 && index.row() < lst.size() + && (role == Qt::EditRole || role == Qt::DisplayRole)) { + lst.replace(index.row(), value.toString()); + emit dataChanged(index, index, { Qt::DisplayRole, Qt::EditRole }); + return true; + } + return false; + } + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override + { + if (role == Qt::DisplayRole || role == Qt::EditRole) + return lst.at(index.row()); + return QVariant(); + } + int rowCount(const QModelIndex & = QModelIndex()) const override { return lst.count(); } + + void replaceData(const QStringList &newData) + { + lst = newData; + emit dataChanged(index(0, 0), index(rowCount() - 1, 0), { Qt::DisplayRole, Qt::EditRole }); + } + + void emitDecorationChangedSignal() + { + const QModelIndex idx = index(0, 0); + emit dataChanged(idx, idx, { Qt::DecorationRole }); + } + +private: + QStringList lst; +}; + void tst_QSortFilterProxyModel::emitLayoutChangedOnlyIfSortingChanged() { QFETCH(int, changedRow); @@ -4411,45 +4453,6 @@ void tst_QSortFilterProxyModel::emitLayoutChangedOnlyIfSortingChanged() QFETCH(QString, expectedProxyRowTexts); QFETCH(int, expectedLayoutChanged); - // Custom version of QStringListModel which supports emitting dataChanged for many rows at once - class CustomStringListModel : public QAbstractListModel - { - public: - bool setData(const QModelIndex &index, const QVariant &value, int role) override - { - if (index.row() >= 0 && index.row() < lst.size() - && (role == Qt::EditRole || role == Qt::DisplayRole)) { - lst.replace(index.row(), value.toString()); - emit dataChanged(index, index, {Qt::DisplayRole, Qt::EditRole}); - return true; - } - return false; - } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override - { - if (role == Qt::DisplayRole || role == Qt::EditRole) - return lst.at(index.row()); - return QVariant(); - } - int rowCount(const QModelIndex & = QModelIndex()) const override - { - return lst.count(); - } - - void replaceData(const QStringList &newData) - { - lst = newData; - emit dataChanged(index(0, 0), index(rowCount()-1, 0), {Qt::DisplayRole, Qt::EditRole}); - } - - void emitDecorationChangedSignal() - { - const QModelIndex idx = index(0, 0); - emit dataChanged(idx, idx, {Qt::DecorationRole}); - } - private: - QStringList lst; - }; CustomStringListModel model; QStringList strings; for (auto i = 8; i >= 1; --i) @@ -4487,6 +4490,137 @@ void tst_QSortFilterProxyModel::emitLayoutChangedOnlyIfSortingChanged() QCOMPARE(proxyLayoutChangedSpy.size(), expectedLayoutChanged); } +void tst_QSortFilterProxyModel::removeIntervals_data() +{ + QTest::addColumn<QStringList>("sourceItems"); + QTest::addColumn<int>("sortOrder"); + QTest::addColumn<QString>("filter"); + QTest::addColumn<QStringList>("replacementSourceItems"); + QTest::addColumn<IntPairList>("expectedRemovedProxyIntervals"); + QTest::addColumn<QStringList>("expectedProxyItems"); + + QTest::newRow("filter all, sort ascending") + << (QStringList() << "a" + << "b" + << "c") // sourceItems + << static_cast<int>(Qt::AscendingOrder) // sortOrder + << "[^x]" // filter + << (QStringList() << "x" + << "x" + << "x") // replacementSourceItems + << (IntPairList() << IntPair(0, 2)) // expectedRemovedIntervals + << QStringList() // expectedProxyItems + ; + + QTest::newRow("filter all, sort descending") + << (QStringList() << "a" + << "b" + << "c") // sourceItems + << static_cast<int>(Qt::DescendingOrder) // sortOrder + << "[^x]" // filter + << (QStringList() << "x" + << "x" + << "x") // replacementSourceItems + << (IntPairList() << IntPair(0, 2)) // expectedRemovedIntervals + << QStringList() // expectedProxyItems + ; + + QTest::newRow("filter first and last, sort ascending") + << (QStringList() << "a" + << "b" + << "c") // sourceItems + << static_cast<int>(Qt::AscendingOrder) // sortOrder + << "[^x]" // filter + << (QStringList() << "x" + << "b" + << "x") // replacementSourceItems + << (IntPairList() << IntPair(2, 2) << IntPair(0, 0)) // expectedRemovedIntervals + << (QStringList() << "b") // expectedProxyItems + ; + + QTest::newRow("filter first and last, sort descending") + << (QStringList() << "a" + << "b" + << "c") // sourceItems + << static_cast<int>(Qt::DescendingOrder) // sortOrder + << "[^x]" // filter + << (QStringList() << "x" + << "b" + << "x") // replacementSourceItems + << (IntPairList() << IntPair(2, 2) << IntPair(0, 0)) // expectedRemovedIntervals + << (QStringList() << "b") // expectedProxyItems + ; +} + +void tst_QSortFilterProxyModel::removeIntervals() +{ + QFETCH(QStringList, sourceItems); + QFETCH(int, sortOrder); + QFETCH(QString, filter); + QFETCH(QStringList, replacementSourceItems); + QFETCH(IntPairList, expectedRemovedProxyIntervals); + QFETCH(QStringList, expectedProxyItems); + + CustomStringListModel model; + QSortFilterProxyModel proxy; + + model.replaceData(sourceItems); + proxy.setSourceModel(&model); + + for (int i = 0; i < sourceItems.count(); ++i) { + QModelIndex sindex = model.index(i, 0, QModelIndex()); + QModelIndex pindex = proxy.index(i, 0, QModelIndex()); + QCOMPARE(proxy.data(pindex, Qt::DisplayRole), model.data(sindex, Qt::DisplayRole)); + } + + proxy.setDynamicSortFilter(true); + + if (sortOrder != -1) + proxy.sort(0, static_cast<Qt::SortOrder>(sortOrder)); + if (!filter.isEmpty()) + proxy.setFilterRegExp(QRegExp(filter)); + + (void)proxy.rowCount(QModelIndex()); // force mapping + + QSignalSpy removeSpy(&proxy, &QSortFilterProxyModel::rowsRemoved); + QSignalSpy insertSpy(&proxy, &QSortFilterProxyModel::rowsInserted); + QSignalSpy aboutToRemoveSpy(&proxy, &QSortFilterProxyModel::rowsAboutToBeRemoved); + QSignalSpy aboutToInsertSpy(&proxy, &QSortFilterProxyModel::rowsAboutToBeInserted); + + QVERIFY(removeSpy.isValid()); + QVERIFY(insertSpy.isValid()); + QVERIFY(aboutToRemoveSpy.isValid()); + QVERIFY(aboutToInsertSpy.isValid()); + + model.replaceData(replacementSourceItems); + + QCOMPARE(aboutToRemoveSpy.count(), expectedRemovedProxyIntervals.count()); + for (int i = 0; i < aboutToRemoveSpy.count(); ++i) { + QList<QVariant> args = aboutToRemoveSpy.at(i); + QCOMPARE(args.at(1).type(), QVariant::Int); + QCOMPARE(args.at(2).type(), QVariant::Int); + QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first); + QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second); + } + QCOMPARE(removeSpy.count(), expectedRemovedProxyIntervals.count()); + for (int i = 0; i < removeSpy.count(); ++i) { + QList<QVariant> args = removeSpy.at(i); + QCOMPARE(args.at(1).type(), QVariant::Int); + QCOMPARE(args.at(2).type(), QVariant::Int); + QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first); + QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second); + } + + QCOMPARE(insertSpy.count(), 0); + QCOMPARE(aboutToInsertSpy.count(), 0); + + QCOMPARE(proxy.rowCount(QModelIndex()), expectedProxyItems.count()); + for (int i = 0; i < expectedProxyItems.count(); ++i) { + QModelIndex pindex = proxy.index(i, 0, QModelIndex()); + QCOMPARE(proxy.data(pindex, Qt::DisplayRole).toString(), expectedProxyItems.at(i)); + } +} + void tst_QSortFilterProxyModel::dynamicFilterWithoutSort() { QStringListModel model; diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index c734cfe4dd..43dcb241e4 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -145,6 +145,7 @@ private slots: void disconnectDoesNotLeakFunctor(); void contextDoesNotLeakFunctor(); void connectBase(); + void connectWarnings(); void qmlConnect(); void exceptions(); void noDeclarativeParentChangedOnDestruction(); @@ -6685,6 +6686,26 @@ void tst_QObject::connectBase() QCOMPARE( r1.count_slot3, 1 ); } +void tst_QObject::connectWarnings() +{ + SubSender sub; + SenderObject obj; + ReceiverObject r1; + r1.reset(); + + QTest::ignoreMessage(QtWarningMsg, "QObject::connect(SenderObject, ReceiverObject): invalid null parameter"); + connect(nullptr, &SubSender::signal1, &r1, &ReceiverObject::slot1); + + QTest::ignoreMessage(QtWarningMsg, "QObject::connect(SubSender, Unknown): invalid null parameter"); + connect(&sub, &SubSender::signal1, nullptr, &ReceiverObject::slot1); + + QTest::ignoreMessage(QtWarningMsg, "QObject::connect(SenderObject, ReceiverObject): invalid null parameter"); + connect(nullptr, &SenderObject::signal1, &r1, &ReceiverObject::slot1); + + QTest::ignoreMessage(QtWarningMsg, "QObject::connect(SenderObject, Unknown): invalid null parameter"); + connect(&obj, &SenderObject::signal1, nullptr, &ReceiverObject::slot1); +} + struct QmlReceiver : public QtPrivate::QSlotObjectBase { int callCount; diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index 2c6d9ea7c0..2d34aceab8 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -75,6 +75,7 @@ private slots: void dontBlockEvents(); void postedEventsShouldNotStarveTimers(); + void connectTo(); }; class TimerHelper : public QObject @@ -1020,5 +1021,31 @@ void tst_QTimer::crossThreadSingleShotToFunctor() delete o; } +void tst_QTimer::connectTo() +{ + QTimer timer; + TimerHelper timerHelper; + timer.setInterval(0); + timer.start(); + + auto context = new QObject(); + + int count = 0; + timer.connectTo([&count] { count++; }); + QMetaObject::Connection connection = timer.connectTo(context, [&count] { count++; }); + timer.connectTo(&timerHelper, &TimerHelper::timeout); + timer.connectTo(&timer, &QTimer::stop); + + + QTest::qWait(100); + QCOMPARE(count, 2); + QCOMPARE(timerHelper.count, 1); + + // Test that connection is bound to context lifetime + QVERIFY(connection); + delete context; + QVERIFY(!connection); +} + QTEST_MAIN(tst_QTimer) #include "tst_qtimer.moc" diff --git a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp index e2a0c2dad3..ac8aaa1327 100644 --- a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp +++ b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp @@ -46,6 +46,7 @@ protected slots: private slots: void simple_data(); void simple(); + void blockedWaiting(); void manyNotifiers(); void disableNotifiersInActivatedSlot_data(); void disableNotifiersInActivatedSlot(); @@ -104,6 +105,26 @@ void tst_QWinEventNotifier::simple() QVERIFY(simpleActivated); } +void tst_QWinEventNotifier::blockedWaiting() +{ + simpleHEvent = CreateEvent(0, true, false, 0); + QWinEventNotifier n(simpleHEvent); + QObject::connect(&n, &QWinEventNotifier::activated, + this, &tst_QWinEventNotifier::simple_activated); + simpleActivated = false; + + SetEvent(simpleHEvent); + QCOMPARE(WaitForSingleObject(simpleHEvent, 1000), WAIT_OBJECT_0); + + n.setEnabled(false); + ResetEvent(simpleHEvent); + n.setEnabled(true); + + QTestEventLoop::instance().enterLoop(1); + QVERIFY(QTestEventLoop::instance().timeout()); + QVERIFY(!simpleActivated); +} + class EventWithNotifier : public QObject { Q_OBJECT diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp index 14a2528cc6..c6faf8c7d5 100644 --- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp @@ -260,16 +260,16 @@ static int NColorRoles[] = { QPalette::HighlightedText + 1, // Qt_4_0, Qt_4_1 QPalette::HighlightedText + 1, // Qt_4_2 QPalette::AlternateBase + 1, // Qt_4_3 - QPalette::ToolTipText + 1, // Qt_4_4 - QPalette::ToolTipText + 1, // Qt_4_5 - QPalette::ToolTipText + 1, // Qt_4_6 - QPalette::ToolTipText + 1, // Qt_5_0 - QPalette::ToolTipText + 1, // Qt_5_1 - QPalette::ToolTipText + 1, // Qt_5_2 - QPalette::ToolTipText + 1, // Qt_5_3 - QPalette::ToolTipText + 1, // Qt_5_4 - QPalette::ToolTipText + 1, // Qt_5_5 - QPalette::ToolTipText + 1, // Qt_5_6 + QPalette::PlaceholderText + 1, // Qt_4_4 + QPalette::PlaceholderText + 1, // Qt_4_5 + QPalette::PlaceholderText + 1, // Qt_4_6 + QPalette::PlaceholderText + 1, // Qt_5_0 + QPalette::PlaceholderText + 1, // Qt_5_1 + QPalette::PlaceholderText + 1, // Qt_5_2 + QPalette::PlaceholderText + 1, // Qt_5_3 + QPalette::PlaceholderText + 1, // Qt_5_4 + QPalette::PlaceholderText + 1, // Qt_5_5 + QPalette::PlaceholderText + 1, // Qt_5_6 0 // add the correct value for Qt_5_7 here later }; @@ -2139,7 +2139,7 @@ void tst_QDataStream::setVersion() */ // revise the test if new color roles or color groups are added - QVERIFY(QPalette::NColorRoles == QPalette::ToolTipText + 1); + QVERIFY(QPalette::NColorRoles == QPalette::PlaceholderText + 1); QCOMPARE(int(QPalette::NColorGroups), 3); QByteArray ba2; diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index d4a3ee6054..b8c82c2ea0 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -1021,6 +1021,8 @@ void tst_QFuture::iterators() QCOMPARE(i2, c2); QCOMPARE(c2, i2); QCOMPARE(c2, c2); + QCOMPARE(1 + i1, i1 + 1); + QCOMPARE(1 + c1, c1 + 1); QVERIFY(i1 != i2); QVERIFY(i1 != c2); @@ -1070,6 +1072,8 @@ void tst_QFuture::iterators() QCOMPARE(i2, c2); QCOMPARE(c2, i2); QCOMPARE(c2, c2); + QCOMPARE(1 + i1, i1 + 1); + QCOMPARE(1 + c1, c1 + 1); QVERIFY(i1 != i2); QVERIFY(i1 != c2); diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp index 38366e86ff..b40b1f0624 100644 --- a/tests/auto/corelib/tools/collections/tst_collections.cpp +++ b/tests/auto/corelib/tools/collections/tst_collections.cpp @@ -2620,6 +2620,8 @@ void testLinkedListLikeStlIterators() QVERIFY(i2 == c2); QVERIFY(c2 == i2); QVERIFY(c2 == c2); + QVERIFY(1 + i1 == i1 + 1); + QVERIFY(1 + c1 == c1 + 1); QVERIFY(i1 != i2); QVERIFY(i1 != c2); @@ -2731,6 +2733,8 @@ void testMapLikeStlIterators() QVERIFY(i2 == c2); QVERIFY(c2 == i2); QVERIFY(c2 == c2); + QVERIFY(1 + i1 == i1 + 1); + QVERIFY(1 + c1 == c1 + 1); QVERIFY(i1 != i2); QVERIFY(i1 != c2); diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index 338adaabf7..ee01a632d0 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -141,6 +141,8 @@ private slots: #endif void toUpperLower_data(); void toUpperLower(); + void isUpper(); + void isLower(); void macTypes(); @@ -2188,6 +2190,51 @@ void tst_QByteArray::toUpperLower() QCOMPARE(qMove(copy).toUpper(), upper); } +void tst_QByteArray::isUpper() +{ + QVERIFY(!QByteArray().isUpper()); + QVERIFY(!QByteArray("").isUpper()); + QVERIFY(QByteArray("TEXT").isUpper()); + QVERIFY(QByteArray("\xD0\xDE").isUpper()); + QVERIFY(!QByteArray("\xD7").isUpper()); // multiplication sign is not upper + QVERIFY(!QByteArray("\xDF").isUpper()); // sz ligature is not upper + QVERIFY(!QByteArray("text").isUpper()); + QVERIFY(!QByteArray("Text").isUpper()); + QVERIFY(!QByteArray("tExt").isUpper()); + QVERIFY(!QByteArray("teXt").isUpper()); + QVERIFY(!QByteArray("texT").isUpper()); + QVERIFY(!QByteArray("TExt").isUpper()); + QVERIFY(!QByteArray("teXT").isUpper()); + QVERIFY(!QByteArray("tEXt").isUpper()); + QVERIFY(!QByteArray("tExT").isUpper()); + QVERIFY(!QByteArray("@ABYZ[").isUpper()); + QVERIFY(!QByteArray("@abyz[").isUpper()); + QVERIFY(!QByteArray("`ABYZ{").isUpper()); + QVERIFY(!QByteArray("`abyz{").isUpper()); +} + +void tst_QByteArray::isLower() +{ + QVERIFY(!QByteArray().isLower()); + QVERIFY(!QByteArray("").isLower()); + QVERIFY(QByteArray("text").isLower()); + QVERIFY(QByteArray("\xE0\xFF").isLower()); + QVERIFY(!QByteArray("\xF7").isLower()); // division sign is not lower + QVERIFY(!QByteArray("Text").isLower()); + QVERIFY(!QByteArray("tExt").isLower()); + QVERIFY(!QByteArray("teXt").isLower()); + QVERIFY(!QByteArray("texT").isLower()); + QVERIFY(!QByteArray("TExt").isLower()); + QVERIFY(!QByteArray("teXT").isLower()); + QVERIFY(!QByteArray("tEXt").isLower()); + QVERIFY(!QByteArray("tExT").isLower()); + QVERIFY(!QByteArray("TEXT").isLower()); + QVERIFY(!QByteArray("@ABYZ[").isLower()); + QVERIFY(!QByteArray("@abyz[").isLower()); + QVERIFY(!QByteArray("`ABYZ{").isLower()); + QVERIFY(!QByteArray("`abyz{").isLower()); +} + void tst_QByteArray::macTypes() { #ifndef Q_OS_MAC diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp index 17a0f3edd9..3eef7631c8 100644 --- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp +++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp @@ -29,6 +29,7 @@ #include <QtCore/QCoreApplication> #include <QtTest/QtTest> +#include <QtCore/QMetaEnum> Q_DECLARE_METATYPE(QCryptographicHash::Algorithm) @@ -45,6 +46,7 @@ private slots: void sha3(); void files_data(); void files(); + void hashLength(); }; void tst_QCryptographicHash::repeated_result_data() @@ -291,6 +293,15 @@ void tst_QCryptographicHash::files() } } +void tst_QCryptographicHash::hashLength() +{ + auto metaEnum = QMetaEnum::fromType<QCryptographicHash::Algorithm>(); + for (int i = 0, value = metaEnum.value(i); value != -1; value = metaEnum.value(++i)) { + auto algorithm = QCryptographicHash::Algorithm(value); + QByteArray output = QCryptographicHash::hash(QByteArrayLiteral("test"), algorithm); + QCOMPARE(QCryptographicHash::hashLength(algorithm), output.length()); + } +} QTEST_MAIN(tst_QCryptographicHash) #include "tst_qcryptographichash.moc" diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp index f545ead1f1..e89e634841 100644 --- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp +++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp @@ -159,6 +159,8 @@ void tst_QExplicitlySharedDataPointer::data() const { QExplicitlySharedDataPointer<const MyClass> pointer; QCOMPARE(pointer.data(), static_cast<const MyClass *>(0)); + QVERIFY(pointer == nullptr); + QVERIFY(nullptr == pointer); } /* On const pointer. Must not mutate the pointer. */ @@ -168,6 +170,9 @@ void tst_QExplicitlySharedDataPointer::data() const /* Check that this cast is possible. */ static_cast<const MyClass *>(pointer.data()); + + QVERIFY(! (pointer == nullptr)); + QVERIFY(! (nullptr == pointer)); } /* On mutatable pointer. Must not mutate the pointer. */ diff --git a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp index c828551e44..ec495fd272 100644 --- a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp +++ b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp @@ -2066,3 +2066,80 @@ void tst_QRegularExpression::QStringAndQStringRefEquivalence() } } } + +void tst_QRegularExpression::wildcard_data() +{ + QTest::addColumn<QString>("pattern"); + QTest::addColumn<QString>("string"); + QTest::addColumn<int>("foundIndex"); + + auto addRow = [](const char *pattern, const char *string, int foundIndex) { + QTest::addRow(pattern) << pattern << string << foundIndex; + }; + + addRow("*.html", "test.html", 0); + addRow("*.html", "test.htm", -1); + addRow("bar*", "foobarbaz", 3); + addRow("*", "Qt Rocks!", 0); + addRow(".html", "test.html", 4); + addRow(".h", "test.cpp", -1); + addRow(".???l", "test.html", 4); + addRow("?", "test.html", 0); + addRow("?m", "test.html", 6); + addRow(".h[a-z]ml", "test.html", 4); + addRow(".h[A-Z]ml", "test.html", -1); + addRow(".h[A-Z]ml", "test.hTml", 4); + addRow(".h[!A-Z]ml", "test.hTml", -1); + addRow(".h[!A-Z]ml", "test.html", 4); + addRow(".h[!T]ml", "test.hTml", -1); + addRow(".h[!T]ml", "test.html", 4); + addRow(".h[!T]m[!L]", "test.htmL", -1); + addRow(".h[!T]m[!L]", "test.html", 4); + addRow(".h[][!]", "test.h]ml", 4); + addRow(".h[][!]", "test.h[ml", 4); + addRow(".h[][!]", "test.h!ml", 4); +} + +void tst_QRegularExpression::wildcard() +{ + QFETCH(QString, pattern); + QFETCH(QString, string); + QFETCH(int, foundIndex); + + QRegularExpression re; + re.setWildcardPattern(pattern); + if (forceOptimize) + re.optimize(); + + QRegularExpressionMatch match = re.match(string); + + QCOMPARE(match.capturedStart(), foundIndex); +} + +void tst_QRegularExpression::testInvalidWildcard_data() +{ + QTest::addColumn<QString>("pattern"); + QTest::addColumn<bool>("isValid"); + + QTest::newRow("valid []") << "[abc]" << true; + QTest::newRow("valid ending ]") << "abc]" << true; + QTest::newRow("invalid [") << "[abc" << false; + QTest::newRow("ending [") << "abc[" << false; + QTest::newRow("ending [^") << "abc[^" << false; + QTest::newRow("ending [\\") << "abc[\\" << false; + QTest::newRow("ending []") << "abc[]" << false; + QTest::newRow("ending [[") << "abc[[" << false; +} + +void tst_QRegularExpression::testInvalidWildcard() +{ + QFETCH(QString, pattern); + + QRegularExpression re; + re.setWildcardPattern(pattern); + if (forceOptimize) + re.optimize(); + + QFETCH(bool, isValid); + QCOMPARE(re.isValid(), isValid); +} diff --git a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.h b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.h index 8bb4aa0cce..db5b15be66 100644 --- a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.h +++ b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.h @@ -69,6 +69,11 @@ private slots: void JOptionUsage(); void QStringAndQStringRefEquivalence(); + void wildcard_data(); + void wildcard(); + void testInvalidWildcard_data(); + void testInvalidWildcard(); + private: void provideRegularExpressions(); }; diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp index 28014840a3..fefb533616 100644 --- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp @@ -450,6 +450,8 @@ private slots: void trimmed(); void toUpper(); void toLower(); + void isUpper(); + void isLower(); void toCaseFolded(); void rightJustified(); void leftJustified(); @@ -2314,6 +2316,46 @@ void tst_QString::toLower() #endif } +void tst_QString::isUpper() +{ + QVERIFY(!QString().isUpper()); + QVERIFY(!QString("").isUpper()); + QVERIFY(QString("TEXT").isUpper()); + QVERIFY(!QString("text").isUpper()); + QVERIFY(!QString("Text").isUpper()); + QVERIFY(!QString("tExt").isUpper()); + QVERIFY(!QString("teXt").isUpper()); + QVERIFY(!QString("texT").isUpper()); + QVERIFY(!QString("TExt").isUpper()); + QVERIFY(!QString("teXT").isUpper()); + QVERIFY(!QString("tEXt").isUpper()); + QVERIFY(!QString("tExT").isUpper()); + QVERIFY(!QString("@ABYZ[").isUpper()); + QVERIFY(!QString("@abyz[").isUpper()); + QVERIFY(!QString("`ABYZ{").isUpper()); + QVERIFY(!QString("`abyz{").isUpper()); +} + +void tst_QString::isLower() +{ + QVERIFY(!QString().isLower()); + QVERIFY(!QString("").isLower()); + QVERIFY(QString("text").isLower()); + QVERIFY(!QString("Text").isLower()); + QVERIFY(!QString("tExt").isLower()); + QVERIFY(!QString("teXt").isLower()); + QVERIFY(!QString("texT").isLower()); + QVERIFY(!QString("TExt").isLower()); + QVERIFY(!QString("teXT").isLower()); + QVERIFY(!QString("tEXt").isLower()); + QVERIFY(!QString("tExT").isLower()); + QVERIFY(!QString("TEXT").isLower()); + QVERIFY(!QString("@ABYZ[").isLower()); + QVERIFY(!QString("@abyz[").isLower()); + QVERIFY(!QString("`ABYZ{").isLower()); + QVERIFY(!QString("`abyz{").isLower()); +} + void tst_QString::toCaseFolded() { QCOMPARE( QString().toCaseFolded(), QString() ); diff --git a/tests/auto/corelib/tools/qtimezone/qtimezone.pro b/tests/auto/corelib/tools/qtimezone/qtimezone.pro index 19ebc13306..5ec8d008e7 100644 --- a/tests/auto/corelib/tools/qtimezone/qtimezone.pro +++ b/tests/auto/corelib/tools/qtimezone/qtimezone.pro @@ -3,7 +3,7 @@ TARGET = tst_qtimezone QT = core-private testlib SOURCES = tst_qtimezone.cpp qtConfig(icu) { - DEFINES += QT_USE_ICU + QMAKE_USE_PRIVATE += icu } darwin { diff --git a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp index cb963ceeb6..d040f3bafd 100644 --- a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp @@ -31,6 +31,10 @@ #include <private/qtimezoneprivate_p.h> #include <qlocale.h> +#if defined(Q_OS_WIN) && !QT_CONFIG(icu) +# define USING_WIN_TZ +#endif + class tst_QTimeZone : public QObject { Q_OBJECT @@ -413,7 +417,7 @@ void tst_QTimeZone::specificTransition_data() QTest::addColumn<int>("dstoff"); // Moscow ditched DST on 2010-10-31 but has since changed standard offset twice. -#ifdef Q_OS_WIN +#ifdef USING_WIN_TZ // Win7 is too old to know about this transition: if (QOperatingSystemVersion::current() > QOperatingSystemVersion::Windows7) #endif @@ -477,8 +481,9 @@ void tst_QTimeZone::transitionEachZone_data() }; QString name; + const auto zones = QTimeZone::availableTimeZoneIds(); for (int k = sizeof(table) / sizeof(table[0]); k-- > 0; ) { - foreach (QByteArray zone, QTimeZone::availableTimeZoneIds()) { + for (const QByteArray &zone : zones) { name.sprintf("%s@%d", zone.constData(), table[k].year); QTest::newRow(name.toUtf8().constData()) << zone @@ -500,7 +505,7 @@ void tst_QTimeZone::transitionEachZone() QTimeZone named(zone); for (int i = start; i < stop; i++) { -#ifdef Q_OS_WIN +#ifdef USING_WIN_TZ // See QTBUG-64985: MS's TZ APIs' misdescription of Europe/Samara leads // to mis-disambiguation of its fall-back here. if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7 @@ -829,7 +834,7 @@ void tst_QTimeZone::utcTest() void tst_QTimeZone::icuTest() { -#if defined(QT_BUILD_INTERNAL) && defined(QT_USE_ICU) +#if defined(QT_BUILD_INTERNAL) && QT_CONFIG(icu) // Known datetimes qint64 std = QDateTime(QDate(2012, 1, 1), QTime(0, 0, 0), Qt::UTC).toMSecsSinceEpoch(); qint64 dst = QDateTime(QDate(2012, 6, 1), QTime(0, 0, 0), Qt::UTC).toMSecsSinceEpoch(); @@ -877,7 +882,7 @@ void tst_QTimeZone::icuTest() testCetPrivate(tzp); testEpochTranPrivate(QIcuTimeZonePrivate("America/Toronto")); -#endif // QT_USE_ICU +#endif // icu } void tst_QTimeZone::tzTest() @@ -903,7 +908,7 @@ void tst_QTimeZone::tzTest() QLocale enUS("en_US"); // Only test names in debug mode, names used can vary by ICU version installed if (debug) { -#ifdef QT_USE_ICU +#if QT_CONFIG(icu) QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, enUS), QString("Central European Standard Time")); QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::ShortName, enUS), @@ -942,7 +947,7 @@ void tst_QTimeZone::tzTest() QString("CET")); QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::OffsetName, enUS), QString("CET")); -#endif // QT_USE_ICU +#endif // icu // Test Abbreviations QCOMPARE(tzp.abbreviation(std), QString("CET")); @@ -1119,7 +1124,7 @@ void tst_QTimeZone::darwinTypes() void tst_QTimeZone::winTest() { -#if defined(QT_BUILD_INTERNAL) && defined(Q_OS_WIN) +#if defined(QT_BUILD_INTERNAL) && defined(USING_WIN_TZ) // Known datetimes qint64 std = QDateTime(QDate(2012, 1, 1), QTime(0, 0, 0), Qt::UTC).toMSecsSinceEpoch(); qint64 dst = QDateTime(QDate(2012, 6, 1), QTime(0, 0, 0), Qt::UTC).toMSecsSinceEpoch(); @@ -1170,7 +1175,7 @@ void tst_QTimeZone::winTest() testCetPrivate(tzp); testEpochTranPrivate(QWinTimeZonePrivate("America/Toronto")); -#endif // Q_OS_WIN +#endif // QT_BUILD_INTERNAL && USING_WIN_TZ } #ifdef QT_BUILD_INTERNAL @@ -1282,7 +1287,7 @@ void tst_QTimeZone::testEpochTranPrivate(const QTimeZonePrivate &tzp) // 1970-04-26 02:00 EST, -5 -> -4 const QDateTime after = QDateTime(QDate(1970, 4, 26), QTime(2, 0), Qt::OffsetFromUTC, -5 * 3600); const QDateTime found = QDateTime::fromMSecsSinceEpoch(tran.atMSecsSinceEpoch, Qt::UTC); -#ifdef Q_OS_WIN // MS gets the date wrong: 5th April instead of 26th. +#ifdef USING_WIN_TZ // MS gets the date wrong: 5th April instead of 26th. QCOMPARE(found.toOffsetFromUtc(-5 * 3600).time(), after.time()); #else QCOMPARE(found, after); diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_utf8_comment.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_utf8_comment.jpg Binary files differnew file mode 100644 index 0000000000..42b305f5b8 --- /dev/null +++ b/tests/auto/gui/image/qimage/images/jpeg_exif_utf8_comment.jpg diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro index 56618e0bfa..39fb4d0cc3 100644 --- a/tests/auto/gui/image/qimage/qimage.pro +++ b/tests/auto/gui/image/qimage/qimage.pro @@ -7,4 +7,6 @@ qtConfig(c++11): CONFIG += c++11 android:!android-embedded: RESOURCES += qimage.qrc +win32:!winrt: LIBS += -lgdi32 -luser32 + TESTDATA += images/* diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 7ad4a9e9bb..1f52018d7f 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -44,6 +44,10 @@ #include <CoreGraphics/CoreGraphics.h> #endif +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +# include <qt_windows.h> +#endif + Q_DECLARE_METATYPE(QImage::Format) Q_DECLARE_METATYPE(Qt::GlobalColor) @@ -192,6 +196,7 @@ private slots: void exif_QTBUG45865(); void exifInvalidData_data(); void exifInvalidData(); + void exifReadComments(); void cleanupFunctions(); @@ -222,6 +227,11 @@ private slots: void hugeQImage(); +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) + void toWinHBITMAP_data(); + void toWinHBITMAP(); +#endif // Q_OS_WIN && !Q_OS_WINRT + private: const QString m_prefix; }; @@ -3066,6 +3076,34 @@ void tst_QImage::exifInvalidData() QVERIFY(!image.isNull()); } +void tst_QImage::exifReadComments() +{ + QImage image; + QVERIFY(image.load(m_prefix + "jpeg_exif_utf8_comment.jpg")); + QVERIFY(!image.isNull()); + QCOMPARE(image.textKeys().size(), 1); + QCOMPARE(image.textKeys().first(), "Description"); + // check if exif comment is read as utf-8 + QCOMPARE(image.text("Description"), QString::fromUtf8("some unicode chars: ÖÄÜ€@")); + + QByteArray ba; + { + QBuffer buf(&ba); + QVERIFY(buf.open(QIODevice::WriteOnly)); + QVERIFY(image.save(&buf, "JPG")); + } + QVERIFY(!ba.isEmpty()); + image = QImage(); + QCOMPARE(image.textKeys().size(), 0); + { + QBuffer buf(&ba); + QVERIFY(buf.open(QIODevice::ReadOnly)); + QVERIFY(image.load(&buf, "JPG")); + } + // compare written (and reread) description text + QCOMPARE(image.text("Description"), QString::fromUtf8("some unicode chars: ÖÄÜ€@")); +} + static void cleanupFunction(void* info) { bool *called = static_cast<bool*>(info); @@ -3458,5 +3496,108 @@ void tst_QImage::hugeQImage() #endif } +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +QT_BEGIN_NAMESPACE +Q_GUI_EXPORT HBITMAP qt_imageToWinHBITMAP(const QImage &p, int hbitmapFormat = 0); +Q_GUI_EXPORT QImage qt_imageFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); +QT_END_NAMESPACE + +static inline QColor COLORREFToQColor(COLORREF cr) +{ + return QColor(GetRValue(cr), GetGValue(cr), GetBValue(cr)); +} + +void tst_QImage::toWinHBITMAP_data() +{ + QTest::addColumn<QImage::Format>("format"); + QTest::addColumn<QColor>("color"); + QTest::addColumn<QColor>("bottomRightColor"); + + const QColor red(Qt::red); + const QColor green(Qt::green); + const QColor blue(Qt::blue); + const QColor gray(Qt::gray); + const QColor gray555(0x5a, 0x5a, 0x5a); // Note: Interpolation 8<->5 bit occurs. + const QColor white(Qt::white); + const QColor black(Qt::black); + + QTest::newRow("argb32p-red") << QImage::Format_ARGB32_Premultiplied << red << gray; + QTest::newRow("argb32p-green") << QImage::Format_ARGB32_Premultiplied << green << gray; + QTest::newRow("argb32p-blue") << QImage::Format_ARGB32_Premultiplied << blue << gray; + QTest::newRow("rgb888-red") << QImage::Format_RGB888 << red << gray; + QTest::newRow("rgb888-green") << QImage::Format_RGB888 << green << gray; + QTest::newRow("rgb888-blue") << QImage::Format_RGB888 << blue << gray; + QTest::newRow("indexed8-red") << QImage::Format_Indexed8 << red << gray; + QTest::newRow("indexed8-green") << QImage::Format_Indexed8 << green << gray; + QTest::newRow("indexed8-blue") << QImage::Format_Indexed8 << blue << gray; + QTest::newRow("rgb555-red") << QImage::Format_RGB555 << red << gray555; + QTest::newRow("rgb555-green") << QImage::Format_RGB555 << green << gray555; + QTest::newRow("rgb555-blue") << QImage::Format_RGB555 << blue << gray555; + QTest::newRow("mono") << QImage::Format_Mono << white << black; +} + +// Test image filled with color, black pixel at botttom right corner. +static inline QImage createTestImage(QImage::Format format, int width, int height, + const QColor &fillColor, const QColor &bottomRightColor) +{ + QImage image(QSize(width, height), format); + image.fill(fillColor); + QPainter painter(&image); + QPen pen = painter.pen(); + pen.setColor(bottomRightColor); + painter.setPen(pen); + painter.drawPoint(width -1, height - 1); + return image; +} + +void tst_QImage::toWinHBITMAP() +{ + static const int width = 73; + static const int height = 57; + + QFETCH(QImage::Format, format); + QFETCH(QColor, color); + QFETCH(QColor, bottomRightColor); + + // Cannot paint on indexed/mono images. + const QImage image = format == QImage::Format_Indexed8 || format == QImage::Format_Mono + ? createTestImage(QImage::Format_RGB32, width, height, color, bottomRightColor).convertToFormat(format) + : createTestImage(format, width, height, color, bottomRightColor); + + const HBITMAP bitmap = qt_imageToWinHBITMAP(image); + + QVERIFY(bitmap != 0); + + // Verify size + BITMAP bitmapInfo; + memset(&bitmapInfo, 0, sizeof(BITMAP)); + + const int res = GetObject(bitmap, sizeof(BITMAP), &bitmapInfo); + QVERIFY(res); + QCOMPARE(width, int(bitmapInfo.bmWidth)); + QCOMPARE(height, int(bitmapInfo.bmHeight)); + + const HDC displayDc = GetDC(0); + const HDC bitmapDc = CreateCompatibleDC(displayDc); + + const HBITMAP nullBitmap = static_cast<HBITMAP>(SelectObject(bitmapDc, bitmap)); + + QCOMPARE(COLORREFToQColor(GetPixel(bitmapDc, 0, 0)), color); + QCOMPARE(COLORREFToQColor(GetPixel(bitmapDc, width - 1, 3)), color); + QCOMPARE(COLORREFToQColor(GetPixel(bitmapDc, 3, height - 1)), color); + QCOMPARE(COLORREFToQColor(GetPixel(bitmapDc, width - 1, height - 1)), bottomRightColor); + + const QImage convertedBack = qt_imageFromWinHBITMAP(bitmap); + QCOMPARE(convertedBack.convertToFormat(QImage::Format_ARGB32_Premultiplied), + image.convertToFormat(QImage::Format_ARGB32_Premultiplied)); + + // Clean up + SelectObject(bitmapDc, nullBitmap); + DeleteObject(bitmap); + DeleteDC(bitmapDc); + ReleaseDC(0, displayDc); +} +#endif // Q_OS_WIN && !Q_OS_WINRT + QTEST_GUILESS_MAIN(tst_QImage) #include "tst_qimage.moc" diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro index b06f56dddf..623d45ffe2 100644 --- a/tests/auto/gui/image/qimagereader/qimagereader.pro +++ b/tests/auto/gui/image/qimagereader/qimagereader.pro @@ -3,7 +3,8 @@ TARGET = tst_qimagereader SOURCES += tst_qimagereader.cpp MOC_DIR=tmp QT += core-private gui-private network testlib -RESOURCES += qimagereader.qrc + +RESOURCES += $$files(images/*) android:!android-embedded { RESOURCES += android_testdata.qrc diff --git a/tests/auto/gui/image/qimagereader/qimagereader.qrc b/tests/auto/gui/image/qimagereader/qimagereader.qrc deleted file mode 100644 index 2522154b1f..0000000000 --- a/tests/auto/gui/image/qimagereader/qimagereader.qrc +++ /dev/null @@ -1,69 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>images/16bpp.bmp</file> - <file>images/4bpp-rle.bmp</file> - <file>images/YCbCr_cmyk.jpg</file> - <file>images/YCbCr_cmyk.png</file> - <file>images/YCbCr_rgb.jpg</file> - <file>images/away.png</file> - <file>images/bat1.gif</file> - <file>images/bat2.gif</file> - <file>images/beavis.jpg</file> - <file>images/black.png</file> - <file>images/black.xpm</file> - <file>images/colorful.bmp</file> - <file>images/corrupt-colors.xpm</file> - <file>images/corrupt-pixels.xpm</file> - <file>images/corrupt.bmp</file> - <file>images/corrupt.gif</file> - <file>images/corrupt.jpg</file> - <file>images/corrupt.png</file> - <file>images/corrupt.xbm</file> - <file>images/crash-signed-char.bmp</file> - <file>images/earth.gif</file> - <file>images/font.bmp</file> - <file>images/gnus.xbm</file> - <file>images/image.pbm</file> - <file>images/image.pgm</file> - <file>images/image.png</file> - <file>images/image.ppm</file> - <file>images/kollada.png</file> - <file>images/marble.xpm</file> - <file>images/namedcolors.xpm</file> - <file>images/negativeheight.bmp</file> - <file>images/noclearcode.bmp</file> - <file>images/noclearcode.gif</file> - <file>images/nontransparent.xpm</file> - <file>images/rgb32bf.bmp</file> - <file>images/runners.ppm</file> - <file>images/teapot.ppm</file> - <file>images/test.ppm</file> - <file>images/test.xpm</file> - <file>images/test32bfv4.bmp</file> - <file>images/test32v5.bmp</file> - <file>images/tst7.bmp</file> - <file>images/tst7.png</file> - <file>images/transparent.xpm</file> - <file>images/trolltech.gif</file> - <file>images/qt.gif</file> - <file>images/qt1.gif</file> - <file>images/qt2.gif</file> - <file>images/qt3.gif</file> - <file>images/qt4.gif</file> - <file>images/qt5.gif</file> - <file>images/qt6.gif</file> - <file>images/qt7.gif</file> - <file>images/qt8.gif</file> - <file>images/endless-anim.gif</file> - <file>images/four-frames.gif</file> - <file>images/qt-gif-anim.gif</file> - <file>images/qt-gif-noanim.gif</file> - <file>images/rect.svg</file> - <file>images/rect.svgz</file> - <file>images/corrupt.svg</file> - <file>images/corrupt.svgz</file> - <file>images/qtbug13653-no_eoi.jpg</file> - <file>images/txts.jpg</file> - <file>images/txts.png</file> - </qresource> -</RCC> diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index e3bda6c2df..9a338ad55a 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -90,6 +90,7 @@ private slots: void mask(); void bitmapMask(); + void bitmapFromImageRvalue(); void setGetMask_data(); void setGetMask(); void cacheKey(); @@ -596,6 +597,27 @@ void tst_QPixmap::bitmapMask() QVERIFY(image.pixel(1, 1)); } +void tst_QPixmap::bitmapFromImageRvalue() +{ + auto makeImage = [](){ + QImage image(3, 3, QImage::Format_MonoLSB); + image.setColor(0, Qt::color0); + image.setColor(1, Qt::color1); + image.fill(Qt::color0); + image.setPixel(1, 1, Qt::color1); + image.setPixel(0, 0, Qt::color1); + return image; + }; + + auto image1 = makeImage(); + auto image2 = makeImage(); + auto bitmap1 = QBitmap::fromImage(image1); + auto bitmap2 = QBitmap::fromImage(std::move(image2)); + QCOMPARE(bitmap1.toImage(), bitmap2.toImage()); + QVERIFY(!image1.isNull()); + QVERIFY(image2.isNull()); +} + void tst_QPixmap::setGetMask_data() { QTest::addColumn<QPixmap>("pixmap"); diff --git a/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp index 8a2a35f86c..158530428d 100644 --- a/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp +++ b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp @@ -92,6 +92,9 @@ void tst_QPixmapCache::cacheLimit() // it was between 2048 and 10240 last time I looked at it QVERIFY(originalCacheLimit >= 1024 && originalCacheLimit <= 20480); + QPixmapCache::setCacheLimit(std::numeric_limits<int>::max()); + QCOMPARE(QPixmapCache::cacheLimit(), std::numeric_limits<int>::max()); + QPixmapCache::setCacheLimit(100); QCOMPARE(QPixmapCache::cacheLimit(), 100); diff --git a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp index ca6f677ba6..a0ac1b3631 100644 --- a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp +++ b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp @@ -67,9 +67,10 @@ void tst_QPalette::roleValues_data() QTest::newRow("QPalette::NoRole") << int(QPalette::NoRole) << 17; QTest::newRow("QPalette::ToolTipBase") << int(QPalette::ToolTipBase) << 18; QTest::newRow("QPalette::ToolTipText") << int(QPalette::ToolTipText) << 19; + QTest::newRow("QPalette::PlaceholderText") << int(QPalette::PlaceholderText) << 20; // Change this value as you add more roles. - QTest::newRow("QPalette::NColorRoles") << int(QPalette::NColorRoles) << 20; + QTest::newRow("QPalette::NColorRoles") << int(QPalette::NColorRoles) << 21; } void tst_QPalette::roleValues() diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 722405377e..40d0f4f32a 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -97,6 +97,7 @@ private slots: void modalWindowPosition(); #ifndef QT_NO_CURSOR void modalWindowEnterEventOnHide_QTBUG35109(); + void spuriousMouseMove(); #endif void windowsTransientChildren(); void requestUpdate(); @@ -895,7 +896,7 @@ void tst_QWindow::isActive() QVERIFY(child.isActive()); } -class InputTestWindow : public QWindow +class InputTestWindow : public ColoredWindow { public: void keyPressEvent(QKeyEvent *event) { @@ -989,7 +990,9 @@ public: enterEventCount = leaveEventCount = 0; } - InputTestWindow() { + explicit InputTestWindow(const QColor &color = Qt::white, QWindow *parent = nullptr) + : ColoredWindow(color, parent) + { keyPressCode = keyReleaseCode = 0; mousePressButton = mouseReleaseButton = mouseMoveButton = 0; ignoreMouse = ignoreTouch = false; @@ -2213,7 +2216,53 @@ void tst_QWindow::modalWindowEnterEventOnHide_QTBUG35109() QTRY_COMPARE(root.enterEventCount, 1); } } -#endif + +// Verify that no spurious mouse move events are received. On Windows, there is +// no enter event, the OS sends mouse move events instead. Test that the QPA +// plugin properly suppresses those since they can interfere with tests. +// Simulate a main window setup with a modal dialog on top, keep the cursor +// in the center and check that no mouse events are recorded. +void tst_QWindow::spuriousMouseMove() +{ + const QString &platformName = QGuiApplication::platformName(); + if (platformName == QLatin1String("offscreen") || platformName == QLatin1String("cocoa")) + QSKIP("No enter events sent"); + if (isPlatformWayland()) + QSKIP("QCursor::setPos() is not supported on Wayland"); + const QRect screenGeometry = QGuiApplication::primaryScreen()->geometry(); + const QPoint center = screenGeometry.center(); + QCursor::setPos(center); + QRect windowGeometry(QPoint(), 2 * m_testWindowSize); + windowGeometry.moveCenter(center); + QTRY_COMPARE(QCursor::pos(), center); + InputTestWindow topLevel; + topLevel.setTitle(QTest::currentTestFunction()); + topLevel.setGeometry(windowGeometry); + topLevel.show(); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); + QTRY_VERIFY(topLevel.enterEventCount > 0); + InputTestWindow dialog(Qt::yellow); + dialog.setTransientParent(&topLevel); + dialog.setTitle("Dialog " + topLevel.title()); + dialog.setModality(Qt::ApplicationModal); + windowGeometry.setSize(m_testWindowSize); + windowGeometry.moveCenter(center); + dialog.setGeometry(windowGeometry); + dialog.show(); + QVERIFY(QTest::qWaitForWindowExposed(&dialog)); + QTRY_VERIFY(dialog.enterEventCount > 0); + dialog.setVisible(false); + QCOMPARE(dialog.mousePressedCount, 0); + QCOMPARE(dialog.mouseReleasedCount, 0); + QCOMPARE(dialog.mouseMovedCount, 0); + QCOMPARE(dialog.mouseDoubleClickedCount, 0); + topLevel.setVisible(false); + QCOMPARE(topLevel.mousePressedCount, 0); + QCOMPARE(topLevel.mouseReleasedCount, 0); + QCOMPARE(topLevel.mouseMovedCount, 0); + QCOMPARE(topLevel.mouseDoubleClickedCount, 0); +} +#endif // !QT_NO_CURSOR static bool isNativeWindowVisible(const QWindow *window) { diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index ebe9d3b992..9f247a90e2 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -65,6 +65,7 @@ private slots: void fallbackFonts(); void condensedFontWidth(); + void condensedFontWidthNoFontMerging(); void condensedFontMatching(); void rasterFonts(); @@ -297,6 +298,29 @@ static QString testString() return QStringLiteral("foo bar"); } +void tst_QFontDatabase::condensedFontWidthNoFontMerging() +{ + int regularFontId = QFontDatabase::addApplicationFont(m_testFont); + int condensedFontId = QFontDatabase::addApplicationFont(m_testFontCondensed); + + QVERIFY(!QFontDatabase::applicationFontFamilies(regularFontId).isEmpty()); + QVERIFY(!QFontDatabase::applicationFontFamilies(condensedFontId).isEmpty()); + + QString regularFontName = QFontDatabase::applicationFontFamilies(regularFontId).first(); + QString condensedFontName = QFontDatabase::applicationFontFamilies(condensedFontId).first(); + + QFont condensedFont1(condensedFontName); + if (regularFontName == condensedFontName) + condensedFont1.setStyleName(QStringLiteral("Condensed")); + condensedFont1.setStyleStrategy(QFont::PreferMatch); + + QFont condensedFont2 = condensedFont1; + condensedFont2.setStyleStrategy(QFont::StyleStrategy(QFont::NoFontMerging | QFont::PreferMatch)); + + QCOMPARE(QFontMetricsF(condensedFont2).horizontalAdvance(QStringLiteral("foobar")), + QFontMetricsF(condensedFont1).horizontalAdvance(QStringLiteral("foobar"))); + } + void tst_QFontDatabase::condensedFontWidth() { QFontDatabase db; diff --git a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp index fb92b5a20f..bbb90ec82a 100644 --- a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp +++ b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp @@ -131,7 +131,7 @@ void tst_QTextOdfWriter::testWriteParagraph_data() QTest::newRow("misc2") << "\t \tFoo" << "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\"><text:tab/> <text:s text:c=\"4\"/><text:tab/>Foo</text:span></text:p>"; QTest::newRow("linefeed") << (QStringLiteral("line1") + QChar(0x2028) + QStringLiteral("line2")) << - "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">line1<text:line-break/>line2</text:span></text:p>"; + "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">line1<text:tab/><text:line-break/>line2</text:span></text:p>"; QTest::newRow("spaces") << "The quick brown fox jumped over the lazy dog" << "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">The quick brown fox jumped over the lazy dog</text:span></text:p>"; } @@ -378,7 +378,7 @@ void tst_QTextOdfWriter::testWriteTable() odfWriter->writeFrame(*xmlWriter, document->rootFrame()); QString xml = QString::fromLatin1( "<text:p text:style-name=\"p1\"/>" - "<table:table>" + "<table:table table:style-name=\"Table2\">" "<table:table-column table:number-columns-repeated=\"3\"/>" "<table:table-row>" "<table:table-cell table:style-name=\"T3\">" diff --git a/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp index 4705fc3ed7..012a7e2ce3 100644 --- a/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp +++ b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp @@ -155,6 +155,10 @@ void tst_QDoubleValidator::validate_data() QTest::newRow("data48") << "C" << 0.0 << 100.0 << 1 << QString("0.0") << ACC << ACC; QTest::newRow("data49") << "C" << 0.0 << 100.0 << 0 << QString(".") << ITM << ITM; QTest::newRow("data50") << "C" << 0.0 << 100.0 << 1 << QString(".") << ITM << ITM; + QTest::newRow("data51") << "C" << 0.0 << 2.0 << 2 << QString("9.99") << ITM << ITM; + QTest::newRow("data52") << "C" << 100.0 << 200.0 << 4 << QString("999.9999") << ITM << ITM; + QTest::newRow("data53") << "C" << 0.0 << 2.0 << 2 << QString("9.9999") << INV << INV; + QTest::newRow("data54") << "C" << 100.0 << 200.0 << 4 << QString("9999.9999") << ITM << INV; QTest::newRow("data_de0") << "de" << 0.0 << 100.0 << 1 << QString("50,0") << ACC << ACC; QTest::newRow("data_de1") << "de" << 00.0 << 100.0 << 1 << QString("500,0") << ITM << ITM; @@ -206,6 +210,10 @@ void tst_QDoubleValidator::validate_data() QTest::newRow("data_de43") << "de" << 0.01 << 0.09 << 2 << QString("0") << ITM << ITM; QTest::newRow("data_de44") << "de" << 0.0 << 10.0 << 1 << QString("11") << ITM << ITM; QTest::newRow("data_de45") << "de" << 0.0 << 10.0 << 2 << QString("11") << ITM << ITM; + QTest::newRow("data_de46") << "de" << 0.0 << 2.0 << 2 << QString("9,99") << ITM << ITM; + QTest::newRow("data_de47") << "de" << 100.0 << 200.0 << 4 << QString("999,9999") << ITM << ITM; + QTest::newRow("data_de48") << "de" << 0.0 << 2.0 << 2 << QString("9,9999") << INV << INV; + QTest::newRow("data_de49") << "de" << 100.0 << 200.0 << 4 << QString("9999,9999") << ITM << INV; QString arabicNum; arabicNum += QChar(1633); // "18.4" in arabic diff --git a/tests/auto/network/access/hpack/hpack.pro b/tests/auto/network/access/hpack/hpack.pro index 3c8b8e7944..2823ae4d0c 100644 --- a/tests/auto/network/access/hpack/hpack.pro +++ b/tests/auto/network/access/hpack/hpack.pro @@ -1,5 +1,5 @@ -QT += core core-private network network-private testlib -CONFIG += testcase parallel_test c++14 +QT = core core-private network network-private testlib +CONFIG += testcase parallel_test c++11 TEMPLATE = app TARGET = tst_hpack diff --git a/tests/auto/network/access/hsts/hsts.pro b/tests/auto/network/access/hsts/hsts.pro index 07bdea5f62..dad6638364 100644 --- a/tests/auto/network/access/hsts/hsts.pro +++ b/tests/auto/network/access/hsts/hsts.pro @@ -1,4 +1,4 @@ -QT += core core-private network network-private testlib +QT = core core-private network network-private testlib CONFIG += testcase parallel_test c++11 TEMPLATE = app TARGET = tst_qhsts diff --git a/tests/auto/network/access/http2/http2.pro b/tests/auto/network/access/http2/http2.pro index e130f30784..62b685e556 100644 --- a/tests/auto/network/access/http2/http2.pro +++ b/tests/auto/network/access/http2/http2.pro @@ -1,4 +1,4 @@ -QT += core core-private network network-private testlib +QT = core core-private network network-private testlib CONFIG += testcase parallel_test c++11 TARGET = tst_http2 diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index ecf4c5814a..fa56a35c29 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -110,8 +110,7 @@ private: QThread *workerThread = nullptr; QNetworkAccessManager manager; - QEventLoop eventLoop; - QTimer timer; + QTestEventLoop eventLoop; int nRequests = 0; int nSentRequests = 0; @@ -146,11 +145,6 @@ tst_Http2::tst_Http2() : workerThread(new QThread) { workerThread->start(); - - timer.setInterval(10000); - timer.setSingleShot(true); - - connect(&timer, SIGNAL(timeout()), &eventLoop, SLOT(quit())); } tst_Http2::~tst_Http2() @@ -497,15 +491,12 @@ void tst_Http2::clearHTTP2State() void tst_Http2::runEventLoop(int ms) { - timer.setInterval(ms); - timer.start(); - eventLoop.exec(); + eventLoop.enterLoopMSecs(ms); } void tst_Http2::stopEventLoop() { - timer.stop(); - eventLoop.quit(); + eventLoop.exitLoop(); } Http2Server *tst_Http2::newServer(const Http2::RawSettings &serverSettings, diff --git a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp index bc9144e40e..8e063733e9 100644 --- a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp +++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp @@ -236,6 +236,46 @@ void tst_QNetworkRequest::setHeader_data() << true << "Last-Modified" << "Thu, 01 Nov 2007 18:08:30 GMT"; + QTest::newRow("If-Modified-Since-Date") << QNetworkRequest::IfModifiedSinceHeader + << QVariant(QDate(2017, 7, 01)) + << true << "If-Modified-Since" + << "Sat, 01 Jul 2017 00:00:00 GMT"; + QTest::newRow("If-Modified-Since-DateTime") << QNetworkRequest::IfModifiedSinceHeader + << QVariant(QDateTime(QDate(2017, 7, 01), + QTime(3, 14, 15), + Qt::UTC)) + << true << "If-Modified-Since" + << "Sat, 01 Jul 2017 03:14:15 GMT"; + + QTest::newRow("Etag-strong") << QNetworkRequest::ETagHeader << QVariant(R"("xyzzy")") + << true << "ETag" << R"("xyzzy")"; + QTest::newRow("Etag-weak") << QNetworkRequest::ETagHeader << QVariant(R"(W/"xyzzy")") + << true << "ETag" << R"(W/"xyzzy")"; + QTest::newRow("Etag-empty") << QNetworkRequest::ETagHeader << QVariant(R"("")") + << true << "ETag" << R"("")"; + + QTest::newRow("If-Match-empty") << QNetworkRequest::IfMatchHeader << QVariant(R"("")") + << true << "If-Match" << R"("")"; + QTest::newRow("If-Match-any") << QNetworkRequest::IfMatchHeader << QVariant(R"("*")") + << true << "If-Match" << R"("*")"; + QTest::newRow("If-Match-single") << QNetworkRequest::IfMatchHeader << QVariant(R"("xyzzy")") + << true << "If-Match" << R"("xyzzy")"; + QTest::newRow("If-Match-multiple") << QNetworkRequest::IfMatchHeader + << QVariant(R"("xyzzy", "r2d2xxxx", "c3piozzzz")") + << true << "If-Match" + << R"("xyzzy", "r2d2xxxx", "c3piozzzz")"; + + QTest::newRow("If-None-Match-empty") << QNetworkRequest::IfNoneMatchHeader << QVariant(R"("")") + << true << "If-None-Match" << R"("")"; + QTest::newRow("If-None-Match-any") << QNetworkRequest::IfNoneMatchHeader << QVariant(R"("*")") + << true << "If-None-Match" << R"("*")"; + QTest::newRow("If-None-Match-single") << QNetworkRequest::IfNoneMatchHeader << QVariant(R"("xyzzy")") + << true << "If-None-Match" << R"("xyzzy")"; + QTest::newRow("If-None-Match-multiple") << QNetworkRequest::IfNoneMatchHeader + << QVariant(R"("xyzzy", W/"r2d2xxxx", "c3piozzzz")") + << true << "If-None-Match" + << R"("xyzzy", W/"r2d2xxxx", "c3piozzzz")"; + QNetworkCookie cookie; cookie.setName("a"); cookie.setValue("b"); @@ -327,6 +367,62 @@ void tst_QNetworkRequest::rawHeaderParsing_data() << true << "Last-Modified" << "Sun Nov 6 08:49:37 1994"; + QTest::newRow("If-Modified-Since-RFC1123") << QNetworkRequest::IfModifiedSinceHeader + << QVariant(QDateTime(QDate(1994, 8, 06), + QTime(8, 49, 37), + Qt::UTC)) + << true << "If-Modified-Since" + << "Sun, 06 Aug 1994 08:49:37 GMT"; + QTest::newRow("If-Modified-Since-RFC850") << QNetworkRequest::IfModifiedSinceHeader + << QVariant(QDateTime(QDate(1994, 8, 06), + QTime(8, 49, 37), + Qt::UTC)) + << true << "If-Modified-Since" + << "Sunday, 06-Aug-94 08:49:37 GMT"; + QTest::newRow("If-Modified-Since-asctime") << QNetworkRequest::IfModifiedSinceHeader + << QVariant(QDateTime(QDate(1994, 8, 06), + QTime(8, 49, 37), + Qt::UTC)) + << true << "If-Modified-Since" + << "Sun Aug 6 08:49:37 1994"; + + QTest::newRow("Etag-strong") << QNetworkRequest::ETagHeader << QVariant(R"("xyzzy")") + << true << "ETag" << R"("xyzzy")"; + QTest::newRow("Etag-weak") << QNetworkRequest::ETagHeader << QVariant(R"(W/"xyzzy")") + << true << "ETag" << R"(W/"xyzzy")"; + QTest::newRow("Etag-empty") << QNetworkRequest::ETagHeader << QVariant(R"("")") + << true << "ETag" << R"("")"; + + QTest::newRow("If-Match-empty") << QNetworkRequest::IfMatchHeader << QVariant(QStringList(R"("")")) + << true << "If-Match" << R"("")"; + QTest::newRow("If-Match-any") << QNetworkRequest::IfMatchHeader << QVariant(QStringList(R"("*")")) + << true << "If-Match" << R"("*")"; + QTest::newRow("If-Match-single") << QNetworkRequest::IfMatchHeader + << QVariant(QStringList(R"("xyzzy")")) + << true << "If-Match" << R"("xyzzy")"; + QTest::newRow("If-Match-multiple") << QNetworkRequest::IfMatchHeader + << QVariant(QStringList({R"("xyzzy")", + R"("r2d2xxxx")", + R"("c3piozzzz")"})) + << true << "If-Match" + << R"("xyzzy", "r2d2xxxx", "c3piozzzz")"; + + QTest::newRow("If-None-Match-empty") << QNetworkRequest::IfNoneMatchHeader + << QVariant(QStringList(R"("")")) + << true << "If-None-Match" << R"("")"; + QTest::newRow("If-None-Match-any") << QNetworkRequest::IfNoneMatchHeader + << QVariant(QStringList(R"("*")")) + << true << "If-None-Match" << R"("*")"; + QTest::newRow("If-None-Match-single") << QNetworkRequest::IfNoneMatchHeader + << QVariant(QStringList(R"("xyzzy")")) + << true << "If-None-Match" << R"("xyzzy")"; + QTest::newRow("If-None-Match-multiple") << QNetworkRequest::IfNoneMatchHeader + << QVariant(QStringList({R"("xyzzy")", + R"(W/"r2d2xxxx")", + R"("c3piozzzz")"})) + << true << "If-None-Match" + << R"("xyzzy", W/"r2d2xxxx", "c3piozzzz")"; + QTest::newRow("Content-Length-invalid1") << QNetworkRequest::ContentLengthHeader << QVariant() << false << "Content-Length" << "1a"; QTest::newRow("Content-Length-invalid2") << QNetworkRequest::ContentLengthHeader << QVariant() diff --git a/tests/auto/network/ssl/qpassworddigestor/qpassworddigestor.pro b/tests/auto/network/ssl/qpassworddigestor/qpassworddigestor.pro new file mode 100644 index 0000000000..3e2685f579 --- /dev/null +++ b/tests/auto/network/ssl/qpassworddigestor/qpassworddigestor.pro @@ -0,0 +1,4 @@ +CONFIG += testcase +TARGET = tst_qpassworddigestor +QT = core network testlib +SOURCES = tst_qpassworddigestor.cpp diff --git a/tests/auto/network/ssl/qpassworddigestor/tst_qpassworddigestor.cpp b/tests/auto/network/ssl/qpassworddigestor/tst_qpassworddigestor.cpp new file mode 100644 index 0000000000..bbd6c72ca8 --- /dev/null +++ b/tests/auto/network/ssl/qpassworddigestor/tst_qpassworddigestor.cpp @@ -0,0 +1,171 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/QtTest> +#include <QtNetwork/qpassworddigestor.h> +#include <QtCore/QByteArray> + +class tst_QPasswordDigestor : public QObject +{ + Q_OBJECT +private Q_SLOTS: + void pbkdf1Vectors_data(); + void pbkdf1Vectors(); + void pbkdf2Vectors_data(); + void pbkdf2Vectors(); +}; + +void tst_QPasswordDigestor::pbkdf1Vectors_data() +{ + QTest::addColumn<QCryptographicHash::Algorithm>("algorithm"); + QTest::addColumn<QByteArray>("password"); + QTest::addColumn<QByteArray>("salt"); + QTest::addColumn<int>("iterations"); + QTest::addColumn<int>("dkLen"); + QTest::addColumn<QByteArray>("result"); + + // data from + // https://web.archive.org/web/20160912052752/https://www.di-mgt.com.au/cryptoKDFs.html#examplespbkdf + // (Note: this is not official, but at least it's something to compare with.) + QTest::newRow("di-mgt") << QCryptographicHash::Sha1 << QByteArray::fromHex("70617373776F7264") + << QByteArray::fromHex("78578E5A5D63CB06") << 1000 << 16 + << QByteArray::fromHex("DC19847E05C64D2FAF10EBFB4A3D2A20"); +} + +void tst_QPasswordDigestor::pbkdf1Vectors() +{ + QFETCH(QCryptographicHash::Algorithm, algorithm); + QFETCH(QByteArray, password); + QFETCH(QByteArray, salt); + QFETCH(int, iterations); + QFETCH(int, dkLen); + QFETCH(QByteArray, result); + + QCOMPARE(QPasswordDigestor::deriveKeyPbkdf1(algorithm, password, salt, iterations, dkLen), result); +} + +void tst_QPasswordDigestor::pbkdf2Vectors_data() +{ + QTest::addColumn<QCryptographicHash::Algorithm>("algorithm"); + QTest::addColumn<QByteArray>("password"); + QTest::addColumn<QByteArray>("salt"); + QTest::addColumn<int>("iterations"); + QTest::addColumn<int>("dkLen"); + QTest::addColumn<QByteArray>("result"); + + // data from https://tools.ietf.org/html/rfc6070 + auto hash = QCryptographicHash::Sha1; + QTest::newRow("rfc6070-1") << hash << QByteArrayLiteral("password") << QByteArrayLiteral("salt") + << 1 << 20 + << QByteArray::fromHex("0c60c80f961f0e71f3a9b524af6012062fe037a6"); + QTest::newRow("rfc6070-2") << hash << QByteArrayLiteral("password") << QByteArrayLiteral("salt") + << 2 << 20 + << QByteArray::fromHex("ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957"); + QTest::newRow("rfc6070-3") << hash << QByteArrayLiteral("password") << QByteArrayLiteral("salt") + << 4096 << 20 + << QByteArray::fromHex("4b007901b765489abead49d926f721d065a429c1"); +#if 0 + // Excluding: takes about 3 minutes to run + QTest::newRow("rfc6070-4") << hash << QByteArrayLiteral("password") << QByteArrayLiteral("salt") + << 16777216 << 20 + << QByteArray::fromHex("eefe3d61cd4da4e4e9945b3d6ba2158c2634e984"); +#endif + QTest::newRow("rfc6070-5") << hash << QByteArrayLiteral("passwordPASSWORDpassword") + << QByteArrayLiteral("saltSALTsaltSALTsaltSALTsaltSALTsalt") << 4096 + << 25 + << QByteArray::fromHex( + "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038"); + QTest::newRow("rfc6070-6") << hash << QByteArrayLiteral("pass\0word") + << QByteArrayLiteral("sa\0lt") << 4096 << 16 + << QByteArray::fromHex("56fa6aa75548099dcc37d7f03425e0c3"); + + // the next few bits of data are from https://tools.ietf.org/html/rfc3962#appendix-B + QByteArray password = QByteArrayLiteral("password"); + QByteArray salt = QByteArrayLiteral("ATHENA.MIT.EDUraeburn"); + QTest::newRow("rfc3962-1") << hash << password << salt << 1 << 16 + << QByteArray::fromHex("cdedb5281bb2f801565a1122b2563515"); + QTest::newRow("rfc3962-2") + << hash << password << salt << 1 << 32 + << QByteArray::fromHex("cdedb5281bb2f801565a1122b25635150ad1f7a04bb9f3a333ecc0e2e1f70837"); + QTest::newRow("rfc3962-3") << hash << password << salt << 2 << 16 + << QByteArray::fromHex("01dbee7f4a9e243e988b62c73cda935d"); + QTest::newRow("rfc3962-4") + << hash << QByteArrayLiteral("password") << salt << 2 << 32 + << QByteArray::fromHex("01dbee7f4a9e243e988b62c73cda935da05378b93244ec8f48a99e61ad799d86"); + QTest::newRow("rfc3962-5") << hash << password << salt << 1200 << 16 + << QByteArray::fromHex("5c08eb61fdf71e4e4ec3cf6ba1f5512b"); + QTest::newRow("rfc3962-6") + << hash << password << salt << 1200 << 32 + << QByteArray::fromHex("5c08eb61fdf71e4e4ec3cf6ba1f5512ba7e52ddbc5e5142f708a31e2e62b1e13"); + + salt = QByteArray::fromHex("1234567878563412"); // 0x1234567878563412 + QTest::newRow("rfc3962-7") << hash << password << salt << 5 << 16 + << QByteArray::fromHex("d1daa78615f287e6a1c8b120d7062a49"); + QTest::newRow("rfc3962-8") + << hash << password << salt << 5 << 32 + << QByteArray::fromHex("d1daa78615f287e6a1c8b120d7062a493f98d203e6be49a6adf4fa574b6e64ee"); + + password = QByteArray(64, 'X'); + salt = "pass phrase equals block size"; + QTest::newRow("rfc3962-9") << hash << password << salt << 1200 << 16 + << QByteArray::fromHex("139c30c0966bc32ba55fdbf212530ac9"); + QTest::newRow("rfc3962-10") + << hash << password << salt << 1200 << 32 + << QByteArray::fromHex("139c30c0966bc32ba55fdbf212530ac9c5ec59f1a452f5cc9ad940fea0598ed1"); + + password.append('X'); + salt = "pass phrase exceeds block size"; + QTest::newRow("rfc3962-11") << hash << password << salt << 1200 << 16 + << QByteArray::fromHex("9ccad6d468770cd51b10e6a68721be61"); + QTest::newRow("rfc3962-12") + << hash << password << salt << 1200 << 32 + << QByteArray::fromHex("9ccad6d468770cd51b10e6a68721be611a8b4d282601db3b36be9246915ec82a"); + + password = QByteArray::fromHex("f09d849e"); // 0xf09d849e + salt = "EXAMPLE.COMpianist"; + QTest::newRow("rfc3962-13") << hash << password << salt << 50 << 16 + << QByteArray::fromHex("6b9cf26d45455a43a5b8bb276a403b39"); + QTest::newRow("rfc3962-14") + << hash << password << salt << 50 << 32 + << QByteArray::fromHex("6b9cf26d45455a43a5b8bb276a403b39e7fe37a0c41e02c281ff3069e1e94f52"); +} + +void tst_QPasswordDigestor::pbkdf2Vectors() +{ + QFETCH(QCryptographicHash::Algorithm, algorithm); + QFETCH(QByteArray, password); + QFETCH(QByteArray, salt); + QFETCH(int, iterations); + QFETCH(int, dkLen); + QFETCH(QByteArray, result); + + QCOMPARE(QPasswordDigestor::deriveKeyPbkdf2(algorithm, password, salt, iterations, dkLen), result); +} + +QTEST_MAIN(tst_QPasswordDigestor) +#include "tst_qpassworddigestor.moc" diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-DES.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-DES.der Binary files differnew file mode 100644 index 0000000000..e70bde5820 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-DES.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-DES.pem new file mode 100644 index 0000000000..fd62743d94 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-DES.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHwMBsGCSqGSIb3DQEFAzAOBAiBYHv8jvBwMQICCAAEgdCwfamafrN1nvpdnF5t +KCPgBvRGfV9zStK+XItBAe72CZdAy1Jjr2UJHc8Rl3OEo2hmCr+892/lhK7GIugj +oLOvON3VEqrUvrvmH0Qtm+/A/ypq14Lr4sBfq7bViM44bv/DUwHMD5/xmLtSzXlC +AjjioBJ/k4K+6DzD3+eMDNr6Z9rCUcvJP6q8+PPhpIXEJquA3RYuyuDhdIbazO5A +iMts7PbzBzW/4YhENPWaUdviuRZo/ap+WDJ/SdwiNxOxx7KrWgj3y2dAtNnVAv5T +njE4 +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-RC2-64.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-RC2-64.der Binary files differnew file mode 100644 index 0000000000..40bbe6a441 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-RC2-64.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-RC2-64.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-RC2-64.pem new file mode 100644 index 0000000000..6a8a8484e0 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-MD5-RC2-64.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHwMBsGCSqGSIb3DQEFBjAOBAga2K6FvYk1ygICCAAEgdCV9m57p+DrBrVafXUq +8pgdr+1FEX9YaFXNRMKyPZ5Ca6t5RsPpWC3RdGlieH4iVp03/rlTttx0rLUWx3IG +gsrd2adrP6Bl/lbEJnZ6lIeZz2KvPbbhfmRMCIhr/h24JSi5lmGl5KzxQXSm9ujb +/5jtN/QtoQ3cLWpNn1SwMNdIAYgEpnCghwqITbBwMovD8yd2YNbNbejG/T+q6bwl +GJE46OSX+IAWQ/wJejdq//ozD3m2PxjK6nktWeqAeoqcycYGYGKvta27lNqyuE3M +BdGT +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-DES.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-DES.der Binary files differnew file mode 100644 index 0000000000..6ebe9c4011 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-DES.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-DES.pem new file mode 100644 index 0000000000..3422931606 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-DES.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHwMBsGCSqGSIb3DQEFCjAOBAjj2EIj8WAOWwICCAAEgdB4G1oLnLtLAGaZtpGb +vU2g4g3pJtQLJX1H0a/cmXO1OrX7YRcESvw8nocZjNKKWCehfQqinRBpVUsoaGUw +QssIDKlWkW3LbM11F6YMI5GCzN5bpWcJazQRyHEnIk/OTQN3aeKjnYQXep1nt7tN +INKsCAVyx1cYfr3izxGRwN2hTraz5fBdeBpEye+Essn5KziwET32EbW+kt+wsule +k4tvnKgCOvbvVzqIdafH/FfP04KRv39O+HR3evoBjhGudUxXJ0OLp8IZkG+34f3P +ZQxC +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-RC2-64.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-RC2-64.der Binary files differnew file mode 100644 index 0000000000..c8ae94c4f8 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-RC2-64.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-RC2-64.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-RC2-64.pem new file mode 100644 index 0000000000..93857f010b --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-PBE-SHA1-RC2-64.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHwMBsGCSqGSIb3DQEFCzAOBAgrv/kKBXNFAwICCAAEgdAFpWxMmQygufWZpeAI +heJ3uqyb5bnahW75t2HWQZTb1qEqp62/iLr1IlbHmZAQbJc0+VLhXz/2QtK3q/BB +bHpa9cWGFi2HVgO4dFjSI7X68QrM93GPGHqwtnVZnlo2aPHgA6BzotEEwklXl4Db +BbPKo0vBUVA9ZKaN0lH+Pzj/Rb37kC6xRWBjNd87jaszykcNFYkTNrrG8nESHJAw +fTeHwrsGsmIz8FfOxRfqXrPwOiA5AZZ/S/8Jt2gtoOW5ydY6/Bfp0aEwAIhwxjFJ +cy6N +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..2c2caa0665 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA1.pem new file mode 100644 index 0000000000..0797d9167f --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA1.pem @@ -0,0 +1,9 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBHjBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQI8mhki8A7ijgCAggA +MB0GCWCGSAFlAwQBAgQQbVjLreAybYGwsnk4ZMQUIgSB0Ozr2DfP+rkb58tT748m ++7xe+bhpT3xrrSpUsB2RXUH/6M7hVjb+XZ/JSAegqkuZq08df+ezpHjWX/W+IVL4 +Sx0wZWNW51TiwGymNFuBwSVliqCvndAaY+EIY3bsME5RFik86R4iAbtrxalWPFoR +jscLkGtNstQR5JQCOccTN7h5jRBwEFrArqfPv+XZb5ysy9FjFnVDuspFg/CysIJD +V7WEJcxOzEIk2bbxY4UEpLhfFv8RHrV8M7jmjVRC+mN094zMnzBVSv8KIjk0Ljff +ysY= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..3f3bd2e8ea --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA256.pem new file mode 100644 index 0000000000..e78d69ae8a --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes128-hmacWithSHA256.pem @@ -0,0 +1,9 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBLDBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQICIPD0G0X/sECAggA +MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAECBBDSrIv/kITtQ/RL5j675WqsBIHQ +oSiQJLyXPOmnNYmWLw4Biom8Utn/I8109mUujVPhUA63njp0I/jGwNn4FcdilZlO +TTCKIxlzG3zhztS5xqxQFuzWNQdTgfqzO7DSi/ZtGErvZi+ShaiQU7ri7LYRIw8C +7YtXiPrfPSKpfyU0adD2socAa1OlnvinoaHYd/QNs4EEv3hahIiq/nHpzRkb2qdX +XIruJhlvF4B07aYfmRvMK4CVd6VGXfGfGXECFqMk5b7HwJzkMTbtB2bsMTNguGxK +o1+Hf3PHRst6q1776z8ENw== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..f078644544 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA1.pem new file mode 100644 index 0000000000..9a6b147602 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA1.pem @@ -0,0 +1,9 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBHjBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIdlQB+08q40gCAggA +MB0GCWCGSAFlAwQBKgQQ3dY2cSZfdPyeYlHRO+M63wSB0DjoR/cQ2rLkW1Ur8V1q +LG/0nv0O1mVK8Sj+BcOje/nqMU67lRdkXVI1yICmpwrwFEkwIV6zHIx+Dwriliel +h0yXsTLaBmMQeJo17J6kOyuW+C0Mr8CqlnAVEoEQI7FPes7rtw6W0wkuuPPw3vEs +RKB8xwdfS5t5ot5DtKZ5rN+6XbtRA/jdfi1O6ekKzeT0fpRGP+ppTEmCh77+8Ity +/BwPKGXepZpHkOcDOvWGdDiuy7vhA5gaYyzpXPD2Fo3V5cobFzgLzT3in+b6YtV4 +s/4= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..618be6ad9c --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA256.pem new file mode 100644 index 0000000000..a82c2fbc94 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-aes256-hmacWithSHA256.pem @@ -0,0 +1,9 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBLDBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIVsIsQ3kPm5gCAggA +MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBAOdrxyNKYeoKCTuDXeYiwpBIHQ +DheVgnsmJ7bYb5Y02qOdCjfYEUje8bvendhIsG41recaNjdHcWQB1JOV8anmZPJ+ +4buMQhE9Lfw5Hvg2x0pqkvQCV0aUWUwwybnoQ9T8z0z67WJG6f03m9eE+Mzw9Q0D +wavghqO/lnh9uGd4Tdfzuj0NWHbrey7ags81fZ9jWOdX/M5LywFr7oThokfq6LlH +rpnK13j9MUVrmmSvsjVXGjWErEaTXbJOpCeyDn1510iI5pyGRZpicmfHzE6YNHvF +dKSlxRWO+cOxE9Ax9dm5mg== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..33ca45e2c9 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA1.pem new file mode 100644 index 0000000000..ec276fd807 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA1.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBFTBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIwE9ZHpXAOK8CAggA +MBQGCCqGSIb3DQMHBAgOtF6y98HdvQSB0KtvnVtpFqjG8OLzPyZrugisgiYBgvoU +62D+rfO5Ji4cbWwuQEeS3ywI7rHH6BG8+mxcVeQHSmGZi336M/j0erO/yo6MnkrU +a8pfrqfPvLJPa+2FPSWlM/+ppj+kcaZa0B8pF/mioBThID8KhDFm8CG4UwP4P2Kn +GUUGmM9cyNdPFWuVg8PyY1zHcx2GNiL4XZcKp1qsGf75uso8DmgrvI+c9yDD+5ag +rPmsgFSy3XtlNmYGyLq1pW4rQ6ivLknZc5oweqjISVT3jKjJqowgJYo= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..6d23cd3604 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA256.pem new file mode 100644 index 0000000000..f33f0dc4c4 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-des3-hmacWithSHA256.pem @@ -0,0 +1,9 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBIzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI584onGZg/sMCAggA +MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMEvKBdjD2B+BIHQlCNsdhKhN8ce +l73RzS4AUNbPamaLPV+l+vy8F4jjziCux0RwS/83ju/XlD/TntSYH4RYx/2vNHo5 +/YVGinOSTHZD7BqHHOxTjMqlVY4uFU2oJcGQ2VIsbVuPiL78Tq6XcuaIy5ElXjte +g/qa8y9/cJM9wm6O1XMfIIL6AboBdbVloStvij3HOOOOlZp6161+QlmADdo2yJJ2 +byP7SoC4I6fLDrKZub8+AEcPFCjvLZ6a9HmCF8aw/rvVqOZ91YJOxgsPYYmOXJtG +sYzN48y81w== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.der Binary files differnew file mode 100644 index 0000000000..f195c03e3b --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.pem new file mode 100644 index 0000000000..d317c53836 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHxMBwGCiqGSIb3DQEMAQQwDgQIcCYglgSeP+sCAggABIHQXnZlcc/CDvsT/3aQ +o2E6AgnJgaq6P2l41yQ6BuomXRSI+KoP+nYWC2fAtb/URgdoNstrflNjTGysSdyl +CU7A1FnrQkoSvvLElcy25/ttuH9LE4adbhCiKgv2NQXXY/2Lzeeq1e3iqLg7/5wx +7B2XmgQvMV3EHN1uJWVDKuevOOJ5ULKYONELDaicrlm8IumdhWMvp3ypUrHe6hSD +i2YYZf8eXfCY0NIRFeXluEgK4MFz/iEkl7aYpNDSA9F7Uk6TC3IRQu3yFs0GR37b +4fDtpg== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.der Binary files differnew file mode 100644 index 0000000000..96b54c3f5d --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.pem new file mode 100644 index 0000000000..2fe8300613 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHxMBwGCiqGSIb3DQEMAQMwDgQIwZ3Xa+/tptsCAggABIHQmdPeV+Zd96TBIGM+ +kYRNqxckxWbVWE8EBWzJOwjlvrOxhVi3hbSl4QM3cMyNFv0ssyuJiXGQQ7+6/dkp +UxPWigaSJkemDMtDTQNpHcK/4Ekao+PlAvzgi6wG0lUfL4ioSiEqrE5DlcdfctdR +Nj9mF4u0rekPWthXhfHcmDxQKSORDi8gYfyQUaV59niKQGIYMsVz4Bu2fwrrTLFn +NjzyHhYsva2GLAfEWNB13/VtIv4gJaB5mZpzLf81VWe52rR7rZWb3R/rWEz9FFQm +vrgagw== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.der Binary files differnew file mode 100644 index 0000000000..7fd85f55db --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem new file mode 100644 index 0000000000..e9faf30e61 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHxMBwGCiqGSIb3DQEMAQUwDgQIMLBXkL2mR68CAggABIHQkquhoK6Ep0EtnjC7 +V2FbRzYrFSvOakBOGuU6U6p+JeStbTRp4gLQ9hY/8xG7l0GrzM8dlcrO5QnI9Ypk +zw6a/9FTE+ROpQYGiRjnhdegRguIn6aaCdejfu5s4g09kz/Y6saM1LBkA/hby0m9 +YWB8IFg+/B8qLScjnhn7UOBm4HAW/UywXGH7IFH87ml1g87xlDu88GhcP8iqenco +TrfPCQDoa+C0EBLV8yTR5aG66kK6BrWXNkyZgUiuhUF1TYmZhZDaiUJ4Er4gMlgA +C8o6qw== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.der Binary files differnew file mode 100644 index 0000000000..c0d8b9bb3f --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem new file mode 100644 index 0000000000..a1d968b912 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem @@ -0,0 +1,8 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHxMBwGCiqGSIb3DQEMAQYwDgQI3y3PINAU1csCAggABIHQEPD8M7YheSdikqwW +tem/Oz+CZxAXWCBYokpxSeGexFR85Ni2bd/wr8tT4Mv5nNrPLlcNMrKLYCTWryEu +PtW1XtMp881xmPM9QMgrFRfhiGeVfveEmKZzdGrXN5RRqa20Xa0ufEqaJpvfJHIz +meWfNkAUtr0RhwK1tMfjxg3CvnSXG1l/cegvUgsc5Nq4VfCOwLYAPY24ltYIZrAp +JKuc9XkbBx+Uow4kOVpOBTA28giB9gywSbpn1/bCgrm1iBltlrC1bOI2UEYLXAK8 +S8kOew== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.der Binary files differnew file mode 100644 index 0000000000..59f01c9057 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem new file mode 100644 index 0000000000..29da203ac1 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHqMBwGCiqGSIb3DQEMAQEwDgQIS1fq1s4wBy4CAggABIHJsEjsk3aow+m3DXPe +1KCnwl0qXzzh96JCrtAa+2pWytp52+mZphUgnNXYkIoj0rdqJbr1y4/3t73ffVFG +TU/4401k2QTSKo2mObTxY811fnWImBbNG3BJVmoq8zvJuHrctfVQuKBQb9UFA7RF +E5WrYwkNXfRxgSsuUgtMvklHyxeAjxdZ0vWennUuPkJIa4XQhIY5gqMiume8dCGl +mDujTHUPhBjRKifaGQv2hvc8l7FgjUlUY1DcZIl0AapzF3jEXS/Se90FOE2M +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.der Binary files differnew file mode 100644 index 0000000000..f185d58b51 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem new file mode 100644 index 0000000000..3dd08fd969 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHqMBwGCiqGSIb3DQEMAQIwDgQICCPn/nJOcwECAggABIHJY1EqBsfnKkOsytQR +ujblH/MciuYQ5PIkhS+rfEyYvNaQAM4ELbZjBOhqhPxpWgV/nwzl5lbjGHGaBojp +uH6Tm9L/J/DUVXt5U6i0bmuJ3vUQL9t8WlLwWKEUbszMOJfzgn+q7pr2AViOwcgA +kL9JD3fTL7KspScIvYo8JD5YomwzDTMyhJFtkvKpjDtBsBkZxvmDRtBnjYYDAvie +ICGKQ5ojeZD2p2v69ra9bhAOXi/wz+AMotLVWa8myrOb7B+X/b0xEnoOqxKL +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..a3d1fa4c9b --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA1.pem new file mode 100644 index 0000000000..9adf8802c3 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA1.pem @@ -0,0 +1,9 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBHTBIBgkqhkiG9w0BBQ0wOzAeBgkqhkiG9w0BBQwwEQQI7hWoVS10HvICAggA +AgEQMBkGCCqGSIb3DQMCMA0CAToECLPHM3qUvtYPBIHQl36zBfnW7J89+Kl+tLa4 +rm9Iu8KpMNJm2bnuLptltF/e5Vyp92xRvuCoaAVQka0dq4jKOVOkruMfHHHOf22g +mxpwtJfYvKqqjW2KH2FE0Y3l1XPV6o4Of5FbhvcULDmNtCoFlme0hoAoHm1kUUzS +Ed4CJqc6VpYpHGCv8X6k+0j274XnPqRJaY8KizrD0+/i6vS/nu/srxLqt9COT9nS +tVTQL/CRmmXf8/jSdVLDMKjjboFU1FtVZnOq4yAAuJiBZFtfmIF5+EI1dbXMbMdF +MA== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..398d47b4c4 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA256.pem new file mode 100644 index 0000000000..de0d9179a2 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8-rc2-hmacWithSHA256.pem @@ -0,0 +1,9 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBKzBWBgkqhkiG9w0BBQ0wSTAsBgkqhkiG9w0BBQwwHwQIysmtT0sgtmsCAggA +AgEQMAwGCCqGSIb3DQIJBQAwGQYIKoZIhvcNAwIwDQIBOgQI3Lf5sOaUEmsEgdDE +0UkzkZdDMLBn9gGk9plFNb+2QKT2l0M1byplj92l8+eSv9stLTSf3v9STP7c/plJ +PMj4RUym4W7URvFhIEicyLDYNL7nD9JELC2i7E6S3NaSAZVeOxSl4gxEVtOPC00i +Dy/AISKSeNNBJkdUwT+m7as8Uc4+M1eitfMBQFUjRWQONpzw/2NtIeqI14VKPAM0 +1kVQTsO7TLEAwj7Jd1iscGakz+Ib7zMl1pCbVHrlh6nHrKvF+gvMDw5eC952CbpD +XCcPq3tU2j6KGGzK3ksd +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8.der Binary files differnew file mode 100644 index 0000000000..ecd0670072 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8.der diff --git a/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8.pem new file mode 100644 index 0000000000..a6f6f734eb --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512-pkcs8.pem @@ -0,0 +1,7 @@ +-----BEGIN PRIVATE KEY----- +MIHIAgEAMIGpBgcqhkjOOAQBMIGdAkEA+7WshnhYKUIf+71hYgDUGQcSk2JxzOw6 +rpKt3fkIafnkm6KnXeTIPrWlSLAhtHpsCX56HDzYu69BRyVjuYiFxwIVAJljwa1Y +uxEZ/+w73/UFLgvb0juZAkEAhk+R4vDxKY6w78hLyCfhSwnT4L3BWn6pINaAM4NU +lVzsYP6ye4R9vCvc2h+254GszhsjvKrCzl1RDI3UyJenAgQXAhUAl95kGzNYPVm5 +Y+2jpGA9N2PkcCU= +-----END PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-DES.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-DES.der Binary files differnew file mode 100644 index 0000000000..7af45943cb --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-DES.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-DES.pem new file mode 100644 index 0000000000..91874a9b29 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-DES.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGgMBsGCSqGSIb3DQEFAzAOBAihGk2iurZE8wICCAAEgYCaneaK9dlMsDGD11jl +F5etfmvAbUbpzVmooM4ORHweCnP/DiwJVyQ02dU3PlB0teLCG6DyJCl6CaOhZjRc +cDE4fYIBBVtLlcqwr8oc73DWi3azJ+/KdkuUQyHZEkzNo9Thi1owDI6XMlWbFZwd +wSlfuk9AghDAN8/n3iMu87veSQ== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-RC2-64.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-RC2-64.der Binary files differnew file mode 100644 index 0000000000..14bb01d10d --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-RC2-64.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-RC2-64.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-RC2-64.pem new file mode 100644 index 0000000000..30b186b796 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-MD5-RC2-64.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGgMBsGCSqGSIb3DQEFBjAOBAgQKZdqJ6i7cQICCAAEgYCfJQJakYch640S/EA0 +tLuO7xxLgeI9gxeooy0GM9FeHiDencz9BXJrFFpXLs8J5IgVuj2zjfMDOuf/3zCa +gn1itwByKWPLXHx5vRUAT5zds2F3uBo7RCQj+FlR3xv4Xuqwx34qfYJpafORpi7/ +eO6M4V2BnAkws1b5UK0WDjFfSQ== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-DES.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-DES.der Binary files differnew file mode 100644 index 0000000000..689780f8a1 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-DES.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-DES.pem new file mode 100644 index 0000000000..1f737d9803 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-DES.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGgMBsGCSqGSIb3DQEFCjAOBAjruvWW+JZt7wICCAAEgYAgvrADpBoAMNrS8uYX +9FTnHUsGr5Sg3e2ueEwMUGsnGliJJTa58r9634RffN6uyB8jBihCdQw5iBbzLkC2 +ltEVcOR8pNQvprGXX4X/jwOY4RhyKrb89YdZ2BZ4orzY5cL+6nGYQKEm3WlrXW+a +Ncq6UvRpVmHqQ0OW+zuCbi5/nA== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-RC2-64.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-RC2-64.der Binary files differnew file mode 100644 index 0000000000..a06790a254 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-RC2-64.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-RC2-64.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-RC2-64.pem new file mode 100644 index 0000000000..814c341760 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-PBE-SHA1-RC2-64.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGgMBsGCSqGSIb3DQEFCzAOBAg95ivo7up6egICCAAEgYDAMawlX0a61+iLgab0 +Zi62Ef7g0Jdj0KG4NeKmWrmuCXI3HBiAVv878vWkL8cMx5DqhBDw8A14aOxCkIm9 +uZ5twNwunINclMQtYxL7mtQLjUr50sFFY/Dd2PH669Qb6dqZC6efO7y31n93+fUI +gyntTIXfeuUSg8uw/qG9Vfa6oQ== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..fe071489cb --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA1.pem new file mode 100644 index 0000000000..d7c41b121d --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA1.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHOMEkGCSqGSIb3DQEFDTA8MBsGCSqGSIb3DQEFDDAOBAhC3xITYW8eRQICCAAw +HQYJYIZIAWUDBAECBBDUQa3ddOnliyQ/qIYEFmK2BIGASDcmbEFHEwmV9uJzQEI4 +hfZTOVaR0lYHCTTnJjEsbM8oyvVvMxJkefNqPVkBF1Oc4nHaN6LEPIZRpHYJxjDH +tk7RFlcvSlS2Dcv41y+2Bcj1dMtocXM1t6jxo5nioeBnHCUQr3VsDT9+eJvithY9 +UyUqUt+P5f1H1LCpqD3BYcc= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..62113a1e6b --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA256.pem new file mode 100644 index 0000000000..83e58214fb --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes128-hmacWithSHA256.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHcMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAjv/NQpQZwZbgICCAAw +DAYIKoZIhvcNAgkFADAdBglghkgBZQMEAQIEEPMGCKos4+H6cwxOhDR8UbQEgYC6 +01v9qHJnnFkHBbQ7L4xpWY3RVHTalKfCfLQErqwPx1akV7BPdCZmjd4rAdIGLImy +kaaAPVrJ3GVjF6fW+E9UIGoDEbFeZ1hlnTzhOTqUwGiBrCM0SY3XDyBxSdqv/Pk/ +M4Ibk/lDycV/kWm26j2I9OYPxedj4vdPgXPxEi7FeQ== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..232a6cf2cd --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA1.pem new file mode 100644 index 0000000000..294278ea44 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA1.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHOMEkGCSqGSIb3DQEFDTA8MBsGCSqGSIb3DQEFDDAOBAgYx6Cuor4IHQICCAAw +HQYJYIZIAWUDBAEqBBDc1FODsp0BBJI/EOjU/nA1BIGAUIe6lzmR2cWVQUAW6gF8 +UdykIWS5E4AnbPtaiVdFNmhyjtUq10gf67jX3/hfA3QXwDCTT1aot+5Vjrb57M8S +hjxrs871w0UvzBmrTLJA2/BWPz5gni72fj1N5JGYUKI4MFKHGhv53iUzW/E8KiRW +ab4KY+hUF9zFcXOBwOGvG7E= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..0f4075965a --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA256.pem new file mode 100644 index 0000000000..90ab751415 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-aes256-hmacWithSHA256.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHcMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAg+0vyp4rA5hgICCAAw +DAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEDlKgIIcdKfiQcsZLfQt97cEgYAD +TrjldhQKT8SjAnmChT/knsUeJzThLxKpdpRwbr8qYTZbCmngbb2oYBkrNzAwGoVM ++cj+6p3EgP7T/zjJYj7EArRvs7FM0spxqre2bQY3GG5E3PDGyR/h4nwdVTzorqNw +/35Dtl8ifbnVI4SCwTtifnCDsz9TjIXszixrCm354g== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..669cb1f9cc --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA1.pem new file mode 100644 index 0000000000..233dd94a18 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA1.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHFMEAGCSqGSIb3DQEFDTAzMBsGCSqGSIb3DQEFDDAOBAjU9TMJNWzzUAICCAAw +FAYIKoZIhvcNAwcECEd8I4R+1rlZBIGABNupNKmIR5j2lAyQAbDjXX2PtpOGH0+k +KXnS7i6rmseQFjwDiF+xMefhj9ZamEgypDjyWaYz/EwV7dP0dUzZuQpzGsN/JLZS +i1IhRV9sVABs4SbCn/KZsy8bLW/7/3e5qloRkXskB6dR4nVrq4kz1qMmQVO+9Ojo +Td+SUeCdhd0= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..9f444d6350 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA256.pem new file mode 100644 index 0000000000..29f17933bd --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-des3-hmacWithSHA256.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHTME4GCSqGSIb3DQEFDTBBMCkGCSqGSIb3DQEFDDAcBAgf2AMm0URGvQICCAAw +DAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI/4fa6rbvznsEgYBImRLhwGbEgcLm ++yHcsohX1uQyqPfP8PVHGtM6ITaAJ16djxQKfXRoffS4DSTnhFgHnXm42V7epgJO +ZHRe0dVbKynbp1ZCnNIXsvsgyP4ghfw70j2u+45fiBK2ZqhVaQns/1t02eIa7Kud +308ffy9xR8xbCV9H1hu978sWDPRgmA== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-2DES.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-2DES.der Binary files differnew file mode 100644 index 0000000000..e7939899c8 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-2DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-2DES.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-2DES.pem new file mode 100644 index 0000000000..eba00a5597 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-2DES.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGhMBwGCiqGSIb3DQEMAQQwDgQIASNN5nArudcCAggABIGAsi5Ta25v+vkS7qc0 +b10/Hv1H2SVhhOA4iYMdjB2XgpRFXBduYIFfROdAT8pJvspZ2EIJGu975H+SKeJ3 +ndULrOFmaDknlsAyVW8HslnOiuQVpNE0vTWWJYVg1xq9Hwg5YU7C1PsCMy8f5g4O +gbsHxVy7AGF2FSrJqy2PVdoEADI= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-3DES.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-3DES.der Binary files differnew file mode 100644 index 0000000000..9dd3f9d42c --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-3DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-3DES.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-3DES.pem new file mode 100644 index 0000000000..01f62cf5f2 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-3DES.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGhMBwGCiqGSIb3DQEMAQMwDgQINArkfLom3CoCAggABIGAaqrWHE+VgTLr/TQk +x86KYu88/eiO5jxGUxbFwUCOtTbw8g40MY4tuXNhhm9lQ5zVSrC7fdjagqr6Flz5 +YV8NWpURbA4CKXgX+JKUMzZclHUwfe/M/CI5tKIU8vu7O2jl8gL5mOAFagLmFUld +iS5+KYtWvuOy1jQd9Cn4pOrF0yA= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-128.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-128.der Binary files differnew file mode 100644 index 0000000000..2f1148d1ea --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-128.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem new file mode 100644 index 0000000000..fdddcfb02c --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGhMBwGCiqGSIb3DQEMAQUwDgQIBOJoKaHoCH8CAggABIGA5ekhEhokinZUh8Su +FU9XT9TmpJI6+uSUnV6dCI5F7jxUC4BKYUDLQ/wjassasP/z7NYgIUFXiSsx8+u9 +rIOd83qJly/QL3MI8HA/gwrUOK1mcQCdHM7WcDxgTDfA8iXvE7ipxkqWWh+vjWVg +QIBy+Mik4f8m6qRJtHvkn1+QVUQ= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-40.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-40.der Binary files differnew file mode 100644 index 0000000000..f8a47e1127 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-40.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem new file mode 100644 index 0000000000..368b1d9fd7 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGhMBwGCiqGSIb3DQEMAQYwDgQIYoqh4a7jy44CAggABIGAhOjw9xEXhMSaBJM6 +Opu29QK4+h7/RJJ+NcrzFBPV5p6t0bjqONRxdq8LwXA5nimlUq3ZbRqjhu0BCKh5 ++jvfjs0R9qD2cAv3QXjk6eh2YEx+wuDbc50SSL1Y826sLD06V4KThrQwfaLHE7r1 +mjx5N5Jg5rPFdTGe4umThyGlGPo= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-128.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-128.der Binary files differnew file mode 100644 index 0000000000..a2e71ed488 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-128.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem new file mode 100644 index 0000000000..91c71a3df0 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGaMBwGCiqGSIb3DQEMAQEwDgQIvutMegO9IYICAggABHoRfn/sZK/NRxF7jwF2 ++/0zh3Y/8cCm4xeGaCP7NOcJoJXOisXXxT05tgQEa5mfymOFK1PYjnHHVVLGs6CQ +TDPI2kb6XteXjkzR8Q0WQUtLSgAQ9/uEMmr43jAabaw+qnIcJrjaTt3rlbezZioR +Q3xbb38W5QBFcUIpCg== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-40.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-40.der Binary files differnew file mode 100644 index 0000000000..cf6373b642 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-40.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem new file mode 100644 index 0000000000..cc5ec63996 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem @@ -0,0 +1,6 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIGaMBwGCiqGSIb3DQEMAQIwDgQIGgo8eWJg23YCAggABHp/EXYSQmp35zzgLl8l +paNqOjR3Ku19rhrN9QiW1dagTztFuqzezlZC7WjbycWz9qRZeQFLLAEi/DIipIAf +sLsnbtfBypqcUCoO2AysmI31hPSaXSsHDH4cJ5LH+1DK6KVeQoVGJw/xTvrmaBD8 +lD9zOO313VgMIGe7wg== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..be137430e6 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA1.pem new file mode 100644 index 0000000000..b52d270e42 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA1.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHNMEgGCSqGSIb3DQEFDTA7MB4GCSqGSIb3DQEFDDARBAjwbKdmEddIYQICCAAC +ARAwGQYIKoZIhvcNAwIwDQIBOgQIvopesgNCATUEgYDQ7uOTZ+cUnxDAVh3z845L +QyZ2KkSbna0NmiKZGy9e1kh5iAQ1RhZ2iKaTTyGlpCi4i2mlZo3gvJbEHp+Do2vc +nq9g57AP6dU9+1LsLsTeVFbdJ7OymlcwUoSfF723g9IGlQa0D5K4RTR3y34lHMNC +NmrOwaAH4DPKDyC5EWYV0Q== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..fecff8a2bd --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA256.pem new file mode 100644 index 0000000000..67931bbbac --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8-rc2-hmacWithSHA256.pem @@ -0,0 +1,7 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIHbMFYGCSqGSIb3DQEFDTBJMCwGCSqGSIb3DQEFDDAfBAhdjCzod22WFQICCAAC +ARAwDAYIKoZIhvcNAgkFADAZBggqhkiG9w0DAjANAgE6BAj2j6TpIIho6QSBgK4/ +Kgspc57C+rWNbf3c0+o/bJ7ga3tTfq0iw8TYqZ8jV9+FZGjS4NVvh9EK8+L6f2w1 +NuyiGbKfsq7Lf1O1dlHNu2TagxYAWbJUwzoy0uUkfpRnfe5M/dl/l5Gx0cR4y9SH +yKOhuX3YxUvOtkwxEb6iyNg8vaq0yRG/1F5O2jI3 +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8.der b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8.der Binary files differnew file mode 100644 index 0000000000..c8e51cc01b --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8.der diff --git a/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8.pem b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8.pem new file mode 100644 index 0000000000..741f007304 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/ec-pri-224-secp224r1-pkcs8.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBBxr31AB6pNVnFUfX9rNKpZc +Ps+RbUj5PYdpHLtIoTwDOgAEg7Qj4reRDs3ot/r/rp2orzU/g07BIYsZCsLLrf8j +8wq50FHUIdwDRZEfpfGBPBXGgd/9DS9T7hU= +-----END PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/genkeys.sh b/tests/auto/network/ssl/qsslkey/keys/genkeys.sh index 7fb15e91ee..6210b42ab4 100755 --- a/tests/auto/network/ssl/qsslkey/keys/genkeys.sh +++ b/tests/auto/network/ssl/qsslkey/keys/genkeys.sh @@ -87,3 +87,58 @@ do echo -e "\ngenerating EC public key to DER file ..." openssl ec -in ec-pri-$size-$curve.pem -pubout -out ec-pub-$size-$curve.der -outform DER done + +#--- PKCS#8 ------------------------------------------------------------------------ +# Note: We'll just grab some of the keys generated earlier and convert those +# https://www.openssl.org/docs/manmaster/man1/pkcs8.html#PKCS-5-v1.5-and-PKCS-12-algorithms +echo -e "\ngenerating unencrypted PKCS#8-format RSA PEM file ..." +openssl pkcs8 -topk8 -nocrypt -in rsa-pri-512.pem -out rsa-pri-512-pkcs8.pem +echo -e "\ngenerating unencrypted PKCS#8-format RSA DER file ..." +openssl pkcs8 -topk8 -nocrypt -in rsa-pri-512.pem -outform DER -out rsa-pri-512-pkcs8.der + +echo -e "\ngenerating unencrypted PKCS#8-format DSA PEM file ..." +openssl pkcs8 -topk8 -nocrypt -in dsa-pri-512.pem -out dsa-pri-512-pkcs8.pem +echo -e "\ngenerating unencrypted PKCS#8-format DSA DER file ..." +openssl pkcs8 -topk8 -nocrypt -in dsa-pri-512.pem -outform DER -out dsa-pri-512-pkcs8.der + +echo -e "\ngenerating unencrypted PKCS#8-format EC PEM file ..." +openssl pkcs8 -topk8 -nocrypt -in ec-pri-224-secp224r1.pem -out ec-pri-224-secp224r1-pkcs8.pem +echo -e "\ngenerating unencrypted PKCS#8-format EC DER file ..." +openssl pkcs8 -topk8 -nocrypt -in ec-pri-224-secp224r1.pem -outform DER -out ec-pri-224-secp224r1-pkcs8.der + +for pkey in rsa-pri-512 dsa-pri-512 ec-pri-224-secp224r1 +do + pkeystem=`echo "$pkey" | cut -d- -f 1` + # List: https://www.openssl.org/docs/manmaster/man1/pkcs8.html#PKCS-5-v1.5-and-PKCS-12-algorithms + # These are technically supported, but fail to generate. Probably because MD2 is deprecated/removed + # PBE-MD2-DES PBE-MD2-RC2-64 + for algorithm in PBE-MD5-DES PBE-SHA1-RC2-64 PBE-MD5-RC2-64 PBE-SHA1-DES + do + echo -e "\ngenerating encrypted PKCS#8-format (v1) PEM-encoded $pkeystem key using $algorithm ..." + openssl pkcs8 -topk8 -in $pkey.pem -v1 $algorithm -out $pkey-pkcs8-$algorithm.pem -passout pass:1234 + + echo -e "\ngenerating encrypted PKCS#8-format (v1) DER-encoded $pkeystem key using $algorithm ..." + openssl pkcs8 -topk8 -in $pkey.pem -v1 $algorithm -outform DER -out $pkey-pkcs8-$algorithm.der -passout pass:1234 + done + + for algorithm in PBE-SHA1-RC4-128 PBE-SHA1-RC4-40 PBE-SHA1-3DES PBE-SHA1-2DES PBE-SHA1-RC2-128 PBE-SHA1-RC2-40 + do + echo -e "\ngenerating encrypted PKCS#8-format (v1 PKCS#12) PEM-encoded $pkeystem key using $algorithm ..." + openssl pkcs8 -topk8 -in $pkey.pem -v1 $algorithm -out $pkey-pkcs8-pkcs12-$algorithm.pem -passout pass:1234 + + echo -e "\ngenerating encrypted PKCS#8-format (v1 PKCS#12) DER-encoded $pkeystem key using $algorithm ..." + openssl pkcs8 -topk8 -in $pkey.pem -v1 $algorithm -outform DER -out $pkey-pkcs8-pkcs12-$algorithm.der -passout pass:1234 + done + + for algorithm in des3 aes128 aes256 rc2 + do + for prf in hmacWithSHA1 hmacWithSHA256 + do + echo -e "\ngenerating encrypted PKCS#8-format (v2) PEM-encoded $pkeystem key using $algorithm and $prf ..." + openssl pkcs8 -topk8 -in $pkey.pem -v2 $algorithm -v2prf $prf -out $pkey-pkcs8-$algorithm-$prf.pem -passout pass:1234 + + echo -e "\ngenerating encrypted PKCS#8-format (v2) DER-encoded $pkeystem key using $algorithm and $prf ..." + openssl pkcs8 -topk8 -in $pkey.pem -v2 $algorithm -v2prf $prf -outform DER -out $pkey-pkcs8-$algorithm-$prf.der -passout pass:1234 + done + done +done diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-DES.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-DES.der Binary files differnew file mode 100644 index 0000000000..293001c629 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-DES.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-DES.pem new file mode 100644 index 0000000000..e9aa918a11 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-DES.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBgTAbBgkqhkiG9w0BBQMwDgQIbdPEAuKuoSgCAggABIIBYAo3BSb8H60g9eyM +2QajPdxRT5RJBQeSmlYCG4NEhiXYCXkGx2btS20w7yeX2ESqKPTSTMTB6XY1o44x +DLnDF2FEjvrk89ADZraMaOKnUxcZiawXOi9chNf+S6PclRC+ZRMRfbCxTnqb6y8q +42aD4oMmHv48f+/27/kFVwj4o/5ls6Hfwc6/YpXZXfT/8hIrkVaPd8QErhY+pAau +H/ObrYXu7Hm1deBLdZD1+u19yFv/uGRg7E7S7/Ku2GSe0i9DpYlYpsz1lydubAp1 +RfxAARfMjEoo0gwUfGCvP6drh16fnLcu9GnxuPKacUTCRd3Pk6hm59TXdcLtXB+W +tzQ/TpPY4u0oL2NU/aF9jqZuDWW89TAjvwekYpqrtq5cbU4VHpFLLc2yO1n4flRm +pfHP4BXjW8D9frPMyLiOSJAdKoJnHfM4y9bG8SHbukmTaJCOUD2MJ5uXW8pVejxU +gnYbceU= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-RC2-64.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-RC2-64.der Binary files differnew file mode 100644 index 0000000000..3bb492bc5e --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-RC2-64.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-RC2-64.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-RC2-64.pem new file mode 100644 index 0000000000..08115431df --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-MD5-RC2-64.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBgTAbBgkqhkiG9w0BBQYwDgQIHQKYle7B6TECAggABIIBYP7M3ZLd+cmLd7HG +avwLJdK7dq1hUxdpDMYIIHXQMqR7yhrr271v6Sqlkq8i97CrdlmzWgWNiv8uok88 +z9CxT79Y6/sLcvKVfCkoI7Z/p86Pc2/P7otvhoc9GlRNIvU8r/nMtigf3FZDQWrp +3XmBSabIERSQZxNwVjmSQzAVFd+SgfcqrNpKD0kErrphcySF7M4SfyTm3/dfFbrO +gUdg0ULs0rbKbTpYyBgVhrdCXYFAQLajHlE6UVIAK21Ifq2EvJ3LQDUEXg6RADbf +s2easyTlKfssoRzTDkBo60J2OsgmS5ls7fxOBndjxMZYPJI55k/ct4FPJraXPIsj +j5iBIOJBdW7Fi42O/ezaLtSFC/TUwZf+rgsVQaqpz67ynp3V7K/wJqdR0P3WmO3T +XkL3quUX+GFtm1htiqT9EGX6c1UZFfqmTJ3juLP4YpgOgUVLSIrOPauk2txH9E/R +JATHbjg= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-DES.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-DES.der Binary files differnew file mode 100644 index 0000000000..82e2f79cd8 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-DES.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-DES.pem new file mode 100644 index 0000000000..82b997804a --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-DES.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBgTAbBgkqhkiG9w0BBQowDgQIQPSp44KDjkUCAggABIIBYLdDgiRyUnAkUhLW +pqaNMqrK0iaSKpwHvsw1S4PhOQdFclVUEZKs+2oBedtrr3VysWRg/ZKNBdBAnzLi +E3nw7RubL4WH2y3QNx6eLsMJsI1thF9pK0yWWfy+zQP3+oZVG+JTmctCLQDAToCa +1OoRGnaHrZxcGzg/B1yI2hRSDdcuFCelMTIG4fGJ3dyrQHR/Gyxr4m27kV25H4t2 +Vxc6DSb1qWmSgauvUKLMlnvqtFVJ/OxjTz3BWPKUJqOyDd80PdfX8t5ttdK9Ebca +DwIUHvAmblES9mknhUwJUym/JGQFd3GXPc7WNyTsqwV4x9xp/8WTmJvM8qPk8fNz +x5kj3+VZgcAIh0ePKdF0TBAaAz5nKg611UwIOI/ShdMeyc1B3iWA71Y+uPElPEf+ +6+Zp8DwJNaOZ1SEqfNyB6aNMuYlTmbwctEKjokaIvyakSI6nFs63ycq5/s+HrMHT +KHF9A4Q= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-RC2-64.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-RC2-64.der Binary files differnew file mode 100644 index 0000000000..ea6b0d6134 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-RC2-64.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-RC2-64.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-RC2-64.pem new file mode 100644 index 0000000000..14edbd1f09 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-PBE-SHA1-RC2-64.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBgTAbBgkqhkiG9w0BBQswDgQI+m9oVxROlkYCAggABIIBYBRYVJdSaW3fR2zh +t/s5PFJ+9ebZUxhSRoc7lxk5LU76xJIH6EUa5k2sPH2WnWfu/V0Hi6t7FC0wkPLZ +QUNcr8VPESfjDkzqmU9H+37mfrUG63P5hGgyoWzMEaok2uFfjt1e1XVfVLe8P1Z+ +zxy4+BNoLzWQ/Wb/gTwVVc0kkttmjUiRIqSQLCEh8ntWF2ws0JS+ihiR9NUdPdEe +niQWskeAxWvO758m6kfTQeRY7WnVWPaqoosH1+uC8UZ2TmuWqTxJlHTvqEJzjPTK +n7EzwIFHhZVJ+p+IT/6SvwL5i1h0dtlNwOfTlcU6W//U76cYmwwtrzjwVsKJNbBw +vuPboJ2asZSzXa8887zI8O3+5ClkTCvJpk46QJHuNTQhJc1/R7aXgWbpiGu8CBCo +PNB1OEbs+lTU8DYp8cIxdc/aTKnSxPm4d73jCaOEJ1Sj4tA97rPQVEFu0w/HLtP+ +6MxHjI0= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..a42fb92161 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA1.pem new file mode 100644 index 0000000000..11b1032852 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA1.pem @@ -0,0 +1,12 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBrzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQINZqXAZw29eMCAggA +MB0GCWCGSAFlAwQBAgQQMN7uviOQj5Hdt8Zb9sCtrQSCAWCsMtmLiGbnaleRuRh5 +mRWDqJ0PYXNaaTwQ24WKjl8dquPPJZz0QU2hDZGtuhBL90A2lqvG9oHJmFBpMg4E +RPHS33R04BtCTdpfCUziKcBomHbrh8ttQ/Y1UA9OgSgob3GQIDxwNS+0p0wApyWC +InPBE4DXByp9o1lQxNZj2wkmWLfkXCT75aMxevM30lf33SOCXDPTvtHlz/YcB6Yh +i/b31YUAEOilXaqaCu427BMPKCanshJAjX3wwOROQ+yh8R8HiSPu+x55gJlU+yCn +9S/oNwtTMimpI21cZTUIOkIRYyKJhgvUxjlQ0CjcMOjJvDms2rRgNhD6IFZrXoks +FRF/Z9pUH0n/m3208uckyPkilwoFNoYLec0lq1SdtBq2LOBV0hgCmR0J0Fokpo/p +8T/rzlb48JowOfZLnLqMtC6uqccQWmiEY3691exhFf5muUYsd8uOVkeWgMTfVnua +jwVr +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..74b870d490 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA256.pem new file mode 100644 index 0000000000..371448ae69 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes128-hmacWithSHA256.pem @@ -0,0 +1,12 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBvTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIadJLdxsx0GsCAggA +MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAECBBDc7IW9CVmuaaYtM4KFXpsUBIIB +YC1qJ4WQa6f2uxeaojvzpgYHmrh4gR9gXa2cNwCNQir557amVsPqiXEiSYmqrCy/ +Y9tN5ubLxu3z5TtscC1Y9bqP8oY3bQj+AleqzmywVI7dJhwGoTaM9lD574cknKVo +Fn5oe6a4dTTg8wxcic+zWFc5EPi3g3swu3jqmjrLaOM8gd0RlWkAFmM60F8LX9G1 +mxnNZXHcRmkpugpICwaNYhROlzVfvLQvqtlJNccGc6QvYq/zY0nX6R3ISkbW/Bzn +kadVaA4hNrao9RA9TT61v4H95+BGF6CLDTyU1z3jtaEvm4ihygeA5mS/pjBd7lAi +V9YCNazgfMlgNv1ynwU67e8to89SFvzrv2sjUEDEAx1cN6zLGl42dz7ZDk1ytmsO +grVc9vON+HhwrVIZiu8bMjj4lSD6E1XqsffpNzEhOAy2INp9ArvakCVP4mE06dv4 +4LHAAqaYj8jIHSBDPYw3F7w= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..112aca5d9f --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA1.pem new file mode 100644 index 0000000000..74aa2eb50a --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA1.pem @@ -0,0 +1,12 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBrzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQILWdaWkH3cTMCAggA +MB0GCWCGSAFlAwQBKgQQSj7y41B6JDjCn6mV9g3/EgSCAWBipZOOZk5C6IuwElK6 +1aGy8r4cmh6hbJ+IJIj5pNphE3IeLXfBQAUzJCD2wKKzgkL4bofdZYndIGqdBU/1 +0P27kCYKDIN0iixPr+gW6N0yEmD+R0v8fUFyQF+RiiZ0lCznAmKhc5d8C5r4zE5y +QN4E6RTAoiaTGM85jEpb2qP0Ju/2lhFJ85z0Dn2xXtH/y4O2UYQklufYpPxDX9xQ +DdgDPgdBXj7nH2a165CqFhA5b9PXCVjzSG8+u/PlWkO0UOCobL7YTlg0z88iAkWx +VWX6DG7UJovp8boqJ6CL8AeroSKDsNRzO5inROWeanj8t00vsSadXUtKTlFRBSaM +1Gzn81X5EZnhPzCkrmOmmK8+DZwgncRhLk6voFBfga9lSt9PZaDNEeNrVLixQvbc +fc5nAIp4SwkFbo/n11YRjHyBZsYqm1ugQIaEW0jGsQxGxKAzeN342emBm0KHBqr6 +liGH +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..45ebba1975 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA256.pem new file mode 100644 index 0000000000..ecf4acf311 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-aes256-hmacWithSHA256.pem @@ -0,0 +1,12 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBvTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQINZe2ZZmkA6ECAggA +MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBBrqs2JUotuTr374kCzYAyoBIIB +YDqyE1zTjItA+UhQ2jZ53NnaTCWTccqSVtb11jizZCOSvVEN0vayyr2OoQKsOw1y +Uane3niV4MX8H98u5Vz+ijHuebBTiSbtSAlEqeeWTtzNfsQa4PN633n4ov1Ybn2+ +ZiW2n5d3cbC+bqPGs5cjTA6GPxLsojx6ZZEQBAyiUZ8Ikn2UsLxBV7RMiS1MK+wg +1cvtOzDuA1SbAtLbv4GOFTYrZZrzrmtIJvxD9C0Nlsa4ci9PkVclE/tzTQxqHOq6 +DLC7LErqrWfZI3KNlw4c33CV3VaXiB1dFHcTohlYhYbrJZPz6wiKN5c1IxxD0fj8 +2BseKG3iV3jrp0yt9zSgquJL3OOAHk1rG4zvjQySJ29SVEH0TyvsLSPiV87U5u64 +rpHC8yRNz3ut//ZVPQKnz/dftFw5b80vXT2UT0BZQTzj4HHDkIBKDc8USteag91O +SBmhwK5Vuuph6o8ILY3YoUA= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..4f07e0cb50 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA1.pem new file mode 100644 index 0000000000..8040f68152 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA1.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIjA3V6epUyL4CAggA +MBQGCCqGSIb3DQMHBAin4GYIwaJohQSCAWC1BTA4MHvRL83mHd6lFsC/UgvGf5/4 +csPetxLj+foMBL9A6rspxB07WxB929Ayxy5rRWq4jeYhPCAg46PL+Ne5MYp9PnDm +OjYIJjLNPk8wDuDYMDyMYH8+U4o+WaSz612YpcHIM5GEJ2TD0ngx6LctBNRtyWsR +9Ehn2/NLxrBI0MS93gUxFA/8XkYsQp569kITAfomEjvlsJaNVI+h98cNYdD8Oi0d +tveEPLh3xHYhNCRYpx34a/RaoAAP7KTGXXR6rjVjPWnNzG9sICBvLOve8Ro/c1cs +EFynJ56Xd2UJCS/yMnIhlRehVl9IhN5XJ+7Dv0JKHx2BG6N+ME7YZMM9jDZb0WzH +2+YJqPx99ERnDsRTIdQYgShWsTbMHTdz7MNzox/Zz6l4p7kipQOZLrknoNMb2hy8 +xh1f4SPT9kHwCV/obKSYzv7bGCYjBraetyBavIwl5LjlUySKQ+HC4zFS +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..764d2f68ca --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA256.pem new file mode 100644 index 0000000000..4327d31f43 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-des3-hmacWithSHA256.pem @@ -0,0 +1,12 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBtDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIFcxat+WIQSYCAggA +MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHOnq5nGmYd0BIIBYNxOhizI4irA +fq63+fV0k/C2HYCN7TEexoU+PiJlIm2/vlusPrTl6LnJqXTA6Y+iVelTWynnkKws +c13oHCPMTx702JwzNntsLlQo+w8cShjc02SdbJrPUxE/RCtqWo85sEZTYteGk/Lr +8GnPR3iDhB+m456PgdatqdpEsmy5EGcL3UT0kWmM5knVZfqHkx03kNxtMLV4rkcO +SPsnezcI2MjyfC4DhXGBBaso48RYZ/905INvmLIRbBX1MHeYtRDpKQlyGQZiSyew +TqyougDnYqSUs8yKhSsdHqUwltnZmIuJXEtcvtiA/Wmpt4fxxiPtJ8XYWyHreEMf +w1CevyEbkUdOWsa7zsW10337Lr8DY4Ax/tOTqtARioOBSYdRwlhluBuh91bK5eBt +ABidgQolNZ3SqIaBV+sEOX+gBDtpu/Lg4jAUO4eokKbhOlKL5YwueiSVrj/cWuKe +6Js/MZGBcX0= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.der Binary files differnew file mode 100644 index 0000000000..c89a60b8ef --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.pem new file mode 100644 index 0000000000..46a31fa316 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-2DES.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBgjAcBgoqhkiG9w0BDAEEMA4ECEOdj9GT2jg/AgIIAASCAWARTCBBDzPLkY0e +Y60arOJ+bkKuaJJ/OX0IGH3znnFQ5ZmtoToZtoNOaNXG0rAc3PVmkGOW6Uh5nIp8 +D5DrESPzbxltyONQb1TGW5InZKGpO/Vajqy6gDQ/QMR3eXDJsnvSvQ/eCEwqNHXA +64V1A7Nw0Wfcv6M9qnFMB1LJmcC6Jpt3GTJeoqq+OlsUWqlUWfgIAdOng0ouvVJ0 +u04hGbOJyd5Ejov3PxWc7uXT1X4kcqUNiWFYwvjGocDByzFrW9tmoxyU3ESULdP2 +Fx910xvZnalZBFHQFIOufim/eHKdpND/c4YohgaTULsDwH4EAuZGyqB5kfP0lt8R +gx3I3jpHiRZXTdzZW7LWIXqGYF+2AaQMTU7qNiNrgWCQ7k8h9YzM1Upzk6YLYsZ9 +UhlbbzkSbJOhlU/1Rce2q0Y7Fsi3bbJqZZ9o0xBK2aP3ApBau9/+ErNtAmuB6EXh +aKIfeqqn +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.der Binary files differnew file mode 100644 index 0000000000..cf1811f406 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.pem new file mode 100644 index 0000000000..492b530b00 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-3DES.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBgjAcBgoqhkiG9w0BDAEDMA4ECEil5BSrj6LeAgIIAASCAWC/kwcthGmbTuVE +ebfLDlGvn4tnSHzINEquDg3nz555OHreT0DDj0OWtsUY9IqVv/OrukJUXfQnj+jk +j1TfMi0/MHRRbjmSHf3wGl8LUBtYzn0tmhfvoBtlCt7v3+VQo6QY/hXWbQmOopmx +vNb8OfRWj0uLjGxeJpaOqsj0gZjbXUQcSXwaZyAG74qNCQMHs6Y/h93Xu9dVhe5h +B+PtPgT4kFAHV72wiWkxZlyDkonAlhX4wpoEuzYFl+Mc+IZ0ss/bvhswVjjBYx5d +v1fpOQcVPvjOFPdlm67WYfPyXWgIwP69JSwi7ywyg8GABPfgsNL4Kz9VhH/tanZL +ZCFnZvHUAX12x39F6RAWxSw8r22jDtsDQQ9sO39PleIhtvfndquEQVx9rswrqKXD +PxYTOiZ5fEoCxQb1/p9SBMC3rvVotMyuHueLyRYdxwYQOqagRwikJuYLYUK9ibMU +bBDHp4Mc +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.der Binary files differnew file mode 100644 index 0000000000..0cb3d5c28e --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem new file mode 100644 index 0000000000..e74b99eb29 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-128.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBgjAcBgoqhkiG9w0BDAEFMA4ECC8vkmUmfY3WAgIIAASCAWDzODlrgQ+L8c/5 +YMHk8uVGYRK2cmFRVUIgHz8pnxx7BPnR3mb2igUVk55fi74bIgmk+KGnoRhG2jsq +dXV2rfTHGZ/AdjwgwA1yLNinhy0BUObMQ4QOrtkNpq4K2MUK8fcvLNRvEhMni0dx +r41Q4C+bnnx70td2iT7/0efgs4YfT2uxQq//MvI5vfyvCSx71GY6xJdc1wwGbqT7 +KoY5ARvL78Tb1wi6UmdsJza+DU1yO5z1TPAu+a0bawT4LWWAOj2+x/cglsq/La0g +lJ797NBFWI0Uq5YCMBGzwv3RY2fHtVbt/TSav2Q4oIuaoxLkYRZ2HwUDseMJ4O5A +46QZqHZyKSQX25pm/gq7kr6bbX/JrGVoWD5ynlaUiVBxyoKHaHRojlbyQTASxjMb +XZG7jUDpcM4JQ1LKtrNmU72YYGyfrNZhr1TFmSw5ayVfw8vgO4U3Y+JeHXKZOqW/ +QTisuu3L +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.der Binary files differnew file mode 100644 index 0000000000..404b593068 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem new file mode 100644 index 0000000000..ddd0106a71 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC2-40.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBgjAcBgoqhkiG9w0BDAEGMA4ECAicFoXG2QPWAgIIAASCAWB0Uk5k6u0IoN6G +CB6y4EpIc8lgEGIxO0iAMGYdQd/b/yYVSH5yWBJTM/WJCtIx0GPSYQUjnFh9IQOr +AAimL90mlzCfdYHAJ7kS2rNCTWJeqXwPeOJmFpmI8oySUE6uflu16ZHXLuZoDIrZ +O8JZnKF7KlQLIgFn5qiqRuuQrDKiildLChXtsU8nW1B+xBy89qkqWekw7nyN4J68 +3wsm7gzrT7PUNFl9XnWFw+FmSZag8sdqgvDZ0RiFdMAYeFWfTx70KY3PnSYOzoSw +kYVgviMhcLFxulMsvIsVPaG4cr9JX/eNZfVFH8jnkm3Nqtdl647oO3LfwkXPKz/W +1JNyd3/p2IOPnkMi8KMFvuhce3zoD77wZJ85PhbsW4YEsB+hxfk8N5ILJysrMf7J +4BDxc4yYmV4mWna6aUiWnn4gD5ux1qxTUUGWf3tgnyHRGYS0d0xQUQzbCffeW7vj +PDGpGqbl +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.der Binary files differnew file mode 100644 index 0000000000..4d13899e1b --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem new file mode 100644 index 0000000000..a9939f278c --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-128.pem @@ -0,0 +1,10 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBfDAcBgoqhkiG9w0BDAEBMA4ECJJ4g6/+vh0mAgIIAASCAVo/PESsuYWux3ET +RNX7Hk3fhm/ZFx5/lvpTFqRy1hMpA6i9liFeLpI13FHarasc92chFLhj+s5JZ+Qg +WMlDz1nQf4c79dTxVpXGjf4pByXpqr+ksyb0Wo1/NayhjurqrVDpQf0kOdlCNKqn +8IW2CB5zftsOn8PVkPF3/riUih4xYwvW2w+8rs8RRN0vX9PUsYjtqmq0KnpiWzut +Tt/D0WJhJTlWVb5dp3nYXEZPM3IOHzvmqBDgbv66JgofpiKn7YXmDUx+edNuWwX2 ++GTih5yaRp2IqGbVYT/3eeiyJCpeNLlHJdUDui7zWkiTKpL+RU5VsV4DSjVT7SGV +tpMQM6HnaCDEr+y4GxUB3/2w8Ua9vZwJ/DRa0vS+N6N+gZfrD78j511h1JOl5EbD +35P6xNWZBeQbO6pJMKGq5qj/IBgbOQp9xpRtmdTezcY/lys27qN+35vhJSTQy7XG +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.der Binary files differnew file mode 100644 index 0000000000..cec667ea89 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem new file mode 100644 index 0000000000..22667c1d9c --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-pkcs12-PBE-SHA1-RC4-40.pem @@ -0,0 +1,10 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBfDAcBgoqhkiG9w0BDAECMA4ECE5xFtUDnxEJAgIIAASCAVri1/I0SyDAH3Zf +N4WTxaXJj94JqNOrHC07kckm23evvqGtINC141iSUuPz+zInB0wd0IyDZj+v8ExB +eFwKOblHhr7ZRCR0zN9IT0CHxjIVmU5W50lpJWTXcALgH+SW97K6jCjVdfAwSEkW +8X5/iiuhbNXu/8BTy+CBfsiVl8R4CMGhAxD922JoiQqSFA1HzrcxZiIUJ+etN6BF +YmiF5sCEhiMYMd7FbTDZ3u20dnNPu5Fn+L31aioZ+jtSyRNglVwWYZrdqGyZLlFO +QAx3AlQdiiqOPJ5rwnezTWdjac9luxhhIFFFq14b02QPu7SeYG56MvruWkwM3raf +73qbwtNE19yZ9DiWVXaeXpI84tL38E8sIQ1vthVuHtJ+6U1HUgPafVYZn+eKqiPz +UrJYbJTPL27GS2zXJnr9OrwRlGpKHQGjHo6hyg0UmZ71xuurVuHPty00Oap1CV13 +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA1.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA1.der Binary files differnew file mode 100644 index 0000000000..3860600474 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA1.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA1.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA1.pem new file mode 100644 index 0000000000..61de0e9893 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA1.pem @@ -0,0 +1,11 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBpjBIBgkqhkiG9w0BBQ0wOzAeBgkqhkiG9w0BBQwwEQQIQYOeTgwR/LsCAggA +AgEQMBkGCCqGSIb3DQMCMA0CAToECMd9tvoaH7I8BIIBWNGNJ3RipB+HrN0t6rsA +C3iOTcc4LEo03gguQ4Uxf0KyDMt7fyLpo/77m0QXLVBMW7mDjDASsaFWDzqM1OxZ +3kmV2+thdyLfnnA2l6tCDdImKWrNBYK2ogmpkJy15piwFZ/XUBrm63zP/NYCyRsF +jXOzy0FGv/xxaw9RAiGJMsvdoopHr2Lo37DeeBoXCR6gzfvyyuqzr5fbrV7agk5i +pGMAbJNKtbbCrzXOKCBDTGDUFiOtxNoDEsJy2Tx6YqotNJedyMzhZAatcL5h0a9w +r4jRLSWmHqo9WTFgcibhcXuy6cko3/wGov0Z2Pq1bPga8tWeuta74IaGLCuVWwHE +ze2nii7RWIU1oQ9ZgD6CuZnggyRT8b3/TYTQ6pra+yp99lvH48MySVJU5QEdpoOq +tUU+7z0BdEl5SALfBlQhBCEP13KhPitKcppVphxMv1cAidIHBne1YGKo +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA256.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA256.der Binary files differnew file mode 100644 index 0000000000..f4ca23ba74 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA256.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA256.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA256.pem new file mode 100644 index 0000000000..c09da71121 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8-rc2-hmacWithSHA256.pem @@ -0,0 +1,12 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIBtDBWBgkqhkiG9w0BBQ0wSTAsBgkqhkiG9w0BBQwwHwQIi1jllb1PqZcCAggA +AgEQMAwGCCqGSIb3DQIJBQAwGQYIKoZIhvcNAwIwDQIBOgQIQDijmMtzY+UEggFY +gItLu4+5cGLUWeqbt9L7tKBoLpMSYGScvjcPwiKX1tygqg1lD9saeOqSZFx3AEyd +3AlEpZSPaQpAqp61zrKV1cSYzafRyYV2R6NArgWpSZP3LggquoQHnZN/8hRtbidC +7KgB/kXP7sCWKiUj4Smh/HhkS/w0K5doxt34VicijP4q29NZ0UDQDGABC1gA7L5l +FvZrZJi6laawHJbZDb6zaHVbvL2OMclXrzLpHF269H/NYwE+3/xtUa8AhTYVRRq/ +oOByi++ap2QL32IyHbdgNEj7a9WGM58iWVW+jS9G45ChylIDG9oCg4KeHp+5sjPv +rkDsXdzXeCwFQuJ1nj/pRVR6aI3qUMM1jjQFoOQ/XrPWIBvVzXC8eYRud/rHaOdV +IH7B9kFFqwSAzzi9GtTNj1hfQ8adm54N+qq2c4JRKN/a6cSRAlwtoI344OO20ejv +2RO9QGJkkSU= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8.der Binary files differnew file mode 100644 index 0000000000..b6ef9a15a2 --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8.der diff --git a/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8.pem new file mode 100644 index 0000000000..2a71a861bf --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512-pkcs8.pem @@ -0,0 +1,10 @@ +-----BEGIN PRIVATE KEY----- +MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAwDsb+Kv6gzwj4qqN +kD5pZigHwVq+TgsAua++RsXnaWGiOWA2m2a5vM+TC9trcIAHHU2xaGjxt2UGi9b9 +mPNMoQIDAQABAkB64062Yfr7+m5WcQGevMdUbzLGAOS3r4D/M8JILCwLySrni0rV +sti1UF1X2ypna24tsRKN0CD/a8111k+yZXeBAiEA4ats1RjWHIA9tIimdi3Qj9LO +BtBs5wBaaryExZyQDFUCIQDaESne8AcqQ08gst1Ykyj0bKwl+ybSWxAzSb/52fFL +HQIgKFX9s/EmhB2f6d7q8gCqYKqrTKiAbqGvh5h+mturG6kCIQDYAeRt92nBjYcW +JtdnY+5PoE4uGUhtWtMDWuyVfDOuaQIgU9/flj81ZByBxXk5sULHUa3+eqfQKSgi +xYZorAtL3xg= +-----END PRIVATE KEY----- diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp index 27d92db3bf..ddfe52c5e4 100644 --- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp +++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp @@ -110,10 +110,10 @@ void tst_QSslKey::initTestCase() testDataDir += QLatin1String("/"); QDir dir(testDataDir + "keys"); - QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable); - QRegExp rx(QLatin1String("^(rsa|dsa|ec)-(pub|pri)-(\\d+)-?\\w*\\.(pem|der)$")); - foreach (QFileInfo fileInfo, fileInfoList) { - if (rx.indexIn(fileInfo.fileName()) >= 0) + const QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable); + QRegExp rx(QLatin1String("^(rsa|dsa|ec)-(pub|pri)-(\\d+)-?[\\w-]*\\.(pem|der)$")); + for (const QFileInfo &fileInfo : fileInfoList) { + if (rx.indexIn(fileInfo.fileName()) >= 0) { keyInfoList << KeyInfo( fileInfo, rx.cap(1) == QLatin1String("rsa") ? QSsl::Rsa : @@ -121,6 +121,7 @@ void tst_QSslKey::initTestCase() rx.cap(2) == QLatin1String("pub") ? QSsl::PublicKey : QSsl::PrivateKey, rx.cap(3).toInt(), rx.cap(4) == QLatin1String("pem") ? QSsl::Pem : QSsl::Der); + } } } @@ -163,6 +164,16 @@ void tst_QSslKey::createPlainTestRows(bool filter, QSsl::EncodingFormat format) foreach (KeyInfo keyInfo, keyInfoList) { if (filter && keyInfo.format != format) continue; +#ifdef Q_OS_WINRT + if (keyInfo.fileInfo.fileName().contains("RC2-64")) + continue; // WinRT treats RC2 as 128 bit +#endif +#if !defined(QT_NO_SSL) && defined(QT_NO_OPENSSL) // generic backend + if (keyInfo.fileInfo.fileName().contains(QRegularExpression("-aes\\d\\d\\d-"))) + continue; // No AES support in the generic back-end + if (keyInfo.fileInfo.fileName().contains("pkcs8-pkcs12")) + continue; // The generic back-end doesn't support PKCS#12 algorithms +#endif QTest::newRow(keyInfo.fileInfo.fileName().toLatin1()) << keyInfo.fileInfo.absoluteFilePath() << keyInfo.algorithm << keyInfo.type @@ -186,7 +197,10 @@ void tst_QSslKey::constructor() QFETCH(QSsl::EncodingFormat, format); QByteArray encoded = readFile(absFilePath); - QSslKey key(encoded, algorithm, format, type); + QByteArray passphrase; + if (QByteArray(QTest::currentDataTag()).contains("-pkcs8-")) + passphrase = QByteArray("1234"); + QSslKey key(encoded, algorithm, format, type, passphrase); QVERIFY(!key.isNull()); } @@ -215,9 +229,12 @@ void tst_QSslKey::constructorHandle() ? q_PEM_read_bio_PUBKEY : q_PEM_read_bio_PrivateKey); + QByteArray passphrase; + if (QByteArray(QTest::currentDataTag()).contains("-pkcs8-")) + passphrase = "1234"; BIO* bio = q_BIO_new(q_BIO_s_mem()); q_BIO_write(bio, pem.constData(), pem.length()); - QSslKey key(func(bio, nullptr, nullptr, nullptr), type); + QSslKey key(func(bio, nullptr, nullptr, static_cast<void *>(passphrase.data())), type); q_BIO_free(bio); QVERIFY(!key.isNull()); @@ -245,7 +262,10 @@ void tst_QSslKey::copyAndAssign() QFETCH(QSsl::EncodingFormat, format); QByteArray encoded = readFile(absFilePath); - QSslKey key(encoded, algorithm, format, type); + QByteArray passphrase; + if (QByteArray(QTest::currentDataTag()).contains("-pkcs8-")) + passphrase = QByteArray("1234"); + QSslKey key(encoded, algorithm, format, type, passphrase); QSslKey copied(key); QCOMPARE(key, copied); @@ -286,7 +306,10 @@ void tst_QSslKey::length() QFETCH(QSsl::EncodingFormat, format); QByteArray encoded = readFile(absFilePath); - QSslKey key(encoded, algorithm, format, type); + QByteArray passphrase; + if (QByteArray(QTest::currentDataTag()).contains("-pkcs8-")) + passphrase = QByteArray("1234"); + QSslKey key(encoded, algorithm, format, type, passphrase); QVERIFY(!key.isNull()); QCOMPARE(key.length(), length); } @@ -306,6 +329,17 @@ void tst_QSslKey::toPemOrDer() QFETCH(QSsl::KeyType, type); QFETCH(QSsl::EncodingFormat, format); + QByteArray dataTag = QByteArray(QTest::currentDataTag()); + if (dataTag.contains("-pkcs8-")) // these are encrypted + QSKIP("Encrypted PKCS#8 keys gets decrypted when loaded. So we can't compare it to the encrypted version."); +#ifndef QT_NO_OPENSSL + if (dataTag.contains("pkcs8")) + QSKIP("OpenSSL converts PKCS#8 keys to other formats, invalidating comparisons."); +#else // !openssl + if (dataTag.contains("pkcs8") && dataTag.contains("rsa")) + QSKIP("PKCS#8 RSA keys are changed into a different format in the generic back-end, meaning the comparison fails."); +#endif // openssl + QByteArray encoded = readFile(absFilePath); QSslKey key(encoded, algorithm, format, type); QVERIFY(!key.isNull()); @@ -326,6 +360,8 @@ void tst_QSslKey::toEncryptedPemOrDer_data() passwords << " " << "foobar" << "foo bar" << "aAzZ`1234567890-=~!@#$%^&*()_+[]{}\\|;:'\",.<>/?"; // ### add more (?) foreach (KeyInfo keyInfo, keyInfoList) { + if (keyInfo.fileInfo.fileName().contains("pkcs8")) + continue; // pkcs8 keys are encrypted in a different way than the other keys foreach (QString password, passwords) { const QByteArray testName = keyInfo.fileInfo.fileName().toLatin1() + '-' + (keyInfo.algorithm == QSsl::Rsa ? "RSA" : diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index 175f361071..5f2173044e 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -2,6 +2,7 @@ TEMPLATE=subdirs QT_FOR_CONFIG += network SUBDIRS=\ + qpassworddigestor \ qsslcertificate \ qsslcipher \ qsslellipticcurve \ diff --git a/tests/auto/other/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp index 074644393d..45429624f5 100644 --- a/tests/auto/other/lancelot/paintcommands.cpp +++ b/tests/auto/other/lancelot/paintcommands.cpp @@ -561,6 +561,10 @@ void PaintCommands::staticInit() "^bitmap_load\\s+([\\w.:\\/]*)\\s*([\\w.:\\/]*)$", "bitmap_load <bitmap filename> <bitmapName>\n - note that the image is stored as a pixmap", "bitmap_load :/images/bitmap.png myBitmap"); + DECL_PAINTCOMMAND("pixmap_setDevicePixelRatio", command_pixmap_setDevicePixelRatio, + "^pixmap_setDevicePixelRatio\\s+([\\w.:\\/]*)\\s+([.0-9]*)$", + "pixmap_setDevicePixelRatio <pixmapName> <dpr>", + "pixmap_setDevicePixelRatio myPixmap 2.0"); DECL_PAINTCOMMAND("image_convertToFormat", command_image_convertToFormat, "^image_convertToFormat\\s+([\\w.:\\/]*)\\s+([\\w.:\\/]+)\\s+([\\w0-9_]*)$", "image_convertToFormat <sourceImageName> <destImageName> <image format enum>", @@ -577,6 +581,10 @@ void PaintCommands::staticInit() "^image_setColorCount\\s+([\\w.:\\/]*)\\s+([0-9]*)$", "image_setColorCount <imageName> <nbColors>", "image_setColorCount myImage 128"); + DECL_PAINTCOMMAND("image_setDevicePixelRatio", command_image_setDevicePixelRatio, + "^image_setDevicePixelRatio\\s+([\\w.:\\/]*)\\s+([.0-9]*)$", + "image_setDevicePixelRatio <imageName> <dpr>", + "image_setDevicePixelRatio myImage 2.0"); DECL_PAINTCOMMANDSECTION("transformations"); DECL_PAINTCOMMAND("resetMatrix", command_resetMatrix, @@ -1761,7 +1769,9 @@ void PaintCommands::command_setBrush(QRegularExpressionMatch re) { QStringList caps = re.capturedTexts(); - QImage img = image_load<QImage>(caps.at(1)); + QImage img = m_imageMap[caps.at(1)]; // try cache first + if (img.isNull()) + img = image_load<QImage>(caps.at(1)); if (!img.isNull()) { // Assume image brush if (m_verboseMode) printf(" -(lance) setBrush(image=%s, width=%d, height=%d)\n", @@ -2132,6 +2142,20 @@ void PaintCommands::command_bitmap_load(QRegularExpressionMatch re) m_pixmapMap[name] = bm; } +void PaintCommands::command_pixmap_setDevicePixelRatio(QRegularExpressionMatch re) +{ + QStringList caps = re.capturedTexts(); + + QString name = caps.at(1); + double dpr = convertToDouble(caps.at(2)); + + if (m_verboseMode) + printf(" -(lance) pixmap_setDevicePixelRatio(%s), %.1f -> %.1f\n", + qPrintable(name), m_pixmapMap[name].devicePixelRatioF(), dpr); + + m_pixmapMap[name].setDevicePixelRatio(dpr); +} + /***************************************************************************************************/ void PaintCommands::command_pixmap_setMask(QRegularExpressionMatch re) { @@ -2197,6 +2221,21 @@ void PaintCommands::command_image_setColor(QRegularExpressionMatch re) } /***************************************************************************************************/ +void PaintCommands::command_image_setDevicePixelRatio(QRegularExpressionMatch re) +{ + QStringList caps = re.capturedTexts(); + + QString name = caps.at(1); + double dpr = convertToDouble(caps.at(2)); + + if (m_verboseMode) + printf(" -(lance) image_setDevicePixelRatio(%s), %.1f -> %.1f\n", + qPrintable(name), m_imageMap[name].devicePixelRatioF(), dpr); + + m_imageMap[name].setDevicePixelRatio(dpr); +} + +/***************************************************************************************************/ void PaintCommands::command_abort(QRegularExpressionMatch) { m_abort = true; diff --git a/tests/auto/other/lancelot/paintcommands.h b/tests/auto/other/lancelot/paintcommands.h index e3fb96744c..83e3bbc11c 100644 --- a/tests/auto/other/lancelot/paintcommands.h +++ b/tests/auto/other/lancelot/paintcommands.h @@ -229,10 +229,12 @@ private: void command_pixmap_load(QRegularExpressionMatch re); void command_pixmap_setMask(QRegularExpressionMatch re); void command_bitmap_load(QRegularExpressionMatch re); + void command_pixmap_setDevicePixelRatio(QRegularExpressionMatch re); void command_image_convertToFormat(QRegularExpressionMatch re); void command_image_load(QRegularExpressionMatch re); void command_image_setColor(QRegularExpressionMatch re); void command_image_setColorCount(QRegularExpressionMatch re); + void command_image_setDevicePixelRatio(QRegularExpressionMatch re); // commands: transformation void command_resetMatrix(QRegularExpressionMatch re); diff --git a/tests/auto/other/lancelot/scripts/image_dpr.qps b/tests/auto/other/lancelot/scripts/image_dpr.qps new file mode 100644 index 0000000000..7d3ca3099c --- /dev/null +++ b/tests/auto/other/lancelot/scripts/image_dpr.qps @@ -0,0 +1,43 @@ + +setRenderHint Antialiasing true +setRenderHint SmoothPixmapTransform true + +image_load sign.png img1 +pixmap_load sign.png pix1 + +begin_block drawIt +save + +drawImage img1 20 20 -1 -1 +drawRect 17.5 17.5 85 85 + +setBrush img1 +setPen NoPen +drawRect 20 120 120 120 + +brushRotate 45 +drawRect 20 260 120 120 + +setBrush NoBrush +drawTiledPixmap pix1 20 400 120 120 + +restore +end_block + +save +translate 150 0 +rotate -5 +repeat_block drawIt +restore + +image_setDevicePixelRatio img1 2.0 +pixmap_setDevicePixelRatio pix1 2.0 +translate 400 0 +repeat_block drawIt + +save +translate 150 0 +rotate -5 +repeat_block drawIt +restore + diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index b5d45adadb..a593deb90e 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -876,6 +876,10 @@ void tst_QAccessibility::applicationTest() QCOMPARE(interface->child(1), static_cast<QAccessibleInterface*>(0)); QCOMPARE(interface->childCount(), 0); + // Check that asking for the application interface twice returns the same object + QAccessibleInterface *app2 = QAccessible::queryAccessibleInterface(qApp); + QCOMPARE(interface, app2); + QWidget widget; widget.show(); qApp->setActiveWindow(&widget); diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm index e9407fd903..4ebf7a37f9 100644 --- a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm +++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm @@ -101,9 +101,9 @@ QDebug operator<<(QDebug dbg, AXErrorTag err) @implementation TestAXObject -- (id) initWithAXUIElementRef: (AXUIElementRef) ref { +- (instancetype)initWithAXUIElementRef:(AXUIElementRef)ref { - if ( self = [super init] ) { + if ((self = [super init])) { reference = ref; } return self; diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp index bb3624a51d..7f874a843d 100644 --- a/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp +++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp @@ -101,8 +101,7 @@ void tst_QAbstractPrintDialog::setMinMax() QPrinter printer; MyAbstractPrintDialog obj1(&printer); obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None)); - QEXPECT_FAIL("", "QTBUG-22637", Abort); - QCOMPARE(obj1.minPage(), 1); + QCOMPARE(obj1.minPage(), 0); QCOMPARE(obj1.maxPage(), INT_MAX); QVERIFY(!obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange)); obj1.setMinMax(2,5); diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index 4f86e74117..a65dd0bf8f 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -1026,7 +1026,7 @@ void tst_QPrinter::duplex() pdf.setOutputFormat(QPrinter::PdfFormat); QCOMPARE(pdf.duplex(), QPrinter::DuplexNone); pdf.setDuplex(QPrinter::DuplexAuto); - QCOMPARE(pdf.duplex(), QPrinter::DuplexAuto); + QCOMPARE(pdf.duplex(), QPrinter::DuplexNone); // pdf doesn't have the concept of duplex QPrinter native; if (native.outputFormat() == QPrinter::NativeFormat) { @@ -1071,7 +1071,7 @@ void tst_QPrinter::doubleSidedPrinting() pdf.setOutputFormat(QPrinter::PdfFormat); QCOMPARE(pdf.doubleSidedPrinting(), false); pdf.setDoubleSidedPrinting(true); - QCOMPARE(pdf.doubleSidedPrinting(), true); + QCOMPARE(pdf.doubleSidedPrinting(), false); // pdf doesn't have the concept of duplex QPrinter native; if (native.outputFormat() == QPrinter::NativeFormat) { diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp index a662fea615..8e2c7694a5 100644 --- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp @@ -130,6 +130,10 @@ private slots: void compare_unregistered_enums(); void compare_registered_enums(); void compare_class_enums(); + void test_windowflags_data(); + void test_windowflags(); + void test_unregistered_flags_data(); + void test_unregistered_flags(); void compare_boolfuncs(); void compare_to_nullptr(); void compare_pointerfuncs(); @@ -180,6 +184,64 @@ void tst_Cmptest::compare_class_enums() QCOMPARE(MyClassEnum::MyClassEnumValue1, MyClassEnum::MyClassEnumValue2); } +void tst_Cmptest::test_windowflags_data() +{ + QTest::addColumn<Qt::WindowFlags>("actualWindowFlags"); + QTest::addColumn<Qt::WindowFlags>("expectedWindowFlags"); + + const Qt::WindowFlags windowFlags = Qt::Window + | Qt::WindowSystemMenuHint | Qt::WindowStaysOnBottomHint; + QTest::newRow("pass") + << windowFlags + << windowFlags; + QTest::newRow("fail1") + << windowFlags + << (windowFlags | Qt::FramelessWindowHint); + QTest::newRow("fail2") + << Qt::WindowFlags(Qt::Window) + << Qt::WindowFlags(Qt::Window | Qt::FramelessWindowHint); +} + +void tst_Cmptest::test_windowflags() +{ + QFETCH(Qt::WindowFlags, actualWindowFlags); + QFETCH(Qt::WindowFlags, expectedWindowFlags); + QCOMPARE(actualWindowFlags, expectedWindowFlags); +} + +enum UnregisteredEnum { + UnregisteredEnumValue1 = 0x1, + UnregisteredEnumValue2 = 0x2, + UnregisteredEnumValue3 = 0x4 +}; + +typedef QFlags<UnregisteredEnum> UnregisteredFlags; + +Q_DECLARE_METATYPE(UnregisteredFlags); + +void tst_Cmptest::test_unregistered_flags_data() +{ + QTest::addColumn<UnregisteredFlags>("actualFlags"); + QTest::addColumn<UnregisteredFlags>("expectedFlags"); + + QTest::newRow("pass") + << UnregisteredFlags(UnregisteredEnumValue1) + << UnregisteredFlags(UnregisteredEnumValue1); + QTest::newRow("fail1") + << UnregisteredFlags(UnregisteredEnumValue1 | UnregisteredEnumValue2) + << UnregisteredFlags(UnregisteredEnumValue1 | UnregisteredEnumValue3); + QTest::newRow("fail2") + << UnregisteredFlags(UnregisteredEnumValue1) + << UnregisteredFlags(UnregisteredEnumValue1 | UnregisteredEnumValue3); +} + +void tst_Cmptest::test_unregistered_flags() +{ + QFETCH(UnregisteredFlags, actualFlags); + QFETCH(UnregisteredFlags, expectedFlags); + QCOMPARE(actualFlags, expectedFlags); +} + static bool boolfunc() { return true; } static bool boolfunc2() { return true; } diff --git a/tests/auto/testlib/selftests/expected_assert.tap b/tests/auto/testlib/selftests/expected_assert.tap new file mode 100644 index 0000000000..4cd26848ac --- /dev/null +++ b/tests/auto/testlib/selftests/expected_assert.tap @@ -0,0 +1,16 @@ +TAP version 13 +# tst_Assert +ok 1 - initTestCase() +ok 2 - testNumber1() +# ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0 +not ok 3 - testNumber2() + --- + # Received a fatal error. + at: tst_Assert::testNumber2() (Unknown file:0) + file: Unknown file + line: 0 + ... +1..3 +# tests 3 +# pass 2 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_badxml.tap b/tests/auto/testlib/selftests/expected_badxml.tap new file mode 100644 index 0000000000..7aa4f11829 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_badxml.tap @@ -0,0 +1,61 @@ +TAP version 13 +# tst_BadXml +ok 1 - initTestCase() +# a message +not ok 2 - badDataTag(fail end cdata ]]> text ]]> more text) + --- + # a failure + at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:101) + file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp + line: 101 + ... +# a message +ok 3 - badDataTag(pass end cdata ]]> text ]]> more text) +# a message +not ok 4 - badDataTag(fail quotes " text" more text) + --- + # a failure + at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:101) + file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp + line: 101 + ... +# a message +ok 5 - badDataTag(pass quotes " text" more text) +# a message +not ok 6 - badDataTag(fail xml close > open < tags < text) + --- + # a failure + at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:101) + file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp + line: 101 + ... +# a message +ok 7 - badDataTag(pass xml close > open < tags < text) +# a message +not ok 8 - badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) + --- + # a failure + at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:101) + file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp + line: 101 + ... +# a message +ok 9 - badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) +# end cdata ]]> text ]]> more text +ok 10 - badMessage(string 0) +# quotes " text" more text +ok 11 - badMessage(string 1) +# xml close > open < tags < text +ok 12 - badMessage(string 2) +# all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs +ok 13 - badMessage(string 3) +not ok 14 - failWithNoFile() + --- + # failure message + ... +ok 15 - encoding() # SKIP Skipped for text due to unpredictable console encoding. +ok 16 - cleanupTestCase() +1..16 +# tests 16 +# pass 10 +# fail 5 diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.tap b/tests/auto/testlib/selftests/expected_benchlibcounting.tap new file mode 100644 index 0000000000..e7a4280278 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.tap @@ -0,0 +1,17 @@ +TAP version 13 +# tst_BenchlibCounting +ok 1 - initTestCase() +ok 2 - passingBenchmark() +ok 3 - skippingBenchmark() # SKIP This is a skipping benchmark +not ok 4 - failingBenchmark() + --- + # This is a failing benchmark + at: tst_BenchlibCounting::failingBenchmark() (qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp:58) + file: qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp + line: 58 + ... +ok 5 - cleanupTestCase() +1..5 +# tests 5 +# pass 3 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.tap b/tests/auto/testlib/selftests/expected_benchlibeventcounter.tap new file mode 100644 index 0000000000..02c65e59da --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.tap @@ -0,0 +1,15 @@ +TAP version 13 +# tst_BenchlibEventCounter +ok 1 - initTestCase() +ok 2 - events(0) +ok 3 - events(1) +ok 4 - events(10) +ok 5 - events(100) +ok 6 - events(500) +ok 7 - events(5000) +ok 8 - events(100000) +ok 9 - cleanupTestCase() +1..9 +# tests 9 +# pass 9 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.tap b/tests/auto/testlib/selftests/expected_benchlibtickcounter.tap new file mode 100644 index 0000000000..85d7f10ea0 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_BenchlibTickCounter +ok 1 - initTestCase() +ok 2 - threeBillionTicks() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.tap b/tests/auto/testlib/selftests/expected_benchlibwalltime.tap new file mode 100644 index 0000000000..7653ccbeb3 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.tap @@ -0,0 +1,11 @@ +TAP version 13 +# tst_BenchlibWalltime +ok 1 - initTestCase() +ok 2 - waitForOneThousand() +ok 3 - waitForFourThousand() +ok 4 - qbenchmark_once() +ok 5 - cleanupTestCase() +1..5 +# tests 5 +# pass 5 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml index d47967a445..58b5a5e530 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.lightxml +++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml @@ -29,6 +29,42 @@ </Incident> <Duration msecs="0"/> </TestFunction> +<TestFunction name="test_windowflags"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[pass]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[fail1]]></DataTag> + <Description><![CDATA[Compared values are not the same + Actual (actualWindowFlags) : Window|WindowSystemMenuHint|WindowStaysOnBottomHint + Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[fail2]]></DataTag> + <Description><![CDATA[Compared values are not the same + Actual (actualWindowFlags) : Window + Expected (expectedWindowFlags): Window|FramelessWindowHint]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="test_unregistered_flags"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[pass]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[fail1]]></DataTag> + <Description><![CDATA[Compared values are not the same + Actual (actualFlags) : 0x3 + Expected (expectedFlags): 0x5]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[fail2]]></DataTag> + <Description><![CDATA[Compared values are not the same + Actual (actualFlags) : 0x1 + Expected (expectedFlags): 0x5]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> <TestFunction name="compare_boolfuncs"> <Incident type="pass" file="" line="0" /> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_cmptest.tap b/tests/auto/testlib/selftests/expected_cmptest.tap new file mode 100644 index 0000000000..238db2fc2b --- /dev/null +++ b/tests/auto/testlib/selftests/expected_cmptest.tap @@ -0,0 +1,456 @@ +TAP version 13 +# tst_Cmptest +ok 1 - initTestCase() +not ok 2 - compare_unregistered_enums() + --- + # Compared values are not the same + at: tst_Cmptest::compare_unregistered_enums() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:171) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 171 + ... +not ok 3 - compare_registered_enums() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: Sunday (Qt::Sunday) + found: Monday (Qt::Monday) + expected: Sunday (Qt::Sunday) + actual: Monday (Qt::Monday) + at: tst_Cmptest::compare_registered_enums() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:178) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 178 + ... +not ok 4 - compare_class_enums() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: MyClassEnumValue2 (MyClassEnum::MyClassEnumValue2) + found: MyClassEnumValue1 (MyClassEnum::MyClassEnumValue1) + expected: MyClassEnumValue2 (MyClassEnum::MyClassEnumValue2) + actual: MyClassEnumValue1 (MyClassEnum::MyClassEnumValue1) + at: tst_Cmptest::compare_class_enums() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:184) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 184 + ... +ok 5 - test_windowflags(pass) +not ok 6 - test_windowflags(fail1) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint (expectedWindowFlags) + found: Window|WindowSystemMenuHint|WindowStaysOnBottomHint (actualWindowFlags) + expected: Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint (expectedWindowFlags) + actual: Window|WindowSystemMenuHint|WindowStaysOnBottomHint (actualWindowFlags) + at: tst_Cmptest::test_windowflags() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:209) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 209 + ... +not ok 7 - test_windowflags(fail2) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: Window|FramelessWindowHint (expectedWindowFlags) + found: Window (actualWindowFlags) + expected: Window|FramelessWindowHint (expectedWindowFlags) + actual: Window (actualWindowFlags) + at: tst_Cmptest::test_windowflags() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:209) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 209 + ... +ok 8 - test_unregistered_flags(pass) +not ok 9 - test_unregistered_flags(fail1) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: 0x5 (expectedFlags) + found: 0x3 (actualFlags) + expected: 0x5 (expectedFlags) + actual: 0x3 (actualFlags) + at: tst_Cmptest::test_unregistered_flags() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:242) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 242 + ... +not ok 10 - test_unregistered_flags(fail2) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: 0x5 (expectedFlags) + found: 0x1 (actualFlags) + expected: 0x5 (expectedFlags) + actual: 0x1 (actualFlags) + at: tst_Cmptest::test_unregistered_flags() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:242) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 242 + ... +ok 11 - compare_boolfuncs() +ok 12 - compare_to_nullptr() +ok 13 - compare_pointerfuncs() +not ok 14 - compare_tostring(int, string) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVariant(QString,hi) (expected) + found: QVariant(int,123) (actual) + expected: QVariant(QString,hi) (expected) + actual: QVariant(int,123) (actual) + at: tst_Cmptest::compare_tostring() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:331) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 331 + ... +ok 15 - compare_tostring(both invalid) +not ok 16 - compare_tostring(null hash, invalid) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVariant() (expected) + found: QVariant(QVariantHash) (actual) + expected: QVariant() (expected) + actual: QVariant(QVariantHash) (actual) + at: tst_Cmptest::compare_tostring() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:331) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 331 + ... +not ok 17 - compare_tostring(string, null user type) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVariant(PhonyClass) (expected) + found: QVariant(QString,A simple string) (actual) + expected: QVariant(PhonyClass) (expected) + actual: QVariant(QString,A simple string) (actual) + at: tst_Cmptest::compare_tostring() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:331) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 331 + ... +not ok 18 - compare_tostring(both non-null user type) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVariant(PhonyClass,<value not representable as string>) (expected) + found: QVariant(PhonyClass,<value not representable as string>) (actual) + expected: QVariant(PhonyClass,<value not representable as string>) (expected) + actual: QVariant(PhonyClass,<value not representable as string>) (actual) + at: tst_Cmptest::compare_tostring() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:331) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 331 + ... +ok 19 - compareQStringLists(empty lists) +ok 20 - compareQStringLists(equal lists) +not ok 21 - compareQStringLists(last item different) + --- + type: QCOMPARE + message: Compared lists differ at index 2. + wanted: "DIFFERS" (opB) + found: "string3" (opA) + expected: "DIFFERS" (opB) + actual: "string3" (opA) + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 22 - compareQStringLists(second-last item different) + --- + type: QCOMPARE + message: Compared lists differ at index 2. + wanted: "DIFFERS" (opB) + found: "string3" (opA) + expected: "DIFFERS" (opB) + actual: "string3" (opA) + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 23 - compareQStringLists(prefix) + --- + # Compared lists have different sizes. + Actual (opA) size: 2 + Expected (opB) size: 1 + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 24 - compareQStringLists(short list second) + --- + # Compared lists have different sizes. + Actual (opA) size: 12 + Expected (opB) size: 1 + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 25 - compareQStringLists(short list first) + --- + # Compared lists have different sizes. + Actual (opA) size: 1 + Expected (opB) size: 12 + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 26 - compareQListInt() + --- + type: QCOMPARE + message: Compared lists differ at index 2. + wanted: 4 (int2) + found: 3 (int1) + expected: 4 (int2) + actual: 3 (int1) + at: tst_Cmptest::compareQListInt() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:432) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 432 + ... +not ok 27 - compareQListDouble() + --- + type: QCOMPARE + message: Compared lists differ at index 0. + wanted: 1 (double2) + found: 1.5 (double1) + expected: 1 (double2) + actual: 1.5 (double1) + at: tst_Cmptest::compareQListDouble() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:439) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 439 + ... +ok 28 - compareQColor(Qt::yellow vs "yellow") +not ok 29 - compareQColor(Qt::yellow vs Qt::green) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: #ff00ff00 (colorB) + found: #ffffff00 (colorA) + expected: #ff00ff00 (colorB) + actual: #ffffff00 (colorA) + at: tst_Cmptest::compareQColor() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:458) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 458 + ... +not ok 30 - compareQColor(0x88ff0000 vs 0xffff0000) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: #ffff0000 (colorB) + found: #88ff0000 (colorA) + expected: #ffff0000 (colorB) + actual: #88ff0000 (colorA) + at: tst_Cmptest::compareQColor() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:458) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 458 + ... +ok 31 - compareQPixmaps(both null) +not ok 32 - compareQPixmaps(one null) + --- + type: QCOMPARE + message: Compared QPixmaps differ. + wanted: 0 (opB).isNull() + found: 1 (opA).isNull() + expected: 0 (opB).isNull() + actual: 1 (opA).isNull() + at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:483) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 483 + ... +not ok 33 - compareQPixmaps(other null) + --- + type: QCOMPARE + message: Compared QPixmaps differ. + wanted: 1 (opB).isNull() + found: 0 (opA).isNull() + expected: 1 (opB).isNull() + actual: 0 (opA).isNull() + at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:483) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 483 + ... +ok 34 - compareQPixmaps(equal) +not ok 35 - compareQPixmaps(different size) + --- + type: QCOMPARE + message: Compared QPixmaps differ in size. + wanted: 20x20 (opB) + found: 11x20 (opA) + expected: 20x20 (opB) + actual: 11x20 (opA) + at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:483) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 483 + ... +not ok 36 - compareQPixmaps(different pixels) + --- + # Compared values are not the same + at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:483) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 483 + ... +ok 37 - compareQImages(both null) +not ok 38 - compareQImages(one null) + --- + type: QCOMPARE + message: Compared QImages differ. + wanted: 0 (opB).isNull() + found: 1 (opA).isNull() + expected: 0 (opB).isNull() + actual: 1 (opA).isNull() + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +not ok 39 - compareQImages(other null) + --- + type: QCOMPARE + message: Compared QImages differ. + wanted: 1 (opB).isNull() + found: 0 (opA).isNull() + expected: 1 (opB).isNull() + actual: 0 (opA).isNull() + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +ok 40 - compareQImages(equal) +not ok 41 - compareQImages(different size) + --- + type: QCOMPARE + message: Compared QImages differ in size. + wanted: 20x20 (opB) + found: 11x20 (opA) + expected: 20x20 (opB) + actual: 11x20 (opA) + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +not ok 42 - compareQImages(different format) + --- + type: QCOMPARE + message: Compared QImages differ in format. + wanted: 3 (opB) + found: 6 (opA) + expected: 3 (opB) + actual: 6 (opA) + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +not ok 43 - compareQImages(different pixels) + --- + # Compared values are not the same + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +ok 44 - compareQRegion(equal-empty) +not ok 45 - compareQRegion(1-empty) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QRegion(null) (rB) + found: QRegion(200x50+10+10) (rA) + expected: QRegion(null) (rB) + actual: QRegion(200x50+10+10) (rA) + at: tst_Cmptest::compareQRegion() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:533) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 533 + ... +ok 46 - compareQRegion(equal) +not ok 47 - compareQRegion(different lists) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QRegion(2 rectangles, 50x200+100+200, 200x50+10+10) (rB) + found: QRegion(200x50+10+10) (rA) + expected: QRegion(2 rectangles, 50x200+100+200, 200x50+10+10) (rB) + actual: QRegion(200x50+10+10) (rA) + at: tst_Cmptest::compareQRegion() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:533) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 533 + ... +not ok 48 - compareQVector2D() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVector2D(1, 3) (v2b) + found: QVector2D(1, 2) (v2a) + expected: QVector2D(1, 3) (v2b) + actual: QVector2D(1, 2) (v2a) + at: tst_Cmptest::compareQVector2D() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:542) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 542 + ... +not ok 49 - compareQVector3D() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVector3D(1, 3, 3) (v3b) + found: QVector3D(1, 2, 3) (v3a) + expected: QVector3D(1, 3, 3) (v3b) + actual: QVector3D(1, 2, 3) (v3a) + at: tst_Cmptest::compareQVector3D() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:551) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 551 + ... +not ok 50 - compareQVector4D() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVector4D(1, 3, 3, 4) (v4b) + found: QVector4D(1, 2, 3, 4) (v4a) + expected: QVector4D(1, 3, 3, 4) (v4b) + actual: QVector4D(1, 2, 3, 4) (v4a) + at: tst_Cmptest::compareQVector4D() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:560) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 560 + ... +not ok 51 - verify() + --- + type: QVERIFY + message: Verification failed + wanted: true (opaqueFunc() < 2) + found: false (opaqueFunc() < 2) + expected: true (opaqueFunc() < 2) + actual: false (opaqueFunc() < 2) + at: tst_Cmptest::verify() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:572) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 572 + ... +not ok 52 - verify2() + --- + type: QVERIFY + message: 42 + wanted: true (opaqueFunc() < 2) + found: false (opaqueFunc() < 2) + expected: true (opaqueFunc() < 2) + actual: false (opaqueFunc() < 2) + at: tst_Cmptest::verify2() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:578) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 578 + ... +not ok 53 - tryVerify() + --- + type: QVERIFY + message: Verification failed + wanted: true (opaqueFunc() < 2) + found: false (opaqueFunc() < 2) + expected: true (opaqueFunc() < 2) + actual: false (opaqueFunc() < 2) + at: tst_Cmptest::tryVerify() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:584) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 584 + ... +not ok 54 - tryVerify2() + --- + type: QVERIFY + message: 42 + wanted: true (opaqueFunc() < 2) + found: false (opaqueFunc() < 2) + expected: true (opaqueFunc() < 2) + actual: false (opaqueFunc() < 2) + at: tst_Cmptest::tryVerify2() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:590) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 590 + ... +ok 55 - verifyExplicitOperatorBool() +ok 56 - cleanupTestCase() +1..56 +# tests 56 +# pass 18 +# fail 38 diff --git a/tests/auto/testlib/selftests/expected_cmptest.teamcity b/tests/auto/testlib/selftests/expected_cmptest.teamcity index a0dc509279..422d0cbfdf 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.teamcity +++ b/tests/auto/testlib/selftests/expected_cmptest.teamcity @@ -10,6 +10,22 @@ ##teamcity[testStarted name='compare_class_enums()' flowId='tst_Cmptest'] ##teamcity[testFailed name='compare_class_enums()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1|n Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_class_enums()' flowId='tst_Cmptest'] +##teamcity[testStarted name='test_windowflags(pass)' flowId='tst_Cmptest'] +##teamcity[testFinished name='test_windowflags(pass)' flowId='tst_Cmptest'] +##teamcity[testStarted name='test_windowflags(fail1)' flowId='tst_Cmptest'] +##teamcity[testFailed name='test_windowflags(fail1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (actualWindowFlags) : Window||WindowSystemMenuHint||WindowStaysOnBottomHint|n Expected (expectedWindowFlags): Window||FramelessWindowHint||WindowSystemMenuHint||WindowStaysOnBottomHint' flowId='tst_Cmptest'] +##teamcity[testFinished name='test_windowflags(fail1)' flowId='tst_Cmptest'] +##teamcity[testStarted name='test_windowflags(fail2)' flowId='tst_Cmptest'] +##teamcity[testFailed name='test_windowflags(fail2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (actualWindowFlags) : Window|n Expected (expectedWindowFlags): Window||FramelessWindowHint' flowId='tst_Cmptest'] +##teamcity[testFinished name='test_windowflags(fail2)' flowId='tst_Cmptest'] +##teamcity[testStarted name='test_unregistered_flags(pass)' flowId='tst_Cmptest'] +##teamcity[testFinished name='test_unregistered_flags(pass)' flowId='tst_Cmptest'] +##teamcity[testStarted name='test_unregistered_flags(fail1)' flowId='tst_Cmptest'] +##teamcity[testFailed name='test_unregistered_flags(fail1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (actualFlags) : 0x3|n Expected (expectedFlags): 0x5' flowId='tst_Cmptest'] +##teamcity[testFinished name='test_unregistered_flags(fail1)' flowId='tst_Cmptest'] +##teamcity[testStarted name='test_unregistered_flags(fail2)' flowId='tst_Cmptest'] +##teamcity[testFailed name='test_unregistered_flags(fail2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (actualFlags) : 0x1|n Expected (expectedFlags): 0x5' flowId='tst_Cmptest'] +##teamcity[testFinished name='test_unregistered_flags(fail2)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_boolfuncs()' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_boolfuncs()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_to_nullptr()' flowId='tst_Cmptest'] diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt index 78df990dea..e1aa81c1a1 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.txt +++ b/tests/auto/testlib/selftests/expected_cmptest.txt @@ -11,6 +11,24 @@ FAIL! : tst_Cmptest::compare_class_enums() Compared values are not the same Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1 Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2 Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] +PASS : tst_Cmptest::test_windowflags(pass) +FAIL! : tst_Cmptest::test_windowflags(fail1) Compared values are not the same + Actual (actualWindowFlags) : Window|WindowSystemMenuHint|WindowStaysOnBottomHint + Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] +FAIL! : tst_Cmptest::test_windowflags(fail2) Compared values are not the same + Actual (actualWindowFlags) : Window + Expected (expectedWindowFlags): Window|FramelessWindowHint + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] +PASS : tst_Cmptest::test_unregistered_flags(pass) +FAIL! : tst_Cmptest::test_unregistered_flags(fail1) Compared values are not the same + Actual (actualFlags) : 0x3 + Expected (expectedFlags): 0x5 + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] +FAIL! : tst_Cmptest::test_unregistered_flags(fail2) Compared values are not the same + Actual (actualFlags) : 0x1 + Expected (expectedFlags): 0x5 + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compare_boolfuncs() PASS : tst_Cmptest::compare_to_nullptr() PASS : tst_Cmptest::compare_pointerfuncs() @@ -138,5 +156,5 @@ FAIL! : tst_Cmptest::tryVerify2() 'opaqueFunc() < 2' returned FALSE. (42) Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::verifyExplicitOperatorBool() PASS : tst_Cmptest::cleanupTestCase() -Totals: 16 passed, 34 failed, 0 skipped, 0 blacklisted, 0ms +Totals: 18 passed, 38 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Cmptest ********* diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml index 01b725f247..1c5a17631a 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xml +++ b/tests/auto/testlib/selftests/expected_cmptest.xml @@ -31,6 +31,42 @@ </Incident> <Duration msecs="0"/> </TestFunction> +<TestFunction name="test_windowflags"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[pass]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[fail1]]></DataTag> + <Description><![CDATA[Compared values are not the same + Actual (actualWindowFlags) : Window|WindowSystemMenuHint|WindowStaysOnBottomHint + Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[fail2]]></DataTag> + <Description><![CDATA[Compared values are not the same + Actual (actualWindowFlags) : Window + Expected (expectedWindowFlags): Window|FramelessWindowHint]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="test_unregistered_flags"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[pass]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[fail1]]></DataTag> + <Description><![CDATA[Compared values are not the same + Actual (actualFlags) : 0x3 + Expected (expectedFlags): 0x5]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[fail2]]></DataTag> + <Description><![CDATA[Compared values are not the same + Actual (actualFlags) : 0x1 + Expected (expectedFlags): 0x5]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> <TestFunction name="compare_boolfuncs"> <Incident type="pass" file="" line="0" /> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.xunitxml index 812696ffcf..99823d1c1c 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xunitxml +++ b/tests/auto/testlib/selftests/expected_cmptest.xunitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite errors="0" failures="34" tests="24" name="tst_Cmptest"> +<testsuite errors="0" failures="38" tests="26" name="tst_Cmptest"> <properties> <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> @@ -19,6 +19,22 @@ Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1 Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2" result="fail"/> </testcase> + <testcase result="fail" name="test_windowflags"> + <failure tag="fail1" message="Compared values are not the same + Actual (actualWindowFlags) : Window|WindowSystemMenuHint|WindowStaysOnBottomHint + Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint" result="fail"/> + <failure tag="fail2" message="Compared values are not the same + Actual (actualWindowFlags) : Window + Expected (expectedWindowFlags): Window|FramelessWindowHint" result="fail"/> + </testcase> + <testcase result="fail" name="test_unregistered_flags"> + <failure tag="fail1" message="Compared values are not the same + Actual (actualFlags) : 0x3 + Expected (expectedFlags): 0x5" result="fail"/> + <failure tag="fail2" message="Compared values are not the same + Actual (actualFlags) : 0x1 + Expected (expectedFlags): 0x5" result="fail"/> + </testcase> <testcase result="pass" name="compare_boolfuncs"/> <testcase result="pass" name="compare_to_nullptr"/> <testcase result="pass" name="compare_pointerfuncs"/> diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.tap b/tests/auto/testlib/selftests/expected_commandlinedata.tap new file mode 100644 index 0000000000..1e1abfba50 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_commandlinedata.tap @@ -0,0 +1,20 @@ +TAP version 13 +# tst_DataTable +ok 1 - initTestCase() +# QVERIFY(test) +ok 2 - fiveTablePasses(fiveTablePasses_data1) +# QVERIFY(test) +ok 3 - fiveTablePasses(fiveTablePasses_data2) +# QVERIFY(test) +ok 4 - fiveTablePasses(fiveTablePasses_data3) +# QVERIFY(test) +ok 5 - fiveTablePasses(fiveTablePasses_data4) +# QVERIFY(test) +ok 6 - fiveTablePasses(fiveTablePasses_data5) +# QVERIFY(test) +ok 7 - fiveTablePasses(fiveTablePasses_data1) +ok 8 - cleanupTestCase() +1..8 +# tests 8 +# pass 8 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_counting.tap b/tests/auto/testlib/selftests/expected_counting.tap new file mode 100644 index 0000000000..ad53e8f14e --- /dev/null +++ b/tests/auto/testlib/selftests/expected_counting.tap @@ -0,0 +1,118 @@ +TAP version 13 +# tst_Counting +ok 1 - initTestCase() +ok 2 - testPassPass(row 1) +ok 3 - testPassPass(row 2) +ok 4 - testPassSkip(row 1) +ok 5 - testPassSkip(row 2) # SKIP Skipping +ok 6 - testPassFail(row 1) +not ok 7 - testPassFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testPassFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 8 - testSkipPass(row 1) # SKIP Skipping +ok 9 - testSkipPass(row 2) +ok 10 - testSkipSkip(row 1) # SKIP Skipping +ok 11 - testSkipSkip(row 2) # SKIP Skipping +ok 12 - testSkipFail(row 1) # SKIP Skipping +not ok 13 - testSkipFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testSkipFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +not ok 14 - testFailPass(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailPass() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 15 - testFailPass(row 2) +not ok 16 - testFailSkip(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailSkip() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 17 - testFailSkip(row 2) # SKIP Skipping +not ok 18 - testFailFail(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +not ok 19 - testFailFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 20 - testFailInInit(before) +not ok 21 - testFailInInit(fail) + --- + # Fail in init() + at: tst_Counting::testFailInInit() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:221) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 221 + ... +ok 22 - testFailInInit(after) +ok 23 - testFailInCleanup(before) +# This test function should execute and then QFAIL in cleanup() +not ok 24 - testFailInCleanup(fail) + --- + # Fail in cleanup() + at: tst_Counting::testFailInCleanup() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:229) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 229 + ... +ok 25 - testFailInCleanup(after) +ok 26 - testSkipInInit(before) +ok 27 - testSkipInInit(skip) # SKIP Skip in init() +ok 28 - testSkipInInit(after) +ok 29 - testSkipInCleanup(before) +# This test function should execute and then QSKIP in cleanup() +ok 30 - testSkipInCleanup(skip) # SKIP Skip in cleanup() +ok 31 - testSkipInCleanup(after) +ok 32 - cleanupTestCase() +1..32 +# tests 32 +# pass 16 +# fail 8 diff --git a/tests/auto/testlib/selftests/expected_crashes_4.txt b/tests/auto/testlib/selftests/expected_crashes_4.txt new file mode 100644 index 0000000000..e0e4d27b0a --- /dev/null +++ b/tests/auto/testlib/selftests/expected_crashes_4.txt @@ -0,0 +1,7 @@ +********* Start testing of tst_Crashes ********* +Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +PASS : tst_Crashes::initTestCase() +QFATAL : tst_Crashes::crash() Received signal 11 + Function time: ms Total time: ms +FAIL! : tst_Crashes::crash() Received a fatal error. + Loc: [Unknown file(0)] diff --git a/tests/auto/testlib/selftests/expected_datatable.tap b/tests/auto/testlib/selftests/expected_datatable.tap new file mode 100644 index 0000000000..8a3d473b6c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_datatable.tap @@ -0,0 +1,183 @@ +TAP version 13 +# tst_DataTable +ok 1 - initTestCase() +ok 2 - singleTestFunction1() +ok 3 - singleTestFunction2() +ok 4 - fiveTablePasses(fiveTablePasses_data 1) +ok 5 - fiveTablePasses(fiveTablePasses_data 2) +ok 6 - fiveTablePasses(fiveTablePasses_data 3) +ok 7 - fiveTablePasses(fiveTablePasses_data 4) +ok 8 - fiveTablePasses(fiveTablePasses_data 5) +not ok 9 - fiveTableFailures(fiveTableFailures_data 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 10 - fiveTableFailures(fiveTableFailures_data 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 11 - fiveTableFailures(fiveTableFailures_data 3) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 12 - fiveTableFailures(fiveTableFailures_data 4) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 13 - fiveTableFailures(fiveTableFailures_data 5) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 14 - startsWithFailure(startsWithFailure_data 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::startsWithFailure() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +ok 15 - startsWithFailure(startsWithFailure_data 2) +ok 16 - startsWithFailure(startsWithFailure_data 3) +ok 17 - startsWithFailure(startsWithFailure_data 4) +ok 18 - startsWithFailure(startsWithFailure_data 5) +ok 19 - endsWithFailure(endsWithFailure 1) +ok 20 - endsWithFailure(endsWithFailure 2) +ok 21 - endsWithFailure(endsWithFailure 3) +ok 22 - endsWithFailure(endsWithFailure 4) +not ok 23 - endsWithFailure(endsWithFailure 5) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::endsWithFailure() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +ok 24 - failureInMiddle(failureInMiddle_data 1) +ok 25 - failureInMiddle(failureInMiddle_data 2) +not ok 26 - failureInMiddle(failureInMiddle_data 3) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::failureInMiddle() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +ok 27 - failureInMiddle(failureInMiddle_data 4) +ok 28 - failureInMiddle(failureInMiddle_data 5) +not ok 29 - fiveIsolatedFailures(fiveIsolatedFailures_data 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +not ok 30 - fiveIsolatedFailures(fiveIsolatedFailures_data 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +not ok 31 - fiveIsolatedFailures(fiveIsolatedFailures_data 3) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +not ok 32 - fiveIsolatedFailures(fiveIsolatedFailures_data 4) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +not ok 33 - fiveIsolatedFailures(fiveIsolatedFailures_data 5) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +ok 34 - cleanupTestCase() +1..34 +# tests 34 +# pass 21 +# fail 13 diff --git a/tests/auto/testlib/selftests/expected_datetime.tap b/tests/auto/testlib/selftests/expected_datetime.tap new file mode 100644 index 0000000000..896aeafa37 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_datetime.tap @@ -0,0 +1,46 @@ +TAP version 13 +# tst_DateTime +ok 1 - initTestCase() +not ok 2 - dateTime() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: 2000/05/03 04:03:04.000[UTC] (utc) + found: 2000/05/03 04:03:04.000[UTC+00:02] (local) + expected: 2000/05/03 04:03:04.000[UTC] (utc) + actual: 2000/05/03 04:03:04.000[UTC+00:02] (local) + at: tst_DateTime::dateTime() (qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp:52) + file: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp + line: 52 + ... +ok 3 - qurl(empty urls) +not ok 4 - qurl(empty rhs) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: Invalid URL: (operandB) + found: http://example.com (operandA) + expected: Invalid URL: (operandB) + actual: http://example.com (operandA) + at: tst_DateTime::qurl() (qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp:60) + file: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp + line: 60 + ... +not ok 5 - qurl(empty lhs) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: http://example.com (operandB) + found: Invalid URL: (operandA) + expected: http://example.com (operandB) + actual: Invalid URL: (operandA) + at: tst_DateTime::qurl() (qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp:60) + file: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp + line: 60 + ... +ok 6 - qurl(same urls) +ok 7 - cleanupTestCase() +1..7 +# tests 7 +# pass 4 +# fail 3 diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.tap b/tests/auto/testlib/selftests/expected_exceptionthrow.tap new file mode 100644 index 0000000000..d8dbf173d6 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.tap @@ -0,0 +1,14 @@ +TAP version 13 +# tst_Exception +ok 1 - initTestCase() +not ok 2 - throwException() + --- + # Caught unhandled exception + at: tst_Exception::throwException() (qtbase/src/testlib/qtestcase.cpp:1846) + file: qtbase/src/testlib/qtestcase.cpp + line: 1846 + ... +1..2 +# tests 2 +# pass 1 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_expectfail.tap b/tests/auto/testlib/selftests/expected_expectfail.tap new file mode 100644 index 0000000000..0e5dc4d982 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_expectfail.tap @@ -0,0 +1,96 @@ +TAP version 13 +# tst_ExpectFail +ok 1 - initTestCase() +# begin +not ok 2 - xfailAndContinue() # TODO This should xfail + --- + at: tst_ExpectFail::xfailAndContinue() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:65) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 65 + ... +# after +# begin +not ok 3 - xfailAndAbort() # TODO This should xfail + --- + at: tst_ExpectFail::xfailAndAbort() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:73) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 73 + ... +not ok 4 - xfailTwice() + --- + # Already expecting a fail + at: tst_ExpectFail::xfailTwice() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:83) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 83 + ... +not ok 5 - xfailWithQString() # TODO A string + --- + at: tst_ExpectFail::xfailWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:92) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 92 + ... +not ok 5 - xfailWithQString() # TODO Bug 5 (The message) + --- + at: tst_ExpectFail::xfailWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:97) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 97 + ... +ok 6 - xfailDataDrivenWithQVerify(Pass 1) +ok 7 - xfailDataDrivenWithQVerify(Pass 2) +not ok 8 - xfailDataDrivenWithQVerify(Abort) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailDataDrivenWithQVerify() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:126) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 126 + ... +not ok 9 - xfailDataDrivenWithQVerify(Continue) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailDataDrivenWithQVerify() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:126) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 126 + ... +ok 10 - xfailDataDrivenWithQCompare(Pass 1) +ok 11 - xfailDataDrivenWithQCompare(Pass 2) +not ok 12 - xfailDataDrivenWithQCompare(Abort) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailDataDrivenWithQCompare() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:160) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 160 + ... +not ok 13 - xfailDataDrivenWithQCompare(Continue) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailDataDrivenWithQCompare() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:160) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 160 + ... +ok 14 - xfailOnWrongRow(right row) +not ok 15 - xfailOnAnyRow(first row) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailOnAnyRow() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:195) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 195 + ... +not ok 16 - xfailOnAnyRow(second row) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailOnAnyRow() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:195) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 195 + ... +not ok 17 - xfailWithoutVerify(first row) + --- + # QEXPECT_FAIL was called without any subsequent verification statements + ... +not ok 18 - xfailWithoutVerify(second row) + --- + # QEXPECT_FAIL was called without any subsequent verification statements + ... +ok 19 - xpass() # TODO 'true' returned TRUE unexpectedly. () +ok 20 - xpassDataDrivenWithQVerify(XPass) # TODO 'true' returned TRUE unexpectedly. () +ok 21 - xpassDataDrivenWithQVerify(Pass) +ok 22 - xpassDataDrivenWithQCompare(XPass) # TODO QCOMPARE(1, 1) returned TRUE unexpectedly. +ok 23 - xpassDataDrivenWithQCompare(Pass) +ok 24 - cleanupTestCase() +1..24 +# tests 24 +# pass 18 +# fail 6 diff --git a/tests/auto/testlib/selftests/expected_failcleanup.tap b/tests/auto/testlib/selftests/expected_failcleanup.tap new file mode 100644 index 0000000000..2098cc1e17 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failcleanup.tap @@ -0,0 +1,20 @@ +TAP version 13 +# tst_FailCleanup +ok 1 - initTestCase() +ok 2 - aTestFunction() +not ok 3 - cleanupTestCase() + --- + type: QVERIFY + message: Fail inside cleanupTestCase + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_FailCleanup::cleanupTestCase() (qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp:46) + file: qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp + line: 46 + ... +1..3 +# tests 3 +# pass 2 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_failinit.tap b/tests/auto/testlib/selftests/expected_failinit.tap new file mode 100644 index 0000000000..d99a71fd51 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failinit.tap @@ -0,0 +1,19 @@ +TAP version 13 +# tst_FailInit +not ok 1 - initTestCase() + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_FailInit::initTestCase() (qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp:42) + file: qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp + line: 42 + ... +ok 2 - cleanupTestCase() +1..2 +# tests 2 +# pass 1 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_failinitdata.tap b/tests/auto/testlib/selftests/expected_failinitdata.tap new file mode 100644 index 0000000000..27bdda5a13 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failinitdata.tap @@ -0,0 +1,18 @@ +TAP version 13 +# tst_FailInitData +not ok 1 - initTestCase() + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_FailInitData::initTestCase() (qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp:43) + file: qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp + line: 43 + ... +1..1 +# tests 1 +# pass 0 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.tap b/tests/auto/testlib/selftests/expected_fetchbogus.tap new file mode 100644 index 0000000000..c6761b2301 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_fetchbogus.tap @@ -0,0 +1,15 @@ +TAP version 13 +# tst_FetchBogus +ok 1 - initTestCase() +# QFETCH: Requested testdata 'bubu' not available, check your _data function. +not ok 2 - fetchBogus(foo) + --- + # Received a fatal error. + at: tst_FetchBogus::fetchBogus() (Unknown file:0) + file: Unknown file + line: 0 + ... +1..2 +# tests 2 +# pass 1 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_findtestdata.tap b/tests/auto/testlib/selftests/expected_findtestdata.tap new file mode 100644 index 0000000000..0fb38d2822 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_findtestdata.tap @@ -0,0 +1,10 @@ +TAP version 13 +# FindTestData +ok 1 - initTestCase() +# testdata testfile could not be located! +ok 2 - paths() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_float.tap b/tests/auto/testlib/selftests/expected_float.tap new file mode 100644 index 0000000000..fae2dc9796 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_float.tap @@ -0,0 +1,82 @@ +TAP version 13 +# tst_float +ok 1 - initTestCase() +ok 2 - floatComparisons(should SUCCEED 1) +not ok 3 - floatComparisons(should FAIL 1) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3 (operandRight) + found: 1 (operandLeft) + expected: 3 (operandRight) + actual: 1 (operandLeft) + at: tst_float::floatComparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:48) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 48 + ... +not ok 4 - floatComparisons(should FAIL 2) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3e-07 (operandRight) + found: 1e-07 (operandLeft) + expected: 3e-07 (operandRight) + actual: 1e-07 (operandLeft) + at: tst_float::floatComparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:48) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 48 + ... +not ok 5 - floatComparisons(should FAIL 3) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 99999 (operandRight) + found: 99998 (operandLeft) + expected: 99999 (operandRight) + actual: 99998 (operandLeft) + at: tst_float::floatComparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:48) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 48 + ... +ok 6 - floatComparisons(should SUCCEED 2) +not ok 7 - compareFloatTests(1e0) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3 (t3) + found: 1 (t1) + expected: 3 (t3) + actual: 1 (t1) + at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:96) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 96 + ... +not ok 8 - compareFloatTests(1e-7) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3e-07 (t3) + found: 1e-07 (t1) + expected: 3e-07 (t3) + actual: 1e-07 (t1) + at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:96) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 96 + ... +not ok 9 - compareFloatTests(1e+7) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3e+07 (t3) + found: 1e+07 (t1) + expected: 3e+07 (t3) + actual: 1e+07 (t1) + at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:96) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 96 + ... +ok 10 - cleanupTestCase() +1..10 +# tests 10 +# pass 4 +# fail 6 diff --git a/tests/auto/testlib/selftests/expected_globaldata.tap b/tests/auto/testlib/selftests/expected_globaldata.tap new file mode 100644 index 0000000000..580cf3a7a8 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_globaldata.tap @@ -0,0 +1,52 @@ +TAP version 13 +# tst_globaldata +# initTestCase initTestCase (null) +ok 1 - initTestCase() +# init testGlobal local 1 +# global: false +# local: false +# cleanup testGlobal local 1 +ok 2 - testGlobal(1:local 1) +# init testGlobal local 2 +# global: false +# local: true +# cleanup testGlobal local 2 +ok 3 - testGlobal(1:local 2) +# init testGlobal local 1 +# global: true +# local: false +# cleanup testGlobal local 1 +ok 4 - testGlobal(2:local 1) +# init testGlobal local 2 +# global: true +# local: true +# cleanup testGlobal local 2 +ok 5 - testGlobal(2:local 2) +ok 6 - skip(1) # SKIP skipping +# init skipLocal local 1 +ok 7 - skipLocal(1:local 1) # SKIP skipping +# cleanup skipLocal local 1 +# init skipLocal local 2 +ok 8 - skipLocal(1:local 2) # SKIP skipping +# cleanup skipLocal local 2 +# init skipSingle local 1 +# global: false local: false +# cleanup skipSingle local 1 +ok 9 - skipSingle(1:local 1) +# init skipSingle local 2 +# global: false local: true +# cleanup skipSingle local 2 +ok 10 - skipSingle(1:local 2) +# init skipSingle local 1 +ok 11 - skipSingle(2:local 1) # SKIP skipping +# cleanup skipSingle local 1 +# init skipSingle local 2 +# global: true local: true +# cleanup skipSingle local 2 +ok 12 - skipSingle(2:local 2) +# cleanupTestCase cleanupTestCase (null) +ok 13 - cleanupTestCase() +1..13 +# tests 13 +# pass 9 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_keyboard.lightxml b/tests/auto/testlib/selftests/expected_keyboard.lightxml new file mode 100644 index 0000000000..5699fba3bf --- /dev/null +++ b/tests/auto/testlib/selftests/expected_keyboard.lightxml @@ -0,0 +1,18 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="keyPressAndRelease"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_keyboard.tap b/tests/auto/testlib/selftests/expected_keyboard.tap new file mode 100644 index 0000000000..0725434f8c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_keyboard.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_Keyboard +ok 1 - initTestCase() +ok 2 - keyPressAndRelease() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_keyboard.teamcity b/tests/auto/testlib/selftests/expected_keyboard.teamcity new file mode 100644 index 0000000000..dc01f86ff0 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_keyboard.teamcity @@ -0,0 +1,8 @@ +##teamcity[testSuiteStarted name='tst_Keyboard' flowId='tst_Keyboard'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Keyboard'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Keyboard'] +##teamcity[testStarted name='keyPressAndRelease()' flowId='tst_Keyboard'] +##teamcity[testFinished name='keyPressAndRelease()' flowId='tst_Keyboard'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Keyboard'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Keyboard'] +##teamcity[testSuiteFinished name='tst_Keyboard' flowId='tst_Keyboard'] diff --git a/tests/auto/testlib/selftests/expected_keyboard.txt b/tests/auto/testlib/selftests/expected_keyboard.txt new file mode 100644 index 0000000000..13b7c70672 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_keyboard.txt @@ -0,0 +1,7 @@ +********* Start testing of tst_Keyboard ********* +Config: Using QtTest library +PASS : tst_Keyboard::initTestCase() +PASS : tst_Keyboard::keyPressAndRelease() +PASS : tst_Keyboard::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_Keyboard ********* diff --git a/tests/auto/testlib/selftests/expected_keyboard.xml b/tests/auto/testlib/selftests/expected_keyboard.xml new file mode 100644 index 0000000000..f5ad1b2287 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_keyboard.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Keyboard"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="keyPressAndRelease"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_keyboard.xunitxml b/tests/auto/testlib/selftests/expected_keyboard.xunitxml new file mode 100644 index 0000000000..93b5f7bfff --- /dev/null +++ b/tests/auto/testlib/selftests/expected_keyboard.xunitxml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_Keyboard"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="keyPressAndRelease"/> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_longstring.tap b/tests/auto/testlib/selftests/expected_longstring.tap new file mode 100644 index 0000000000..ac870f2d53 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_longstring.tap @@ -0,0 +1,23 @@ +TAP version 13 +# tst_LongString +ok 1 - initTestCase() +not ok 2 - failWithLongString() + --- + # Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. + +Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. + +Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. + +Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. + +Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. + at: tst_LongString::failWithLongString() (qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp:54) + file: qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp + line: 54 + ... +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 2 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.tap b/tests/auto/testlib/selftests/expected_maxwarnings.tap new file mode 100644 index 0000000000..57bfbd8f8d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_maxwarnings.tap @@ -0,0 +1,2011 @@ +TAP version 13 +# MaxWarnings +ok 1 - initTestCase() +# 0 +# 1 +# 2 +# 3 +# 4 +# 5 +# 6 +# 7 +# 8 +# 9 +# 10 +# 11 +# 12 +# 13 +# 14 +# 15 +# 16 +# 17 +# 18 +# 19 +# 20 +# 21 +# 22 +# 23 +# 24 +# 25 +# 26 +# 27 +# 28 +# 29 +# 30 +# 31 +# 32 +# 33 +# 34 +# 35 +# 36 +# 37 +# 38 +# 39 +# 40 +# 41 +# 42 +# 43 +# 44 +# 45 +# 46 +# 47 +# 48 +# 49 +# 50 +# 51 +# 52 +# 53 +# 54 +# 55 +# 56 +# 57 +# 58 +# 59 +# 60 +# 61 +# 62 +# 63 +# 64 +# 65 +# 66 +# 67 +# 68 +# 69 +# 70 +# 71 +# 72 +# 73 +# 74 +# 75 +# 76 +# 77 +# 78 +# 79 +# 80 +# 81 +# 82 +# 83 +# 84 +# 85 +# 86 +# 87 +# 88 +# 89 +# 90 +# 91 +# 92 +# 93 +# 94 +# 95 +# 96 +# 97 +# 98 +# 99 +# 100 +# 101 +# 102 +# 103 +# 104 +# 105 +# 106 +# 107 +# 108 +# 109 +# 110 +# 111 +# 112 +# 113 +# 114 +# 115 +# 116 +# 117 +# 118 +# 119 +# 120 +# 121 +# 122 +# 123 +# 124 +# 125 +# 126 +# 127 +# 128 +# 129 +# 130 +# 131 +# 132 +# 133 +# 134 +# 135 +# 136 +# 137 +# 138 +# 139 +# 140 +# 141 +# 142 +# 143 +# 144 +# 145 +# 146 +# 147 +# 148 +# 149 +# 150 +# 151 +# 152 +# 153 +# 154 +# 155 +# 156 +# 157 +# 158 +# 159 +# 160 +# 161 +# 162 +# 163 +# 164 +# 165 +# 166 +# 167 +# 168 +# 169 +# 170 +# 171 +# 172 +# 173 +# 174 +# 175 +# 176 +# 177 +# 178 +# 179 +# 180 +# 181 +# 182 +# 183 +# 184 +# 185 +# 186 +# 187 +# 188 +# 189 +# 190 +# 191 +# 192 +# 193 +# 194 +# 195 +# 196 +# 197 +# 198 +# 199 +# 200 +# 201 +# 202 +# 203 +# 204 +# 205 +# 206 +# 207 +# 208 +# 209 +# 210 +# 211 +# 212 +# 213 +# 214 +# 215 +# 216 +# 217 +# 218 +# 219 +# 220 +# 221 +# 222 +# 223 +# 224 +# 225 +# 226 +# 227 +# 228 +# 229 +# 230 +# 231 +# 232 +# 233 +# 234 +# 235 +# 236 +# 237 +# 238 +# 239 +# 240 +# 241 +# 242 +# 243 +# 244 +# 245 +# 246 +# 247 +# 248 +# 249 +# 250 +# 251 +# 252 +# 253 +# 254 +# 255 +# 256 +# 257 +# 258 +# 259 +# 260 +# 261 +# 262 +# 263 +# 264 +# 265 +# 266 +# 267 +# 268 +# 269 +# 270 +# 271 +# 272 +# 273 +# 274 +# 275 +# 276 +# 277 +# 278 +# 279 +# 280 +# 281 +# 282 +# 283 +# 284 +# 285 +# 286 +# 287 +# 288 +# 289 +# 290 +# 291 +# 292 +# 293 +# 294 +# 295 +# 296 +# 297 +# 298 +# 299 +# 300 +# 301 +# 302 +# 303 +# 304 +# 305 +# 306 +# 307 +# 308 +# 309 +# 310 +# 311 +# 312 +# 313 +# 314 +# 315 +# 316 +# 317 +# 318 +# 319 +# 320 +# 321 +# 322 +# 323 +# 324 +# 325 +# 326 +# 327 +# 328 +# 329 +# 330 +# 331 +# 332 +# 333 +# 334 +# 335 +# 336 +# 337 +# 338 +# 339 +# 340 +# 341 +# 342 +# 343 +# 344 +# 345 +# 346 +# 347 +# 348 +# 349 +# 350 +# 351 +# 352 +# 353 +# 354 +# 355 +# 356 +# 357 +# 358 +# 359 +# 360 +# 361 +# 362 +# 363 +# 364 +# 365 +# 366 +# 367 +# 368 +# 369 +# 370 +# 371 +# 372 +# 373 +# 374 +# 375 +# 376 +# 377 +# 378 +# 379 +# 380 +# 381 +# 382 +# 383 +# 384 +# 385 +# 386 +# 387 +# 388 +# 389 +# 390 +# 391 +# 392 +# 393 +# 394 +# 395 +# 396 +# 397 +# 398 +# 399 +# 400 +# 401 +# 402 +# 403 +# 404 +# 405 +# 406 +# 407 +# 408 +# 409 +# 410 +# 411 +# 412 +# 413 +# 414 +# 415 +# 416 +# 417 +# 418 +# 419 +# 420 +# 421 +# 422 +# 423 +# 424 +# 425 +# 426 +# 427 +# 428 +# 429 +# 430 +# 431 +# 432 +# 433 +# 434 +# 435 +# 436 +# 437 +# 438 +# 439 +# 440 +# 441 +# 442 +# 443 +# 444 +# 445 +# 446 +# 447 +# 448 +# 449 +# 450 +# 451 +# 452 +# 453 +# 454 +# 455 +# 456 +# 457 +# 458 +# 459 +# 460 +# 461 +# 462 +# 463 +# 464 +# 465 +# 466 +# 467 +# 468 +# 469 +# 470 +# 471 +# 472 +# 473 +# 474 +# 475 +# 476 +# 477 +# 478 +# 479 +# 480 +# 481 +# 482 +# 483 +# 484 +# 485 +# 486 +# 487 +# 488 +# 489 +# 490 +# 491 +# 492 +# 493 +# 494 +# 495 +# 496 +# 497 +# 498 +# 499 +# 500 +# 501 +# 502 +# 503 +# 504 +# 505 +# 506 +# 507 +# 508 +# 509 +# 510 +# 511 +# 512 +# 513 +# 514 +# 515 +# 516 +# 517 +# 518 +# 519 +# 520 +# 521 +# 522 +# 523 +# 524 +# 525 +# 526 +# 527 +# 528 +# 529 +# 530 +# 531 +# 532 +# 533 +# 534 +# 535 +# 536 +# 537 +# 538 +# 539 +# 540 +# 541 +# 542 +# 543 +# 544 +# 545 +# 546 +# 547 +# 548 +# 549 +# 550 +# 551 +# 552 +# 553 +# 554 +# 555 +# 556 +# 557 +# 558 +# 559 +# 560 +# 561 +# 562 +# 563 +# 564 +# 565 +# 566 +# 567 +# 568 +# 569 +# 570 +# 571 +# 572 +# 573 +# 574 +# 575 +# 576 +# 577 +# 578 +# 579 +# 580 +# 581 +# 582 +# 583 +# 584 +# 585 +# 586 +# 587 +# 588 +# 589 +# 590 +# 591 +# 592 +# 593 +# 594 +# 595 +# 596 +# 597 +# 598 +# 599 +# 600 +# 601 +# 602 +# 603 +# 604 +# 605 +# 606 +# 607 +# 608 +# 609 +# 610 +# 611 +# 612 +# 613 +# 614 +# 615 +# 616 +# 617 +# 618 +# 619 +# 620 +# 621 +# 622 +# 623 +# 624 +# 625 +# 626 +# 627 +# 628 +# 629 +# 630 +# 631 +# 632 +# 633 +# 634 +# 635 +# 636 +# 637 +# 638 +# 639 +# 640 +# 641 +# 642 +# 643 +# 644 +# 645 +# 646 +# 647 +# 648 +# 649 +# 650 +# 651 +# 652 +# 653 +# 654 +# 655 +# 656 +# 657 +# 658 +# 659 +# 660 +# 661 +# 662 +# 663 +# 664 +# 665 +# 666 +# 667 +# 668 +# 669 +# 670 +# 671 +# 672 +# 673 +# 674 +# 675 +# 676 +# 677 +# 678 +# 679 +# 680 +# 681 +# 682 +# 683 +# 684 +# 685 +# 686 +# 687 +# 688 +# 689 +# 690 +# 691 +# 692 +# 693 +# 694 +# 695 +# 696 +# 697 +# 698 +# 699 +# 700 +# 701 +# 702 +# 703 +# 704 +# 705 +# 706 +# 707 +# 708 +# 709 +# 710 +# 711 +# 712 +# 713 +# 714 +# 715 +# 716 +# 717 +# 718 +# 719 +# 720 +# 721 +# 722 +# 723 +# 724 +# 725 +# 726 +# 727 +# 728 +# 729 +# 730 +# 731 +# 732 +# 733 +# 734 +# 735 +# 736 +# 737 +# 738 +# 739 +# 740 +# 741 +# 742 +# 743 +# 744 +# 745 +# 746 +# 747 +# 748 +# 749 +# 750 +# 751 +# 752 +# 753 +# 754 +# 755 +# 756 +# 757 +# 758 +# 759 +# 760 +# 761 +# 762 +# 763 +# 764 +# 765 +# 766 +# 767 +# 768 +# 769 +# 770 +# 771 +# 772 +# 773 +# 774 +# 775 +# 776 +# 777 +# 778 +# 779 +# 780 +# 781 +# 782 +# 783 +# 784 +# 785 +# 786 +# 787 +# 788 +# 789 +# 790 +# 791 +# 792 +# 793 +# 794 +# 795 +# 796 +# 797 +# 798 +# 799 +# 800 +# 801 +# 802 +# 803 +# 804 +# 805 +# 806 +# 807 +# 808 +# 809 +# 810 +# 811 +# 812 +# 813 +# 814 +# 815 +# 816 +# 817 +# 818 +# 819 +# 820 +# 821 +# 822 +# 823 +# 824 +# 825 +# 826 +# 827 +# 828 +# 829 +# 830 +# 831 +# 832 +# 833 +# 834 +# 835 +# 836 +# 837 +# 838 +# 839 +# 840 +# 841 +# 842 +# 843 +# 844 +# 845 +# 846 +# 847 +# 848 +# 849 +# 850 +# 851 +# 852 +# 853 +# 854 +# 855 +# 856 +# 857 +# 858 +# 859 +# 860 +# 861 +# 862 +# 863 +# 864 +# 865 +# 866 +# 867 +# 868 +# 869 +# 870 +# 871 +# 872 +# 873 +# 874 +# 875 +# 876 +# 877 +# 878 +# 879 +# 880 +# 881 +# 882 +# 883 +# 884 +# 885 +# 886 +# 887 +# 888 +# 889 +# 890 +# 891 +# 892 +# 893 +# 894 +# 895 +# 896 +# 897 +# 898 +# 899 +# 900 +# 901 +# 902 +# 903 +# 904 +# 905 +# 906 +# 907 +# 908 +# 909 +# 910 +# 911 +# 912 +# 913 +# 914 +# 915 +# 916 +# 917 +# 918 +# 919 +# 920 +# 921 +# 922 +# 923 +# 924 +# 925 +# 926 +# 927 +# 928 +# 929 +# 930 +# 931 +# 932 +# 933 +# 934 +# 935 +# 936 +# 937 +# 938 +# 939 +# 940 +# 941 +# 942 +# 943 +# 944 +# 945 +# 946 +# 947 +# 948 +# 949 +# 950 +# 951 +# 952 +# 953 +# 954 +# 955 +# 956 +# 957 +# 958 +# 959 +# 960 +# 961 +# 962 +# 963 +# 964 +# 965 +# 966 +# 967 +# 968 +# 969 +# 970 +# 971 +# 972 +# 973 +# 974 +# 975 +# 976 +# 977 +# 978 +# 979 +# 980 +# 981 +# 982 +# 983 +# 984 +# 985 +# 986 +# 987 +# 988 +# 989 +# 990 +# 991 +# 992 +# 993 +# 994 +# 995 +# 996 +# 997 +# 998 +# 999 +# 1000 +# 1001 +# 1002 +# 1003 +# 1004 +# 1005 +# 1006 +# 1007 +# 1008 +# 1009 +# 1010 +# 1011 +# 1012 +# 1013 +# 1014 +# 1015 +# 1016 +# 1017 +# 1018 +# 1019 +# 1020 +# 1021 +# 1022 +# 1023 +# 1024 +# 1025 +# 1026 +# 1027 +# 1028 +# 1029 +# 1030 +# 1031 +# 1032 +# 1033 +# 1034 +# 1035 +# 1036 +# 1037 +# 1038 +# 1039 +# 1040 +# 1041 +# 1042 +# 1043 +# 1044 +# 1045 +# 1046 +# 1047 +# 1048 +# 1049 +# 1050 +# 1051 +# 1052 +# 1053 +# 1054 +# 1055 +# 1056 +# 1057 +# 1058 +# 1059 +# 1060 +# 1061 +# 1062 +# 1063 +# 1064 +# 1065 +# 1066 +# 1067 +# 1068 +# 1069 +# 1070 +# 1071 +# 1072 +# 1073 +# 1074 +# 1075 +# 1076 +# 1077 +# 1078 +# 1079 +# 1080 +# 1081 +# 1082 +# 1083 +# 1084 +# 1085 +# 1086 +# 1087 +# 1088 +# 1089 +# 1090 +# 1091 +# 1092 +# 1093 +# 1094 +# 1095 +# 1096 +# 1097 +# 1098 +# 1099 +# 1100 +# 1101 +# 1102 +# 1103 +# 1104 +# 1105 +# 1106 +# 1107 +# 1108 +# 1109 +# 1110 +# 1111 +# 1112 +# 1113 +# 1114 +# 1115 +# 1116 +# 1117 +# 1118 +# 1119 +# 1120 +# 1121 +# 1122 +# 1123 +# 1124 +# 1125 +# 1126 +# 1127 +# 1128 +# 1129 +# 1130 +# 1131 +# 1132 +# 1133 +# 1134 +# 1135 +# 1136 +# 1137 +# 1138 +# 1139 +# 1140 +# 1141 +# 1142 +# 1143 +# 1144 +# 1145 +# 1146 +# 1147 +# 1148 +# 1149 +# 1150 +# 1151 +# 1152 +# 1153 +# 1154 +# 1155 +# 1156 +# 1157 +# 1158 +# 1159 +# 1160 +# 1161 +# 1162 +# 1163 +# 1164 +# 1165 +# 1166 +# 1167 +# 1168 +# 1169 +# 1170 +# 1171 +# 1172 +# 1173 +# 1174 +# 1175 +# 1176 +# 1177 +# 1178 +# 1179 +# 1180 +# 1181 +# 1182 +# 1183 +# 1184 +# 1185 +# 1186 +# 1187 +# 1188 +# 1189 +# 1190 +# 1191 +# 1192 +# 1193 +# 1194 +# 1195 +# 1196 +# 1197 +# 1198 +# 1199 +# 1200 +# 1201 +# 1202 +# 1203 +# 1204 +# 1205 +# 1206 +# 1207 +# 1208 +# 1209 +# 1210 +# 1211 +# 1212 +# 1213 +# 1214 +# 1215 +# 1216 +# 1217 +# 1218 +# 1219 +# 1220 +# 1221 +# 1222 +# 1223 +# 1224 +# 1225 +# 1226 +# 1227 +# 1228 +# 1229 +# 1230 +# 1231 +# 1232 +# 1233 +# 1234 +# 1235 +# 1236 +# 1237 +# 1238 +# 1239 +# 1240 +# 1241 +# 1242 +# 1243 +# 1244 +# 1245 +# 1246 +# 1247 +# 1248 +# 1249 +# 1250 +# 1251 +# 1252 +# 1253 +# 1254 +# 1255 +# 1256 +# 1257 +# 1258 +# 1259 +# 1260 +# 1261 +# 1262 +# 1263 +# 1264 +# 1265 +# 1266 +# 1267 +# 1268 +# 1269 +# 1270 +# 1271 +# 1272 +# 1273 +# 1274 +# 1275 +# 1276 +# 1277 +# 1278 +# 1279 +# 1280 +# 1281 +# 1282 +# 1283 +# 1284 +# 1285 +# 1286 +# 1287 +# 1288 +# 1289 +# 1290 +# 1291 +# 1292 +# 1293 +# 1294 +# 1295 +# 1296 +# 1297 +# 1298 +# 1299 +# 1300 +# 1301 +# 1302 +# 1303 +# 1304 +# 1305 +# 1306 +# 1307 +# 1308 +# 1309 +# 1310 +# 1311 +# 1312 +# 1313 +# 1314 +# 1315 +# 1316 +# 1317 +# 1318 +# 1319 +# 1320 +# 1321 +# 1322 +# 1323 +# 1324 +# 1325 +# 1326 +# 1327 +# 1328 +# 1329 +# 1330 +# 1331 +# 1332 +# 1333 +# 1334 +# 1335 +# 1336 +# 1337 +# 1338 +# 1339 +# 1340 +# 1341 +# 1342 +# 1343 +# 1344 +# 1345 +# 1346 +# 1347 +# 1348 +# 1349 +# 1350 +# 1351 +# 1352 +# 1353 +# 1354 +# 1355 +# 1356 +# 1357 +# 1358 +# 1359 +# 1360 +# 1361 +# 1362 +# 1363 +# 1364 +# 1365 +# 1366 +# 1367 +# 1368 +# 1369 +# 1370 +# 1371 +# 1372 +# 1373 +# 1374 +# 1375 +# 1376 +# 1377 +# 1378 +# 1379 +# 1380 +# 1381 +# 1382 +# 1383 +# 1384 +# 1385 +# 1386 +# 1387 +# 1388 +# 1389 +# 1390 +# 1391 +# 1392 +# 1393 +# 1394 +# 1395 +# 1396 +# 1397 +# 1398 +# 1399 +# 1400 +# 1401 +# 1402 +# 1403 +# 1404 +# 1405 +# 1406 +# 1407 +# 1408 +# 1409 +# 1410 +# 1411 +# 1412 +# 1413 +# 1414 +# 1415 +# 1416 +# 1417 +# 1418 +# 1419 +# 1420 +# 1421 +# 1422 +# 1423 +# 1424 +# 1425 +# 1426 +# 1427 +# 1428 +# 1429 +# 1430 +# 1431 +# 1432 +# 1433 +# 1434 +# 1435 +# 1436 +# 1437 +# 1438 +# 1439 +# 1440 +# 1441 +# 1442 +# 1443 +# 1444 +# 1445 +# 1446 +# 1447 +# 1448 +# 1449 +# 1450 +# 1451 +# 1452 +# 1453 +# 1454 +# 1455 +# 1456 +# 1457 +# 1458 +# 1459 +# 1460 +# 1461 +# 1462 +# 1463 +# 1464 +# 1465 +# 1466 +# 1467 +# 1468 +# 1469 +# 1470 +# 1471 +# 1472 +# 1473 +# 1474 +# 1475 +# 1476 +# 1477 +# 1478 +# 1479 +# 1480 +# 1481 +# 1482 +# 1483 +# 1484 +# 1485 +# 1486 +# 1487 +# 1488 +# 1489 +# 1490 +# 1491 +# 1492 +# 1493 +# 1494 +# 1495 +# 1496 +# 1497 +# 1498 +# 1499 +# 1500 +# 1501 +# 1502 +# 1503 +# 1504 +# 1505 +# 1506 +# 1507 +# 1508 +# 1509 +# 1510 +# 1511 +# 1512 +# 1513 +# 1514 +# 1515 +# 1516 +# 1517 +# 1518 +# 1519 +# 1520 +# 1521 +# 1522 +# 1523 +# 1524 +# 1525 +# 1526 +# 1527 +# 1528 +# 1529 +# 1530 +# 1531 +# 1532 +# 1533 +# 1534 +# 1535 +# 1536 +# 1537 +# 1538 +# 1539 +# 1540 +# 1541 +# 1542 +# 1543 +# 1544 +# 1545 +# 1546 +# 1547 +# 1548 +# 1549 +# 1550 +# 1551 +# 1552 +# 1553 +# 1554 +# 1555 +# 1556 +# 1557 +# 1558 +# 1559 +# 1560 +# 1561 +# 1562 +# 1563 +# 1564 +# 1565 +# 1566 +# 1567 +# 1568 +# 1569 +# 1570 +# 1571 +# 1572 +# 1573 +# 1574 +# 1575 +# 1576 +# 1577 +# 1578 +# 1579 +# 1580 +# 1581 +# 1582 +# 1583 +# 1584 +# 1585 +# 1586 +# 1587 +# 1588 +# 1589 +# 1590 +# 1591 +# 1592 +# 1593 +# 1594 +# 1595 +# 1596 +# 1597 +# 1598 +# 1599 +# 1600 +# 1601 +# 1602 +# 1603 +# 1604 +# 1605 +# 1606 +# 1607 +# 1608 +# 1609 +# 1610 +# 1611 +# 1612 +# 1613 +# 1614 +# 1615 +# 1616 +# 1617 +# 1618 +# 1619 +# 1620 +# 1621 +# 1622 +# 1623 +# 1624 +# 1625 +# 1626 +# 1627 +# 1628 +# 1629 +# 1630 +# 1631 +# 1632 +# 1633 +# 1634 +# 1635 +# 1636 +# 1637 +# 1638 +# 1639 +# 1640 +# 1641 +# 1642 +# 1643 +# 1644 +# 1645 +# 1646 +# 1647 +# 1648 +# 1649 +# 1650 +# 1651 +# 1652 +# 1653 +# 1654 +# 1655 +# 1656 +# 1657 +# 1658 +# 1659 +# 1660 +# 1661 +# 1662 +# 1663 +# 1664 +# 1665 +# 1666 +# 1667 +# 1668 +# 1669 +# 1670 +# 1671 +# 1672 +# 1673 +# 1674 +# 1675 +# 1676 +# 1677 +# 1678 +# 1679 +# 1680 +# 1681 +# 1682 +# 1683 +# 1684 +# 1685 +# 1686 +# 1687 +# 1688 +# 1689 +# 1690 +# 1691 +# 1692 +# 1693 +# 1694 +# 1695 +# 1696 +# 1697 +# 1698 +# 1699 +# 1700 +# 1701 +# 1702 +# 1703 +# 1704 +# 1705 +# 1706 +# 1707 +# 1708 +# 1709 +# 1710 +# 1711 +# 1712 +# 1713 +# 1714 +# 1715 +# 1716 +# 1717 +# 1718 +# 1719 +# 1720 +# 1721 +# 1722 +# 1723 +# 1724 +# 1725 +# 1726 +# 1727 +# 1728 +# 1729 +# 1730 +# 1731 +# 1732 +# 1733 +# 1734 +# 1735 +# 1736 +# 1737 +# 1738 +# 1739 +# 1740 +# 1741 +# 1742 +# 1743 +# 1744 +# 1745 +# 1746 +# 1747 +# 1748 +# 1749 +# 1750 +# 1751 +# 1752 +# 1753 +# 1754 +# 1755 +# 1756 +# 1757 +# 1758 +# 1759 +# 1760 +# 1761 +# 1762 +# 1763 +# 1764 +# 1765 +# 1766 +# 1767 +# 1768 +# 1769 +# 1770 +# 1771 +# 1772 +# 1773 +# 1774 +# 1775 +# 1776 +# 1777 +# 1778 +# 1779 +# 1780 +# 1781 +# 1782 +# 1783 +# 1784 +# 1785 +# 1786 +# 1787 +# 1788 +# 1789 +# 1790 +# 1791 +# 1792 +# 1793 +# 1794 +# 1795 +# 1796 +# 1797 +# 1798 +# 1799 +# 1800 +# 1801 +# 1802 +# 1803 +# 1804 +# 1805 +# 1806 +# 1807 +# 1808 +# 1809 +# 1810 +# 1811 +# 1812 +# 1813 +# 1814 +# 1815 +# 1816 +# 1817 +# 1818 +# 1819 +# 1820 +# 1821 +# 1822 +# 1823 +# 1824 +# 1825 +# 1826 +# 1827 +# 1828 +# 1829 +# 1830 +# 1831 +# 1832 +# 1833 +# 1834 +# 1835 +# 1836 +# 1837 +# 1838 +# 1839 +# 1840 +# 1841 +# 1842 +# 1843 +# 1844 +# 1845 +# 1846 +# 1847 +# 1848 +# 1849 +# 1850 +# 1851 +# 1852 +# 1853 +# 1854 +# 1855 +# 1856 +# 1857 +# 1858 +# 1859 +# 1860 +# 1861 +# 1862 +# 1863 +# 1864 +# 1865 +# 1866 +# 1867 +# 1868 +# 1869 +# 1870 +# 1871 +# 1872 +# 1873 +# 1874 +# 1875 +# 1876 +# 1877 +# 1878 +# 1879 +# 1880 +# 1881 +# 1882 +# 1883 +# 1884 +# 1885 +# 1886 +# 1887 +# 1888 +# 1889 +# 1890 +# 1891 +# 1892 +# 1893 +# 1894 +# 1895 +# 1896 +# 1897 +# 1898 +# 1899 +# 1900 +# 1901 +# 1902 +# 1903 +# 1904 +# 1905 +# 1906 +# 1907 +# 1908 +# 1909 +# 1910 +# 1911 +# 1912 +# 1913 +# 1914 +# 1915 +# 1916 +# 1917 +# 1918 +# 1919 +# 1920 +# 1921 +# 1922 +# 1923 +# 1924 +# 1925 +# 1926 +# 1927 +# 1928 +# 1929 +# 1930 +# 1931 +# 1932 +# 1933 +# 1934 +# 1935 +# 1936 +# 1937 +# 1938 +# 1939 +# 1940 +# 1941 +# 1942 +# 1943 +# 1944 +# 1945 +# 1946 +# 1947 +# 1948 +# 1949 +# 1950 +# 1951 +# 1952 +# 1953 +# 1954 +# 1955 +# 1956 +# 1957 +# 1958 +# 1959 +# 1960 +# 1961 +# 1962 +# 1963 +# 1964 +# 1965 +# 1966 +# 1967 +# 1968 +# 1969 +# 1970 +# 1971 +# 1972 +# 1973 +# 1974 +# 1975 +# 1976 +# 1977 +# 1978 +# 1979 +# 1980 +# 1981 +# 1982 +# 1983 +# 1984 +# 1985 +# 1986 +# 1987 +# 1988 +# 1989 +# 1990 +# 1991 +# 1992 +# 1993 +# 1994 +# 1995 +# 1996 +# 1997 +# 1998 +# 1999 +# 2000 +# Maximum amount of warnings exceeded. Use -maxwarnings to override. +ok 2 - warn() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.tap b/tests/auto/testlib/selftests/expected_pairdiagnostics.tap new file mode 100644 index 0000000000..9c45880c2d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.tap @@ -0,0 +1,32 @@ +TAP version 13 +# tst_PairDiagnostics +ok 1 - initTestCase() +not ok 2 - testQPair() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "QPair(1,2)" (pair2) + found: "QPair(1,1)" (pair1) + expected: "QPair(1,2)" (pair2) + actual: "QPair(1,1)" (pair1) + at: tst_PairDiagnostics::testQPair() (qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp:51) + file: qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp + line: 51 + ... +not ok 3 - testStdPair() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "std::pair(1,2)" (pair2) + found: "std::pair(1,1)" (pair1) + expected: "std::pair(1,2)" (pair2) + actual: "std::pair(1,1)" (pair1) + at: tst_PairDiagnostics::testStdPair() (qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp:58) + file: qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp + line: 58 + ... +ok 4 - cleanupTestCase() +1..4 +# tests 4 +# pass 2 +# fail 2 diff --git a/tests/auto/testlib/selftests/expected_singleskip.tap b/tests/auto/testlib/selftests/expected_singleskip.tap new file mode 100644 index 0000000000..2cc09e7d26 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_singleskip.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_SingleSkip +ok 1 - initTestCase() +ok 2 - myTest() # SKIP skipping test +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 2 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_skip.tap b/tests/auto/testlib/selftests/expected_skip.tap new file mode 100644 index 0000000000..adf9f692a9 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skip.tap @@ -0,0 +1,13 @@ +TAP version 13 +# tst_Skip +ok 1 - initTestCase() +ok 2 - test() # SKIP skipping all +ok 3 - emptytest() # SKIP skipping all +ok 4 - singleSkip(local 1) # SKIP skipping one +# this line should only be reached once (true) +ok 5 - singleSkip(local 2) +ok 6 - cleanupTestCase() +1..6 +# tests 6 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.tap b/tests/auto/testlib/selftests/expected_skipcleanup.tap new file mode 100644 index 0000000000..4a3f8f852c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipcleanup.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_SkipCleanup +ok 1 - initTestCase() +ok 2 - aTestFunction() +ok 3 - cleanupTestCase() # SKIP Skip inside cleanupTestCase. +1..3 +# tests 3 +# pass 2 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_skipinit.tap b/tests/auto/testlib/selftests/expected_skipinit.tap new file mode 100644 index 0000000000..1fc38e79aa --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipinit.tap @@ -0,0 +1,8 @@ +TAP version 13 +# tst_SkipInit +ok 1 - initTestCase() # SKIP Skip inside initTestCase. This should skip all tests in the class. +ok 2 - cleanupTestCase() +1..2 +# tests 2 +# pass 1 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.tap b/tests/auto/testlib/selftests/expected_skipinitdata.tap new file mode 100644 index 0000000000..1ea96ca74e --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipinitdata.tap @@ -0,0 +1,7 @@ +TAP version 13 +# tst_SkipInitData +ok 1 - initTestCase() # SKIP Skip inside initTestCase_data. This should skip all tests in the class. +1..1 +# tests 1 +# pass 0 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_sleep.tap b/tests/auto/testlib/selftests/expected_sleep.tap new file mode 100644 index 0000000000..7caef214d2 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_sleep.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_Sleep +ok 1 - initTestCase() +ok 2 - sleep() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_strcmp.tap b/tests/auto/testlib/selftests/expected_strcmp.tap new file mode 100644 index 0000000000..af368e4745 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_strcmp.tap @@ -0,0 +1,87 @@ +TAP version 13 +# tst_StrCmp +ok 1 - initTestCase() +ok 2 - compareCharStars() +not ok 3 - compareByteArray() # TODO Next test should fail + --- + at: tst_StrCmp::compareByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:75) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 75 + ... +not ok 3 - compareByteArray() # TODO Next test should fail + --- + at: tst_StrCmp::compareByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:82) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 82 + ... +not ok 3 - compareByteArray() # TODO Next test should fail + --- + at: tst_StrCmp::compareByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:89) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 89 + ... +not ok 3 - compareByteArray() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"... (b) + found: "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"... (a) + expected: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"... (b) + actual: "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"... (a) + at: tst_StrCmp::compareByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:96) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 96 + ... +not ok 4 - failByteArray() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "cba" (QByteArray("cba")) + found: "abc" (QByteArray("abc")) + expected: "cba" (QByteArray("cba")) + actual: "abc" (QByteArray("abc")) + at: tst_StrCmp::failByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:102) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 102 + ... +not ok 5 - failByteArrayNull() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "" (QByteArray()) + found: "foo" (QByteArray("foo")) + expected: "" (QByteArray()) + actual: "foo" (QByteArray("foo")) + at: tst_StrCmp::failByteArrayNull() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:108) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 108 + ... +not ok 6 - failByteArrayEmpty() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "foo" (QByteArray("foo")) + found: "" (QByteArray("")) + expected: "foo" (QByteArray("foo")) + actual: "" (QByteArray("")) + at: tst_StrCmp::failByteArrayEmpty() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:113) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 113 + ... +not ok 7 - failByteArraySingleChars() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "7" (QByteArray("7")) + found: "6" (QByteArray("6")) + expected: "7" (QByteArray("7")) + actual: "6" (QByteArray("6")) + at: tst_StrCmp::failByteArraySingleChars() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:120) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 120 + ... +ok 8 - cleanupTestCase() +1..8 +# tests 8 +# pass 3 +# fail 5 diff --git a/tests/auto/testlib/selftests/expected_subtest.tap b/tests/auto/testlib/selftests/expected_subtest.tap new file mode 100644 index 0000000000..67fe7be570 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_subtest.tap @@ -0,0 +1,68 @@ +TAP version 13 +# tst_Subtest +# initTestCase initTestCase (null) +ok 1 - initTestCase() +# init test1 (null) +# test1 test1 (null) +# cleanup test1 (null) +ok 2 - test1() +# test2_data test2 (null) +# test2_data end +# init test2 data0 +# test2 test2 data0 +# test2 end +# cleanup test2 data0 +ok 3 - test2(data0) +# init test2 data1 +# test2 test2 data1 +# test2 end +# cleanup test2 data1 +ok 4 - test2(data1) +# init test2 data2 +# test2 test2 data2 +# test2 end +# cleanup test2 data2 +ok 5 - test2(data2) +# test3_data test3 (null) +# test3_data end +# init test3 data0 +# test2 test3 data0 +# test2 end +# cleanup test3 data0 +ok 6 - test3(data0) +# init test3 data1 +# test2 test3 data1 +not ok 7 - test3(data1) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "hello0" (QString("hello0")) + found: "hello1" (str) + expected: "hello0" (QString("hello0")) + actual: "hello1" (str) + at: tst_Subtest::test3() (qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp:141) + file: qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp + line: 141 + ... +# cleanup test3 data1 +# init test3 data2 +# test2 test3 data2 +not ok 8 - test3(data2) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "hello0" (QString("hello0")) + found: "hello2" (str) + expected: "hello0" (QString("hello0")) + actual: "hello2" (str) + at: tst_Subtest::test3() (qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp:141) + file: qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp + line: 141 + ... +# cleanup test3 data2 +# cleanupTestCase cleanupTestCase (null) +ok 9 - cleanupTestCase() +1..9 +# tests 9 +# pass 7 +# fail 2 diff --git a/tests/auto/testlib/selftests/expected_verbose1.tap b/tests/auto/testlib/selftests/expected_verbose1.tap new file mode 100644 index 0000000000..ad53e8f14e --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verbose1.tap @@ -0,0 +1,118 @@ +TAP version 13 +# tst_Counting +ok 1 - initTestCase() +ok 2 - testPassPass(row 1) +ok 3 - testPassPass(row 2) +ok 4 - testPassSkip(row 1) +ok 5 - testPassSkip(row 2) # SKIP Skipping +ok 6 - testPassFail(row 1) +not ok 7 - testPassFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testPassFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 8 - testSkipPass(row 1) # SKIP Skipping +ok 9 - testSkipPass(row 2) +ok 10 - testSkipSkip(row 1) # SKIP Skipping +ok 11 - testSkipSkip(row 2) # SKIP Skipping +ok 12 - testSkipFail(row 1) # SKIP Skipping +not ok 13 - testSkipFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testSkipFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +not ok 14 - testFailPass(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailPass() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 15 - testFailPass(row 2) +not ok 16 - testFailSkip(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailSkip() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 17 - testFailSkip(row 2) # SKIP Skipping +not ok 18 - testFailFail(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +not ok 19 - testFailFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 20 - testFailInInit(before) +not ok 21 - testFailInInit(fail) + --- + # Fail in init() + at: tst_Counting::testFailInInit() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:221) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 221 + ... +ok 22 - testFailInInit(after) +ok 23 - testFailInCleanup(before) +# This test function should execute and then QFAIL in cleanup() +not ok 24 - testFailInCleanup(fail) + --- + # Fail in cleanup() + at: tst_Counting::testFailInCleanup() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:229) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 229 + ... +ok 25 - testFailInCleanup(after) +ok 26 - testSkipInInit(before) +ok 27 - testSkipInInit(skip) # SKIP Skip in init() +ok 28 - testSkipInInit(after) +ok 29 - testSkipInCleanup(before) +# This test function should execute and then QSKIP in cleanup() +ok 30 - testSkipInCleanup(skip) # SKIP Skip in cleanup() +ok 31 - testSkipInCleanup(after) +ok 32 - cleanupTestCase() +1..32 +# tests 32 +# pass 16 +# fail 8 diff --git a/tests/auto/testlib/selftests/expected_verbose2.tap b/tests/auto/testlib/selftests/expected_verbose2.tap new file mode 100644 index 0000000000..7e6a7280a4 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verbose2.tap @@ -0,0 +1,136 @@ +TAP version 13 +# tst_Counting +ok 1 - initTestCase() +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 2 - testPassPass(row 1) +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 3 - testPassPass(row 2) +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 4 - testPassSkip(row 1) +ok 5 - testPassSkip(row 2) # SKIP Skipping +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 6 - testPassFail(row 1) +# QVERIFY(false) +not ok 7 - testPassFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testPassFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 8 - testSkipPass(row 1) # SKIP Skipping +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 9 - testSkipPass(row 2) +ok 10 - testSkipSkip(row 1) # SKIP Skipping +ok 11 - testSkipSkip(row 2) # SKIP Skipping +ok 12 - testSkipFail(row 1) # SKIP Skipping +# QVERIFY(false) +not ok 13 - testSkipFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testSkipFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +# QVERIFY(false) +not ok 14 - testFailPass(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailPass() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 15 - testFailPass(row 2) +# QVERIFY(false) +not ok 16 - testFailSkip(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailSkip() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 17 - testFailSkip(row 2) # SKIP Skipping +# QVERIFY(false) +not ok 18 - testFailFail(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +# QVERIFY(false) +not ok 19 - testFailFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 20 - testFailInInit(before) +not ok 21 - testFailInInit(fail) + --- + # Fail in init() + at: tst_Counting::testFailInInit() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:221) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 221 + ... +ok 22 - testFailInInit(after) +ok 23 - testFailInCleanup(before) +# This test function should execute and then QFAIL in cleanup() +not ok 24 - testFailInCleanup(fail) + --- + # Fail in cleanup() + at: tst_Counting::testFailInCleanup() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:229) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 229 + ... +ok 25 - testFailInCleanup(after) +ok 26 - testSkipInInit(before) +ok 27 - testSkipInInit(skip) # SKIP Skip in init() +ok 28 - testSkipInInit(after) +ok 29 - testSkipInCleanup(before) +# This test function should execute and then QSKIP in cleanup() +ok 30 - testSkipInCleanup(skip) # SKIP Skip in cleanup() +ok 31 - testSkipInCleanup(after) +ok 32 - cleanupTestCase() +1..32 +# tests 32 +# pass 16 +# fail 8 diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.tap b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.tap new file mode 100644 index 0000000000..2b04c08cdb --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.tap @@ -0,0 +1,53 @@ +TAP version 13 +# tst_VerifyExceptionThrown +ok 1 - initTestCase() +ok 2 - testCorrectStdTypes() +ok 3 - testCorrectStdExceptions() +ok 4 - testCorrectMyExceptions() +not ok 5 - testFailInt() + --- + # Expected exception of type double to be thrown but unknown exception caught + at: tst_VerifyExceptionThrown::testFailInt() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:115) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 115 + ... +not ok 6 - testFailStdString() + --- + # Expected exception of type char* to be thrown but unknown exception caught + at: tst_VerifyExceptionThrown::testFailStdString() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:120) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 120 + ... +not ok 7 - testFailStdRuntimeError() + --- + # Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error + at: tst_VerifyExceptionThrown::testFailStdRuntimeError() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:125) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 125 + ... +not ok 8 - testFailMyException() + --- + # Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error + at: tst_VerifyExceptionThrown::testFailMyException() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:130) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 130 + ... +not ok 9 - testFailMyDerivedException() + --- + # Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException + at: tst_VerifyExceptionThrown::testFailMyDerivedException() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:135) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 135 + ... +not ok 10 - testFailNoException() + --- + # Expected exception of type std::exception to be thrown but no exception caught + at: tst_VerifyExceptionThrown::testFailNoException() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:140) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 140 + ... +ok 11 - cleanupTestCase() +1..11 +# tests 11 +# pass 5 +# fail 6 diff --git a/tests/auto/testlib/selftests/expected_warnings.tap b/tests/auto/testlib/selftests/expected_warnings.tap new file mode 100644 index 0000000000..0e357cb770 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_warnings.tap @@ -0,0 +1,42 @@ +TAP version 13 +# tst_Warnings +ok 1 - initTestCase() +# Warning +# Warning +# Debug +# Debug +# Info +# Info +# Baba +# Baba +# Bubublabla +# Babablabla +ok 2 - testWarnings() +# Did not receive message: "Warning0" +# Did not receive message: "Warning1" +not ok 3 - testMissingWarnings() + --- + # Not all expected messages were received + ... +# Did not receive any message matching: "Warning\s\d" +not ok 4 - testMissingWarningsRegularExpression() + --- + # Not all expected messages were received + ... +# Did not receive message: "Warning0" +# Did not receive message: "Warning1" +not ok 5 - testMissingWarningsWithData(first row) + --- + # Not all expected messages were received + ... +# Did not receive message: "Warning0" +# Did not receive message: "Warning1" +not ok 6 - testMissingWarningsWithData(second row) + --- + # Not all expected messages were received + ... +ok 7 - cleanupTestCase() +1..7 +# tests 7 +# pass 3 +# fail 4 diff --git a/tests/auto/testlib/selftests/expected_xunit.tap b/tests/auto/testlib/selftests/expected_xunit.tap new file mode 100644 index 0000000000..13ff7e45a3 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_xunit.tap @@ -0,0 +1,44 @@ +TAP version 13 +# tst_Xunit +ok 1 - initTestCase() +# just a QWARN() ! +ok 2 - testFunc1() +# a qDebug() call with comment-ending stuff --> +not ok 3 - testFunc2() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: 3 (3) + found: 2 (2) + expected: 3 (3) + actual: 2 (2) + at: tst_Xunit::testFunc2() (qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp:61) + file: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp + line: 61 + ... +ok 4 - testFunc3() # SKIP skipping this function! +not ok 5 - testFunc4() + --- + # a forced failure! + at: tst_Xunit::testFunc4() (qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp:71) + file: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp + line: 71 + ... +not ok 6 - testFunc5() # TODO this failure is expected + --- + at: tst_Xunit::testFunc5() (qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp:85) + file: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp + line: 85 + ... +not ok 7 - testFunc6() # TODO this failure is also expected + --- + at: tst_Xunit::testFunc6() (qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp:91) + file: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp + line: 91 + ... +ok 8 - testFunc7() # TODO 'true' returned TRUE unexpectedly. () +ok 9 - cleanupTestCase() +1..9 +# tests 9 +# pass 5 +# fail 3 diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index aa11ca4fe7..1996416e8c 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -37,9 +37,7 @@ # it to the output of each test, ignoring various boring changes. # This script canonicalises the parts that would exhibit those boring # changes, so as to avoid noise in git (and conflicts in merges) for -# the saved copies of the output. If you add or remove any files, be -# sure to update selftests.qrc to match; the selftest only sees files -# listed there. +# the saved copies of the output. import os import subprocess @@ -116,10 +114,13 @@ class Cleaner (object): raise Fail('Unable to find', command, 'in $PATH') # Are we being run from the right place ? - myNames = scriptPath.split(os.path.sep) - if not (here.split(os.path.sep)[-5:] == myNames[-6:-1] + scriptPath, myName = os.path.split(scriptPath) + hereNames, depth = scriptPath.split(os.path.sep), 5 + hereNames = hereNames[-depth:] # path components from qtbase down + assert hereNames[0] == 'qtbase', ('Script moved: please correct depth', hereNames) + if not (here.split(os.path.sep)[-depth:] == hereNames and os.path.isfile(qmake)): - raise Fail('Run', myNames[-1], 'in its directory of a completed build') + raise Fail('Run', myName, 'in its directory of a completed build') try: qtver = subprocess.check_output([qmake, '-query', 'QT_VERSION']) @@ -127,8 +128,17 @@ class Cleaner (object): raise Fail(what.strerror) qtver = qtver.strip().decode('utf-8') - scriptPath = os.path.dirname(scriptPath) # ditch leaf file-name - sentinel = os.path.sep + 'qtbase' + os.path.sep # '/qtbase/' + hereNames = tuple(hereNames) + # Add path to specific sources and to tst_*.cpp if missing (for in-source builds): + patterns += ((r'(^|[^/])\b(qtestcase.cpp)\b', r'\1qtbase/src/testlib/\2'), + # Add more special cases here, if they show up ! + (r'([[" ])\.\./(counting/tst_counting.cpp)\b', + r'\1' + os.path.sep.join(hereNames + (r'\2',))), + # The common pattern: + (r'(^|[^/])\b(tst_)?([a-z]+\d*)\.cpp\b', + r'\1' + os.path.sep.join(hereNames + (r'\3', r'\2\3.cpp')))) + + sentinel = os.path.sep + hereNames[0] + os.path.sep # '/qtbase/' # Identify the path prefix of our qtbase ancestor directory # (source, build and $PWD, when different); trim such prefixes # off all paths we see. @@ -212,7 +222,7 @@ class Scanner (object): del re def generateTestData(testname, clean, - formats = ('xml', 'txt', 'xunitxml', 'lightxml', 'teamcity'), + formats = ('xml', 'txt', 'xunitxml', 'lightxml', 'teamcity', 'tap'), extraArgs = { "commandlinedata": "fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2", "benchlibcallgrind": "-callgrind", diff --git a/tests/auto/testlib/selftests/keyboard/keyboard.pro b/tests/auto/testlib/selftests/keyboard/keyboard.pro new file mode 100644 index 0000000000..0097318797 --- /dev/null +++ b/tests/auto/testlib/selftests/keyboard/keyboard.pro @@ -0,0 +1,7 @@ +SOURCES += tst_keyboard.cpp +QT += testlib testlib-private gui gui-private + +macos:CONFIG -= app_bundle +CONFIG -= debug_and_release_target + +TARGET = keyboard diff --git a/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp b/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp new file mode 100644 index 0000000000..e185be8532 --- /dev/null +++ b/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/qtest.h> +#include <QtGui/qwindow.h> + +class tst_Keyboard : public QObject +{ + Q_OBJECT + +private slots: + void keyPressAndRelease(); +}; + +class KeyWindow : public QWindow +{ +public: + void keyPressEvent(QKeyEvent *event) override + { + QSharedPointer<QKeyEvent> copiedEvent(new QKeyEvent(event->type(), event->key(), + event->modifiers(), event->text(), event->isAutoRepeat(), event->count())); + mEventOrder.append(copiedEvent); + } + + void keyReleaseEvent(QKeyEvent *event) override + { + QSharedPointer<QKeyEvent> copiedEvent(new QKeyEvent(event->type(), event->key(), + event->modifiers(), event->text(), event->isAutoRepeat(), event->count())); + mEventOrder.append(copiedEvent); + } + + QVector<QSharedPointer<QKeyEvent>> mEventOrder; +}; + +void tst_Keyboard::keyPressAndRelease() +{ + KeyWindow window; + window.show(); + window.setGeometry(100, 100, 200, 200); + QVERIFY(QTest::qWaitForWindowExposed(&window)); + QVERIFY(QTest::qWaitForWindowActive(&window)); + + QTest::keyPress(&window, Qt::Key_A); + QTest::keyRelease(&window, Qt::Key_A); + QCOMPARE(window.mEventOrder.size(), 2); + + const auto pressEvent = window.mEventOrder.at(0); + QCOMPARE(pressEvent->type(), QEvent::KeyPress); + QCOMPARE(pressEvent->key(), Qt::Key_A); + QCOMPARE(pressEvent->modifiers(), Qt::NoModifier); + QCOMPARE(pressEvent->text(), "a"); + QCOMPARE(pressEvent->isAutoRepeat(), false); + + const auto releaseEvent = window.mEventOrder.at(1); + QCOMPARE(releaseEvent->type(), QEvent::KeyRelease); + QCOMPARE(releaseEvent->key(), Qt::Key_A); + QCOMPARE(releaseEvent->modifiers(), Qt::NoModifier); + QCOMPARE(releaseEvent->text(), "a"); + QCOMPARE(releaseEvent->isAutoRepeat(), false); +} + +QTEST_MAIN(tst_Keyboard) +#include "tst_keyboard.moc" diff --git a/tests/auto/testlib/selftests/selftests.pri b/tests/auto/testlib/selftests/selftests.pri index 079f3f7959..2a31630737 100644 --- a/tests/auto/testlib/selftests/selftests.pri +++ b/tests/auto/testlib/selftests/selftests.pri @@ -27,8 +27,10 @@ SUBPROGRAMS = \ findtestdata \ float \ globaldata \ + keyboard \ longstring \ maxwarnings \ + mouse \ multiexec \ pairdiagnostics \ printdatatags \ @@ -47,8 +49,7 @@ SUBPROGRAMS = \ verbose2 \ verifyexceptionthrown \ warnings \ - xunit \ - mouse + xunit INCLUDEPATH += ../../../../shared/ HEADERS += ../../../../shared/emulationdetector.h diff --git a/tests/auto/testlib/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc deleted file mode 100644 index 75d3375394..0000000000 --- a/tests/auto/testlib/selftests/selftests.qrc +++ /dev/null @@ -1,219 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>expected_assert.lightxml</file> - <file>expected_assert.teamcity</file> - <file>expected_assert.txt</file> - <file>expected_assert.xml</file> - <file>expected_assert.xunitxml</file> - <file>expected_badxml.lightxml</file> - <file>expected_badxml.teamcity</file> - <file>expected_badxml.txt</file> - <file>expected_badxml.xml</file> - <file>expected_badxml.xunitxml</file> - <file>expected_benchlibcallgrind_0.txt</file> - <file>expected_benchlibcallgrind_1.txt</file> - <file>expected_benchlibcallgrind.csv</file> - <file>expected_benchlibcallgrind.lightxml</file> - <file>expected_benchlibcallgrind.xml</file> - <file>expected_benchlibcallgrind.xunitxml</file> - <file>expected_benchlibcounting.csv</file> - <file>expected_benchlibcounting.lightxml</file> - <file>expected_benchlibcounting.txt</file> - <file>expected_benchlibcounting.xml</file> - <file>expected_benchlibcounting.xunitxml</file> - <file>expected_benchlibeventcounter.csv</file> - <file>expected_benchlibeventcounter.lightxml</file> - <file>expected_benchlibeventcounter.txt</file> - <file>expected_benchlibeventcounter.xml</file> - <file>expected_benchlibeventcounter.xunitxml</file> - <file>expected_benchliboptions.lightxml</file> - <file>expected_benchliboptions.txt</file> - <file>expected_benchliboptions.xml</file> - <file>expected_benchliboptions.xunitxml</file> - <file>expected_benchlibtickcounter.csv</file> - <file>expected_benchlibtickcounter.lightxml</file> - <file>expected_benchlibtickcounter.txt</file> - <file>expected_benchlibtickcounter.xml</file> - <file>expected_benchlibtickcounter.xunitxml</file> - <file>expected_benchlibwalltime.csv</file> - <file>expected_benchlibwalltime.lightxml</file> - <file>expected_benchlibwalltime.txt</file> - <file>expected_benchlibwalltime.xml</file> - <file>expected_benchlibwalltime.xunitxml</file> - <file>expected_blacklisted.lightxml</file> - <file>expected_blacklisted.txt</file> - <file>expected_blacklisted.xml</file> - <file>expected_blacklisted.xunitxml</file> - <file>expected_cmptest.lightxml</file> - <file>expected_cmptest.teamcity</file> - <file>expected_cmptest.txt</file> - <file>expected_cmptest.xml</file> - <file>expected_cmptest.xunitxml</file> - <file>expected_commandlinedata.lightxml</file> - <file>expected_commandlinedata.teamcity</file> - <file>expected_commandlinedata.txt</file> - <file>expected_commandlinedata.xml</file> - <file>expected_commandlinedata.xunitxml</file> - <file>expected_counting.lightxml</file> - <file>expected_counting.teamcity</file> - <file>expected_counting.txt</file> - <file>expected_counting.xml</file> - <file>expected_counting.xunitxml</file> - <file>expected_crashes_1.txt</file> - <file>expected_crashes_2.txt</file> - <file>expected_crashes_3.txt</file> - <file>expected_datatable.lightxml</file> - <file>expected_datatable.teamcity</file> - <file>expected_datatable.txt</file> - <file>expected_datatable.xml</file> - <file>expected_datatable.xunitxml</file> - <file>expected_datetime.lightxml</file> - <file>expected_datetime.teamcity</file> - <file>expected_datetime.txt</file> - <file>expected_datetime.xml</file> - <file>expected_datetime.xunitxml</file> - <file>expected_differentexec.lightxml</file> - <file>expected_differentexec.txt</file> - <file>expected_differentexec.xml</file> - <file>expected_differentexec.xunitxml</file> - <file>expected_exceptionthrow.lightxml</file> - <file>expected_exceptionthrow.teamcity</file> - <file>expected_exceptionthrow.txt</file> - <file>expected_exceptionthrow.xml</file> - <file>expected_exceptionthrow.xunitxml</file> - <file>expected_expectfail.lightxml</file> - <file>expected_expectfail.teamcity</file> - <file>expected_expectfail.txt</file> - <file>expected_expectfail.xml</file> - <file>expected_expectfail.xunitxml</file> - <file>expected_failcleanup.lightxml</file> - <file>expected_failcleanup.teamcity</file> - <file>expected_failcleanup.txt</file> - <file>expected_failcleanup.xml</file> - <file>expected_failcleanup.xunitxml</file> - <file>expected_failinit.lightxml</file> - <file>expected_failinit.teamcity</file> - <file>expected_failinit.txt</file> - <file>expected_failinit.xml</file> - <file>expected_failinit.xunitxml</file> - <file>expected_failinitdata.lightxml</file> - <file>expected_failinitdata.teamcity</file> - <file>expected_failinitdata.txt</file> - <file>expected_failinitdata.xml</file> - <file>expected_failinitdata.xunitxml</file> - <file>expected_fetchbogus.lightxml</file> - <file>expected_fetchbogus.teamcity</file> - <file>expected_fetchbogus.txt</file> - <file>expected_fetchbogus.xml</file> - <file>expected_fetchbogus.xunitxml</file> - <file>expected_findtestdata.lightxml</file> - <file>expected_findtestdata.teamcity</file> - <file>expected_findtestdata.txt</file> - <file>expected_findtestdata.xml</file> - <file>expected_findtestdata.xunitxml</file> - <file>expected_float.lightxml</file> - <file>expected_float.txt</file> - <file>expected_float.xml</file> - <file>expected_float.xunitxml</file> - <file>expected_globaldata.lightxml</file> - <file>expected_globaldata.teamcity</file> - <file>expected_globaldata.txt</file> - <file>expected_globaldata.xml</file> - <file>expected_globaldata.xunitxml</file> - <file>expected_longstring.lightxml</file> - <file>expected_longstring.teamcity</file> - <file>expected_longstring.txt</file> - <file>expected_longstring.xml</file> - <file>expected_longstring.xunitxml</file> - <file>expected_maxwarnings.lightxml</file> - <file>expected_maxwarnings.teamcity</file> - <file>expected_maxwarnings.txt</file> - <file>expected_maxwarnings.xml</file> - <file>expected_maxwarnings.xunitxml</file> - <file>expected_multiexec.lightxml</file> - <file>expected_multiexec.txt</file> - <file>expected_multiexec.xml</file> - <file>expected_multiexec.xunitxml</file> - <file>expected_pairdiagnostics.lightxml</file> - <file>expected_pairdiagnostics.teamcity</file> - <file>expected_pairdiagnostics.txt</file> - <file>expected_pairdiagnostics.xml</file> - <file>expected_pairdiagnostics.xunitxml</file> - <file>expected_printdatatags.txt</file> - <file>expected_printdatatagswithglobaltags.txt</file> - <file>expected_qexecstringlist.lightxml</file> - <file>expected_qexecstringlist.txt</file> - <file>expected_qexecstringlist.xml</file> - <file>expected_qexecstringlist.xunitxml</file> - <file>expected_silent.lightxml</file> - <file>expected_silent.teamcity</file> - <file>expected_silent.txt</file> - <file>expected_silent.xml</file> - <file>expected_silent.xunitxml</file> - <file>expected_singleskip.lightxml</file> - <file>expected_singleskip.teamcity</file> - <file>expected_singleskip.txt</file> - <file>expected_singleskip.xml</file> - <file>expected_singleskip.xunitxml</file> - <file>expected_skip.lightxml</file> - <file>expected_skip.teamcity</file> - <file>expected_skip.txt</file> - <file>expected_skip.xml</file> - <file>expected_skip.xunitxml</file> - <file>expected_skipcleanup.lightxml</file> - <file>expected_skipcleanup.teamcity</file> - <file>expected_skipcleanup.txt</file> - <file>expected_skipcleanup.xml</file> - <file>expected_skipcleanup.xunitxml</file> - <file>expected_skipinit.lightxml</file> - <file>expected_skipinit.txt</file> - <file>expected_skipinit.teamcity</file> - <file>expected_skipinit.xml</file> - <file>expected_skipinit.xunitxml</file> - <file>expected_skipinitdata.lightxml</file> - <file>expected_skipinitdata.teamcity</file> - <file>expected_skipinitdata.txt</file> - <file>expected_skipinitdata.xml</file> - <file>expected_skipinitdata.xunitxml</file> - <file>expected_sleep.lightxml</file> - <file>expected_sleep.teamcity</file> - <file>expected_sleep.txt</file> - <file>expected_sleep.xml</file> - <file>expected_sleep.xunitxml</file> - <file>expected_strcmp.lightxml</file> - <file>expected_strcmp.teamcity</file> - <file>expected_strcmp.txt</file> - <file>expected_strcmp.xml</file> - <file>expected_strcmp.xunitxml</file> - <file>expected_subtest.lightxml</file> - <file>expected_subtest.txt</file> - <file>expected_subtest.teamcity</file> - <file>expected_subtest.xml</file> - <file>expected_subtest.xunitxml</file> - <file>expected_verbose1.lightxml</file> - <file>expected_verbose1.teamcity</file> - <file>expected_verbose1.txt</file> - <file>expected_verbose1.xml</file> - <file>expected_verbose1.xunitxml</file> - <file>expected_verbose2.lightxml</file> - <file>expected_verbose2.teamcity</file> - <file>expected_verbose2.txt</file> - <file>expected_verbose2.xml</file> - <file>expected_verbose2.xunitxml</file> - <file>expected_verifyexceptionthrown.lightxml</file> - <file>expected_verifyexceptionthrown.teamcity</file> - <file>expected_verifyexceptionthrown.txt</file> - <file>expected_verifyexceptionthrown.xml</file> - <file>expected_verifyexceptionthrown.xunitxml</file> - <file>expected_warnings.lightxml</file> - <file>expected_warnings.teamcity</file> - <file>expected_warnings.txt</file> - <file>expected_warnings.xml</file> - <file>expected_warnings.xunitxml</file> - <file>expected_xunit.lightxml</file> - <file>expected_xunit.teamcity</file> - <file>expected_xunit.txt</file> - <file>expected_xunit.xml</file> - <file>expected_xunit.xunitxml</file> - </qresource> -</RCC> diff --git a/tests/auto/testlib/selftests/test/test.pro b/tests/auto/testlib/selftests/test/test.pro index a7487736b3..a348ea9ad5 100644 --- a/tests/auto/testlib/selftests/test/test.pro +++ b/tests/auto/testlib/selftests/test/test.pro @@ -12,7 +12,9 @@ win32 { } } -RESOURCES += ../selftests.qrc +expected_files.files = $$files($$PWD/../expected_*) +expected_files.base = $$PWD/.. +RESOURCES += expected_files include(../selftests.pri) !winrt: for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}" diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 63e5721e7e..ac20b12433 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -62,11 +62,22 @@ private slots: private: void doRunSubTest(QString const& subdir, QStringList const& loggers, QStringList const& arguments, bool crashes); + bool compareOutput(const QString &logger, const QString &subdir, + const QByteArray &rawOutput, const QByteArrayList &actual, + const QByteArrayList &expected, + QString *errorMessage) const; + bool compareLine(const QString &logger, const QString &subdir, bool benchmark, + const QString &actualLine, const QString &expLine, + QString *errorMessage) const; + bool checkXml(const QString &logger, QByteArray rawOutput, + QString *errorMessage) const; + QString logName(const QString &logger) const; QList<LoggerSet> allLoggerSets() const; QTemporaryDir tempDir; QRegularExpression durationRegExp; + QRegularExpression teamcityLocRegExp; }; struct BenchmarkResult @@ -81,46 +92,50 @@ struct BenchmarkResult static BenchmarkResult parse(QString const&, QString*); }; -QT_BEGIN_NAMESPACE -namespace QTest +static QString msgMismatch(const QString &actual, const QString &expected) { -template <> -inline bool qCompare - (BenchmarkResult const &r1, BenchmarkResult const &r2, - const char* actual, const char* expected, const char* file, int line) + return QLatin1String("Mismatch:\n'") + actual + QLatin1String("'\n !=\n'") + + expected + QLatin1Char('\''); +} + +static bool compareBenchmarkResult(BenchmarkResult const &r1, BenchmarkResult const &r2, + QString *errorMessage) { // First make sure the iterations and unit match. if (r1.iterations != r2.iterations || r1.unit != r2.unit) { // Nope - compare whole string for best failure message - return qCompare(r1.toString(), r2.toString(), actual, expected, file, line); + *errorMessage = msgMismatch(r1.toString(), r2.toString()); + return false; } // Now check the value. Some variance is allowed, and how much depends on // the measured unit. qreal variance = 0.; - if (r1.unit == "msecs" || r1.unit == "WalltimeMilliseconds") { + if (r1.unit == QLatin1String("msecs") || r1.unit == QLatin1String("WalltimeMilliseconds")) variance = 0.1; - } - else if (r1.unit == "instruction reads") { + else if (r1.unit == QLatin1String("instruction reads")) variance = 0.001; - } - else if (r1.unit == "CPU ticks" || r1.unit == "CPUTicks") { + else if (r1.unit == QLatin1String("CPU ticks") || r1.unit == QLatin1String("CPUTicks")) variance = 0.001; - } + if (variance == 0.) { // No variance allowed - compare whole string - return qCompare(r1.toString(), r2.toString(), actual, expected, file, line); + const QString r1S = r1.toString(); + const QString r2S = r2.toString(); + if (r1S != r2S) { + *errorMessage = msgMismatch(r1S, r2S); + return false; + } + return true; } - if (qAbs(qreal(r1.total) - qreal(r2.total)) <= qreal(r1.total)*variance) { - return compare_helper(true, 0, 0, 0, actual, expected, file, line); + if (qAbs(qreal(r1.total) - qreal(r2.total)) > qreal(r1.total) * variance) { + // Whoops, didn't match. Compare the whole string for the most useful failure message. + *errorMessage = msgMismatch(r1.toString(), r2.toString()); + return false; } - - // Whoops, didn't match. Compare the whole string for the most useful failure message. - return qCompare(r1.toString(), r2.toString(), actual, expected, file, line); -} + return true; } -QT_END_NAMESPACE // Split the passed block of text into an array of lines, replacing any // filenames and line numbers with generic markers to avoid failing the test @@ -227,26 +242,6 @@ static QByteArray runDiff(const QByteArrayList &expected, const QByteArrayList & return result; } -// Print the difference preferably using 'diff', else just print lines -static void printDifference(const QByteArrayList &expected, const QByteArrayList &actual) -{ - QDebug info = qInfo(); - info.noquote(); - info.nospace(); - const QByteArray diff = runDiff(expected, actual); - if (diff.isEmpty()) { - info << "<<<<<<\n"; - for (const QByteArray &line : actual) - info << line << '\n'; - info << "======\n"; - for (const QByteArray &line : expected) - info << line << '\n'; - info << ">>>>>>\n"; - } else { - info << diff; - } -} - // Each test is run with a set of one or more test output loggers. // This struct holds information about one such test. struct LoggerSet @@ -315,6 +310,14 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const QStringList() << "teamcity", QStringList() << "-teamcity" << "-o" << logName("teamcity") ) + << LoggerSet("old stdout tap", + QStringList() << "stdout tap", + QStringList() << "-tap" + ) + << LoggerSet("old tap", + QStringList() << "tap", + QStringList() << "-tap" << "-o" << logName("tap") + ) // Test with new-style options for a single logger << LoggerSet("new stdout txt", QStringList() << "stdout txt", @@ -362,6 +365,14 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const QStringList() << "teamcity", QStringList() << "-o" << logName("teamcity")+",teamcity" ) + << LoggerSet("new stdout tap", + QStringList() << "stdout tap", + QStringList() << "-o" << "-,tap" + ) + << LoggerSet("new tap", + QStringList() << "tap", + QStringList() << "-o" << logName("tap")+",tap" + ) // Test with two loggers (don't test all 32 combinations, just a sample) << LoggerSet("stdout txt + txt", QStringList() << "stdout txt" << "txt", @@ -385,13 +396,14 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const ) // All loggers at the same time (except csv) << LoggerSet("all loggers", - QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "xunitxml", + QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "xunitxml" << "tap", QStringList() << "-o" << logName("txt")+",txt" << "-o" << logName("xml")+",xml" << "-o" << logName("lightxml")+",lightxml" << "-o" << "-,txt" << "-o" << logName("xunitxml")+",xunitxml" << "-o" << logName("teamcity")+",teamcity" + << "-o" << logName("tap")+",tap" ) ; } @@ -399,6 +411,7 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const tst_Selftests::tst_Selftests() : tempDir(QDir::tempPath() + "/tst_selftests.XXXXXX") , durationRegExp("<Duration msecs=\"[\\d\\.]+\"/>") + , teamcityLocRegExp("\\|\\[Loc: .*\\(\\d*\\)\\|\\]") {} void tst_Selftests::initTestCase() @@ -464,6 +477,7 @@ void tst_Selftests::runSubTest_data() << "findtestdata" << "float" << "globaldata" + << "keyboard" << "longstring" << "maxwarnings" << "multiexec" @@ -760,147 +774,203 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge } QList<QByteArray> res = splitLines(actualOutputs[n]); - const QString expectedFileName = expectedFileNameFromTest(subdir, logger); - QList<QByteArray> exp = expectedResult(expectedFileName); + QString errorMessage; + QString expectedFileName = expectedFileNameFromTest(subdir, logger); + QByteArrayList exp = expectedResult(expectedFileName); + if (!exp.isEmpty()) { #ifdef Q_CC_MINGW - // MinGW formats double numbers differently - if (n == 0 && subdir == QStringLiteral("float")) { - for (int i = 0; i < exp.size(); ++i) { - exp[i].replace("e-07", "e-007"); - exp[i].replace("e+07", "e+007"); - } - } -#endif - - // For the "crashes" test, there are multiple versions of the - // expected output. Load the one with the same line count as - // the actual output. - if (exp.count() == 0) { - QList<QList<QByteArray> > expArr; - QList<QByteArray> tmp; - int i = 1; - do { - tmp = expectedResult(expectedFileNameFromTest(subdir + QLatin1Char('_') + QString::number(i++), logger)); - if (tmp.count()) - expArr += tmp; - } while (tmp.count()); - - for (int j = 0; j < expArr.count(); ++j) { - if (res.count() == expArr.at(j).count()) { - exp = expArr.at(j); - break; + // MinGW formats double numbers differently (last verified with 7.1) + if (n == 0 && subdir == QStringLiteral("float")) { + for (int i = 0; i < exp.size(); ++i) { + exp[i].replace("e-07", "e-007"); + exp[i].replace("e+07", "e+007"); } } - - if (expArr.count()) { - QVERIFY2(exp.count(), - qPrintable(QString::fromLatin1("None of the expected output files for " - "%1 format has matching line count.") - .arg(loggers.at(n)))); +#endif + if (!compareOutput(logger, subdir, actualOutputs[n], res, exp, &errorMessage)) { + errorMessage.prepend(QLatin1Char('"') + logger + QLatin1String("\", ") + + expectedFileName + QLatin1Char(' ')); + errorMessage += QLatin1String("\nActual:\n") + QLatin1String(actualOutputs[n]); + const QByteArray diff = runDiff(exp, res); + if (!diff.isEmpty()) + errorMessage += QLatin1String("\nDiff:\n") + QLatin1String(diff); + QFAIL(qPrintable(errorMessage)); } } else { - if (res.count() != exp.count()) { - printDifference(exp, res); - QVERIFY2(res.count() == exp.count(), - qPrintable(QString::fromLatin1("Mismatch in line count: %1 != %2 (%3, %4).") - .arg(res.count()).arg(exp.count()).arg(loggers.at(n), expectedFileName))); + // For the "crashes" and other tests, there are multiple versions of the + // expected output. Loop until a matching one is found. + bool ok = false; + for (int i = 1; !ok; ++i) { + expectedFileName = expectedFileNameFromTest(subdir + QLatin1Char('_') + QString::number(i), logger); + const QByteArrayList exp = expectedResult(expectedFileName); + if (exp.isEmpty()) + break; + QString errorMessage2; + ok = compareOutput(logger, subdir, actualOutputs[n], res, exp, &errorMessage2); + if (!ok) + errorMessage += QLatin1Char('\n') + expectedFileName + QLatin1String(": ") + errorMessage2; + } + if (!ok) { // Use QDebug's quote mechanism to report potentially garbled output. + errorMessage.prepend(QLatin1String("Cannot find a matching file for ") + subdir); + errorMessage += QLatin1String("\nActual:\n"); + QDebug(&errorMessage) << actualOutputs[n]; + QFAIL(qPrintable(errorMessage)); } } + } +} - // By this point, we should have loaded a non-empty expected data file. - QVERIFY2(exp.count(), - qPrintable(QString::fromLatin1("Expected test data for %1 format is empty or not found.") - .arg(loggers.at(n)))); - - // For xml output formats, verify that the log is valid XML. - if (logFormat(logger) == "xunitxml" || logFormat(logger) == "xml" || logFormat(logger) == "lightxml") { - QByteArray xml(actualOutputs[n]); - // lightxml intentionally skips the root element, which technically makes it - // not valid XML. - // We'll add that ourselves for the purpose of validation. - if (logFormat(logger) == "lightxml") { - xml.prepend("<root>"); - xml.append("</root>"); - } +static QString teamCityLocation() { return QStringLiteral("|[Loc: _FILE_(_LINE_)|]"); } +static QString qtVersionPlaceHolder() { return QStringLiteral("@INSERT_QT_VERSION_HERE@"); } - QXmlStreamReader reader(xml); +bool tst_Selftests::compareOutput(const QString &logger, const QString &subdir, + const QByteArray &rawOutput, const QByteArrayList &actual, + const QByteArrayList &expected, + QString *errorMessage) const +{ - while (!reader.atEnd()) - reader.readNext(); + if (actual.size() != expected.size()) { + *errorMessage = QString::fromLatin1("Mismatch in line count: %1 != %2.") + .arg(actual.size()).arg(expected.size()); + return false; + } - QVERIFY2(!reader.error(), qPrintable(QString("line %1, col %2: %3") - .arg(reader.lineNumber()) - .arg(reader.columnNumber()) - .arg(reader.errorString()) - )); + // For xml output formats, verify that the log is valid XML. + if (logger.endsWith(QLatin1String("xml")) && !checkXml(logger, rawOutput, errorMessage)) + return false; + + // Verify that the actual output is an acceptable match for the + // expected output. + + const QString qtVersion = QLatin1String(QT_VERSION_STR); + bool benchmark = false; + for (int i = 0, size = actual.size(); i < size; ++i) { + const QByteArray &actualLineBA = actual.at(i); + // the __FILE__ __LINE__ output is compiler dependent, skip it + if (actualLineBA.startsWith(" Loc: [") && actualLineBA.endsWith(")]")) + continue; + if (actualLineBA.endsWith(" : failure location")) + continue; + + if (actualLineBA.startsWith("Config: Using QtTest library") // Text build string + || actualLineBA.startsWith(" <QtBuild") // XML, Light XML build string + || (actualLineBA.startsWith(" <property value=") && actualLineBA.endsWith("name=\"QtBuild\"/>"))) { // XUNIT-XML build string + continue; } - // Verify that the actual output is an acceptable match for the - // expected output. - bool benchmark = false; - for (int i = 0; i < res.count(); ++i) { - QByteArray line = res.at(i); - // the __FILE__ __LINE__ output is compiler dependent, skip it - if (line.startsWith(" Loc: [") && line.endsWith(")]")) - continue; - if (line.endsWith(" : failure location")) - continue; + QString actualLine = QString::fromLatin1(actualLineBA); + QString expectedLine = QString::fromLatin1(expected.at(i)); + expectedLine.replace(qtVersionPlaceHolder(), qtVersion); - if (line.startsWith("Config: Using QtTest library") // Text build string - || line.startsWith(" <QtBuild") // XML, Light XML build string - || (line.startsWith(" <property value=") && line.endsWith("name=\"QtBuild\"/>"))) { // XUNIT-XML build string - continue; - } + // Special handling for ignoring _FILE_ and _LINE_ if logger is teamcity + if (logger.endsWith(QLatin1String("teamcity"))) { + actualLine.replace(teamcityLocRegExp, teamCityLocation()); + expectedLine.replace(teamcityLocRegExp, teamCityLocation()); + } - QByteArray expLine = exp.at(i); + if (logger.endsWith(QLatin1String("tap"))) { + if (expectedLine.contains(QLatin1String("at:")) + || expectedLine.contains(QLatin1String("file:")) + || expectedLine.contains(QLatin1String("line:"))) + actualLine = expectedLine; + } - // Special handling for ignoring _FILE_ and _LINE_ if logger is teamcity - if (logFormat(logger) == "teamcity") { - QRegularExpression teamcityLocRegExp("\\|\\[Loc: .*\\(\\d*\\)\\|\\]"); - line = QString(line).replace(teamcityLocRegExp, "|[Loc: _FILE_(_LINE_)|]").toLatin1(); - expLine = QString(expLine).replace(teamcityLocRegExp, "|[Loc: _FILE_(_LINE_)|]").toLatin1(); - } + if (!compareLine(logger, subdir, benchmark, actualLine, + expectedLine, errorMessage)) { + errorMessage->prepend(QLatin1String("Line ") + QString::number(i + 1) + + QLatin1String(": ")); + return false; + } - const QString output(QString::fromLatin1(line)); - const QString expected(QString::fromLatin1(expLine).replace("@INSERT_QT_VERSION_HERE@", QT_VERSION_STR)); + benchmark = actualLineBA.startsWith("RESULT : "); + } + return true; +} - if (subdir == "assert" && output.contains("ASSERT: ") && expected.contains("ASSERT: ") && output != expected) - // Q_ASSERT uses __FILE__, the exact contents of which are - // undefined. If we something that looks like a Q_ASSERT and we - // were expecting to see a Q_ASSERT, we'll skip the line. - continue; - else if (expected.startsWith(QLatin1String("FAIL! : tst_Exception::throwException() Caught unhandled exce")) && expected != output) - // On some platforms we compile without RTTI, and as a result we never throw an exception. - QCOMPARE(output.simplified(), QString::fromLatin1("tst_Exception::throwException()").simplified()); - else if (benchmark || line.startsWith("<BenchmarkResult") || (logFormat(logger) == "csv" && line.startsWith('"'))) { - // Don't do a literal comparison for benchmark results, since - // results have some natural variance. - QString error; - - BenchmarkResult actualResult = BenchmarkResult::parse(output, &error); - QVERIFY2(error.isEmpty(), qPrintable(QString("Actual line didn't parse as benchmark result: %1\nLine: %2").arg(error).arg(output))); - - BenchmarkResult expectedResult = BenchmarkResult::parse(expected, &error); - QVERIFY2(error.isEmpty(), qPrintable(QString("Expected line didn't parse as benchmark result: %1\nLine: %2").arg(error).arg(expected))); - - QCOMPARE(actualResult, expectedResult); - } else if (line.startsWith(" <Duration msecs=") || line.startsWith("<Duration msecs=")) { - QRegularExpressionMatch match = durationRegExp.match(line); - QVERIFY2(match.hasMatch(), qPrintable(QString::fromLatin1("Invalid Duration tag at line %1 (%2): '%3'") - .arg(i).arg(loggers.at(n), output))); - } else if (line.startsWith("Totals:")) { - const int lastCommaPos = line.lastIndexOf(','); - if (lastCommaPos > 0) - line.truncate(lastCommaPos); // Plain text logger: strip time (", 2323dms"). - } else { - QVERIFY2(output == expected, - qPrintable(QString::fromLatin1("Mismatch at line %1 (%2, %3):\n'%4'\n !=\n'%5'") - .arg(i + 1).arg(loggers.at(n), expectedFileName, output, expected))); - } +bool tst_Selftests::compareLine(const QString &logger, const QString &subdir, + bool benchmark, + const QString &actualLine, const QString &expectedLine, + QString *errorMessage) const +{ + if (subdir == QLatin1String("assert") && actualLine.contains(QLatin1String("ASSERT: ")) + && expectedLine.contains(QLatin1String("ASSERT: ")) && actualLine != expectedLine) { + // Q_ASSERT uses __FILE__, the exact contents of which are + // undefined. If have we something that looks like a Q_ASSERT and we + // were expecting to see a Q_ASSERT, we'll skip the line. + return true; + } - benchmark = line.startsWith("RESULT : "); + if (expectedLine.startsWith(QLatin1String("FAIL! : tst_Exception::throwException() Caught unhandled exce")) + && actualLine != expectedLine) { + // On some platforms we compile without RTTI, and as a result we never throw an exception + if (actualLine.simplified() != QLatin1String("tst_Exception::throwException()")) { + *errorMessage = QString::fromLatin1("'%1' != 'tst_Exception::throwException()'").arg(actualLine); + return false; } + return true; + } + + if (benchmark || actualLine.startsWith(QLatin1String("<BenchmarkResult")) + || (logger == QLatin1String("csv") && actualLine.startsWith(QLatin1Char('"')))) { + // Don't do a literal comparison for benchmark results, since + // results have some natural variance. + QString error; + BenchmarkResult actualResult = BenchmarkResult::parse(actualLine, &error); + if (!error.isEmpty()) { + *errorMessage = QString::fromLatin1("Actual line didn't parse as benchmark result: %1\nLine: %2").arg(error, actualLine); + return false; + } + BenchmarkResult expectedResult = BenchmarkResult::parse(expectedLine, &error); + if (!error.isEmpty()) { + *errorMessage = QString::fromLatin1("Expected line didn't parse as benchmark result: %1\nLine: %2").arg(error, expectedLine); + return false; + } + return compareBenchmarkResult(actualResult, expectedResult, errorMessage); + } + + if (actualLine.startsWith(QLatin1String(" <Duration msecs=")) + || actualLine.startsWith(QLatin1String("<Duration msecs="))) { + QRegularExpressionMatch match = durationRegExp.match(actualLine); + if (match.hasMatch()) + return true; + *errorMessage = QString::fromLatin1("Invalid Duration tag: '%1'").arg(actualLine); + return false; + } + + if (actualLine.startsWith(QLatin1String("Totals:")) && expectedLine.startsWith(QLatin1String("Totals:"))) + return true; + + if (actualLine == expectedLine) + return true; + + *errorMessage = msgMismatch(actualLine, expectedLine); + return false; +} + +bool tst_Selftests::checkXml(const QString &logger, QByteArray xml, + QString *errorMessage) const +{ + // lightxml intentionally skips the root element, which technically makes it + // not valid XML. + // We'll add that ourselves for the purpose of validation. + if (logger.endsWith(QLatin1String("lightxml"))) { + xml.prepend("<root>"); + xml.append("</root>"); + } + + QXmlStreamReader reader(xml); + while (!reader.atEnd()) + reader.readNext(); + + if (reader.hasError()) { + const int lineNumber = int(reader.lineNumber()); + const QByteArray line = xml.split('\n').value(lineNumber - 1); + *errorMessage = QString::fromLatin1("line %1, col %2 '%3': %4") + .arg(lineNumber).arg(reader.columnNumber()) + .arg(QString::fromLatin1(line), reader.errorString()); + return false; } + return true; } #endif // QT_CONFIG(process) diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 90f8457b7f..e39110bb50 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -936,7 +936,6 @@ void tst_QFiledialog::selectFiles() QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(QStringList))); QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); - fd.show(); fd.setFileMode(QFileDialog::ExistingFiles); QString filesPath = fd.directory().absolutePath(); @@ -1524,7 +1523,8 @@ public: const QWindow *window = QGuiApplication::topLevelWindows().constFirst(); const QFileDialog *fileDialog = qobject_cast<QFileDialog*>(QApplication::activeModalWidget()); - QVERIFY(fileDialog); + if (!fileDialog) + return; // The problem in QTBUG-57193 was from a platform input context plugin that was // connected to QWindow::focusObjectChanged(), and consequently accessed the focus diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 6c1abaedb3..6ff95c0304 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -986,6 +986,7 @@ void tst_QGraphicsItem::inputMethodHints() QGraphicsView view(&scene); QApplication::setActiveWindow(&view); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); item->setFocus(); QTRY_VERIFY(item->hasFocus()); @@ -1036,6 +1037,7 @@ void tst_QGraphicsItem::toolTip() view.setFixedSize(200, 200); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); { QHelpEvent helpEvent(QEvent::ToolTip, view.viewport()->rect().topLeft(), @@ -3226,6 +3228,7 @@ void tst_QGraphicsItem::hoverEventsGenerateRepaints() QGraphicsScene scene; QGraphicsView view(&scene); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); EventTester *tester = new EventTester; @@ -4938,6 +4941,7 @@ void tst_QGraphicsItem::sceneEventFilter() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QGraphicsTextItem *text1 = scene.addText(QLatin1String("Text1")); @@ -6802,6 +6806,7 @@ void tst_QGraphicsItem::opacity2() MyGraphicsView view(&scene); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(view.repaints >= 1); @@ -6874,6 +6879,7 @@ void tst_QGraphicsItem::opacityZeroUpdates() MyGraphicsView view(&scene); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(view.repaints > 0); @@ -7262,6 +7268,7 @@ void tst_QGraphicsItem::cacheMode() view.resize(150, 150); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); EventTester *tester = new EventTester; @@ -7440,6 +7447,7 @@ void tst_QGraphicsItem::cacheMode2() view.resize(150, 150); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); EventTester *tester = new EventTester; @@ -8093,6 +8101,7 @@ void tst_QGraphicsItem::moveLineItem() MyGraphicsView view(&scene); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); view.reset(); @@ -8161,6 +8170,7 @@ void tst_QGraphicsItem::sorting() view.setFrameStyle(0); view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(_paintedItems.count() > 0); @@ -8197,6 +8207,7 @@ void tst_QGraphicsItem::itemHasNoContents() QGraphicsView view(&scene); view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(!_paintedItems.isEmpty()); @@ -9204,6 +9215,7 @@ void tst_QGraphicsItem::ensureDirtySceneTransform() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); @@ -9590,6 +9602,7 @@ void tst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), (QWidget *)&view); @@ -10720,6 +10733,7 @@ void tst_QGraphicsItem::scroll() MyGraphicsView view(&scene); view.setFrameStyle(0); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(view.repaints > 0); @@ -11242,6 +11256,7 @@ void tst_QGraphicsItem::QTBUG_6738_missingUpdateWithSetParent() MyGraphicsView view(&scene); view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(view.repaints > 0); @@ -11290,6 +11305,7 @@ void tst_QGraphicsItem::QT_2653_fullUpdateDiscardingOpacityUpdate() parentGreen->setFlag(QGraphicsItem::ItemIgnoresTransformations); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); view.reset(); @@ -11336,6 +11352,7 @@ void tst_QGraphicsItem::QTBUG_7714_fullUpdateDiscardingOpacityUpdate2() view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); view.reset(); origView.reset(); @@ -11475,6 +11492,7 @@ void tst_QGraphicsItem::doNotMarkFullUpdateIfNotInScene() item2->setParentItem(item); scene.addItem(item); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(view.windowHandle())); QVERIFY(QTest::qWaitForWindowActive(view.windowHandle())); view.activateWindow(); QTRY_VERIFY(view.isActiveWindow()); @@ -11506,6 +11524,7 @@ void tst_QGraphicsItem::itemDiesDuringDraggingOperation() scene.addItem(item); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), (QWidget *)&view); QGraphicsSceneDragDropEvent dragEnter(QEvent::GraphicsSceneDragEnter); @@ -11533,6 +11552,7 @@ void tst_QGraphicsItem::QTBUG_12112_focusItem() view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), (QWidget *)&view); diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index f52bbce53a..87a05d02d9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -431,6 +431,7 @@ void tst_QGraphicsView::interactive() QCOMPARE(item->events.size(), 0); view.show(); view.activateWindow(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_COMPARE(item->events.size(), 1); // activate @@ -1646,6 +1647,7 @@ void tst_QGraphicsView::itemsInRect_cosmeticAdjust() view.setFrameStyle(0); view.resize(300, 300); view.showNormal(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(rect->numPaints > 0); @@ -2140,6 +2142,7 @@ void tst_QGraphicsView::sendEvent() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); @@ -2207,6 +2210,7 @@ void tst_QGraphicsView::wheelEvent() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); @@ -2443,6 +2447,7 @@ void tst_QGraphicsView::viewportUpdateMode() // Show the view, and initialize our test. view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(!view.lastUpdateRegions.isEmpty()); view.lastUpdateRegions.clear(); @@ -2526,6 +2531,7 @@ void tst_QGraphicsView::viewportUpdateMode2() view.resize(200 + left + right, 200 + top + bottom); toplevel.show(); qApp->setActiveWindow(&toplevel); + QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); QVERIFY(QTest::qWaitForWindowActive(&toplevel)); QTRY_VERIFY(view.painted); const QRect viewportRect = view.viewport()->rect(); @@ -3170,6 +3176,7 @@ void tst_QGraphicsView::task172231_untransformableItems() view.scale(2, 1); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); @@ -3969,6 +3976,7 @@ void tst_QGraphicsView::exposeRegion() view.setScene(&scene); view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(item->paints > 0); @@ -4123,6 +4131,7 @@ void tst_QGraphicsView::update2() view.resize(200, 200); view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(rect->numPaints > 0); @@ -4192,6 +4201,7 @@ void tst_QGraphicsView::update_ancestorClipsChildrenToShape() CustomView view(&scene); view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(view.painted); @@ -4245,6 +4255,7 @@ void tst_QGraphicsView::update_ancestorClipsChildrenToShape2() CustomView view(&scene); view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(view.painted); @@ -4305,6 +4316,7 @@ void tst_QGraphicsView::inputMethodSensitivity() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); @@ -4399,6 +4411,7 @@ void tst_QGraphicsView::inputContextReset() view.show(); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); @@ -4546,6 +4559,7 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins() view.setWindowFlags(Qt::X11BypassWindowManagerHint); view.show(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); // This is highly unstable (observed to pass on Windows and some Linux configurations). #ifndef Q_OS_MAC @@ -4673,6 +4687,7 @@ void tst_QGraphicsView::QTBUG_4151_clipAndIgnore() view.resize(75, 75); view.show(); view.activateWindow(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(QApplication::activeWindow(), (QWidget *)&view); @@ -4710,6 +4725,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect() view.scale(4.15, 4.15); view.showNormal(); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); view.viewport()->repaint(10,10,20,20); @@ -4834,6 +4850,7 @@ void tst_QGraphicsView::QTBUG_16063_microFocusRect() view.setFixedSize(40, 40); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); scene.setFocusItem(item); diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index fd83228c8b..57dbb98049 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -243,6 +243,7 @@ private slots: void testMinMaxSectionSize_data(); void testMinMaxSectionSize(); void sizeHintCrash(); + void testResetCachedSizeHint(); protected: void setupTestData(bool use_reset_model = false); @@ -265,13 +266,21 @@ Q_OBJECT public: QtTestModel(QObject *parent = 0): QAbstractTableModel(parent), - cols(0), rows(0), wrongIndex(false) {} - int rowCount(const QModelIndex&) const { return rows; } - int columnCount(const QModelIndex&) const { return cols; } + cols(0), rows(0), wrongIndex(false), m_bMultiLine(false) {} + int rowCount(const QModelIndex&) const override { return rows; } + int columnCount(const QModelIndex&) const override { return cols; } bool isEditable(const QModelIndex &) const { return true; } - QVariant data(const QModelIndex &idx, int) const + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override { + if (role == Qt::DisplayRole) + return m_bMultiLine ? QString("%1\n%1").arg(section) : QString::number(section); + return QAbstractTableModel::headerData(section, orientation, role); + } + QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override + { + if (role != Qt::DisplayRole) + return QVariant(); if (idx.row() < 0 || idx.column() < 0 || idx.column() >= cols || idx.row() >= rows) { wrongIndex = true; qWarning("Invalid modelIndex [%d,%d,%p]", idx.row(), idx.column(), idx.internalPointer()); @@ -354,8 +363,16 @@ public: emit layoutChanged(); } + void setMultiLineHeader(bool bEnable) + { + beginResetModel(); + m_bMultiLine = bEnable; + endResetModel(); + } + int cols, rows; mutable bool wrongIndex; + bool m_bMultiLine; }; // Testing get/set functions @@ -817,11 +834,9 @@ void tst_QHeaderView::offset() void tst_QHeaderView::sectionSizeHint() { - // Test bad arguments - view->sectionSizeHint(-1); - view->sectionSizeHint(99999); - - // TODO how to test the return value? + QCOMPARE(view->sectionSizeHint(-1), -1); + QCOMPARE(view->sectionSizeHint(99999), -1); + QVERIFY(view->sectionSizeHint(0) >= 0); } void tst_QHeaderView::logicalIndex() @@ -2268,6 +2283,7 @@ void tst_QHeaderView::QTBUG6058_reset() QHeaderView view(Qt::Vertical); view.setModel(&proxy); view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowActive(&view)); proxy.setSourceModel(&model1); @@ -3325,6 +3341,25 @@ void tst_QHeaderView::testMinMaxSectionSize() QTRY_COMPARE(header.sectionSize(0), defaultSectionSize); } +void tst_QHeaderView::testResetCachedSizeHint() +{ + QtTestModel model; + model.rows = model.cols = 10; + + QTableView tv; + tv.setModel(&model); + tv.show(); + QVERIFY(QTest::qWaitForWindowExposed(&tv)); + + QSize s1 = tv.horizontalHeader()->sizeHint(); + model.setMultiLineHeader(true); + QSize s2 = tv.horizontalHeader()->sizeHint(); + model.setMultiLineHeader(false); + QSize s3 = tv.horizontalHeader()->sizeHint(); + QCOMPARE(s1, s3); + QVERIFY(s1 != s2); +} + QTEST_MAIN(tst_QHeaderView) #include "tst_qheaderview.moc" diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp index 4d4a95b3f5..3af31267c2 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp @@ -1343,22 +1343,40 @@ void tst_QTableWidget::setItemWithSorting() } } +class QTableWidgetDataChanged : public QTableWidget +{ + Q_OBJECT +public: + using QTableWidget::QTableWidget; + + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override + { + QTableWidget::dataChanged(topLeft, bottomRight, roles); + currentRoles = roles; + } + QVector<int> currentRoles; +}; + void tst_QTableWidget::itemData() { - QTableWidget widget(2, 2); + QTableWidgetDataChanged widget(2, 2); widget.setItem(0, 0, new QTableWidgetItem()); QTableWidgetItem *item = widget.item(0, 0); QVERIFY(item); item->setFlags(item->flags() | Qt::ItemIsEditable); item->setData(Qt::DisplayRole, QString("0")); + QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); item->setData(Qt::CheckStateRole, Qt::PartiallyChecked); - item->setData(Qt::UserRole + 0, QString("1")); - item->setData(Qt::UserRole + 1, QString("2")); - item->setData(Qt::UserRole + 2, QString("3")); - item->setData(Qt::UserRole + 3, QString("4")); + QCOMPARE(widget.currentRoles, {Qt::CheckStateRole}); + for (int i = 0; i < 4; ++i) + { + item->setData(Qt::UserRole + i, QString::number(i + 1)); + QCOMPARE(widget.currentRoles, {Qt::UserRole + i}); + } QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0)); QCOMPARE(flags.count(), 6); - QCOMPARE(flags[(Qt::UserRole + 0)].toString(), QString("1")); + for (int i = 0; i < 4; ++i) + QCOMPARE(flags[Qt::UserRole + i].toString(), QString::number(i + 1)); } void tst_QTableWidget::setItemData() diff --git a/tests/auto/widgets/itemviews/qtreeview/BLACKLIST b/tests/auto/widgets/itemviews/qtreeview/BLACKLIST deleted file mode 100644 index 5eb80007c4..0000000000 --- a/tests/auto/widgets/itemviews/qtreeview/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[setSortingEnabledChild] -windows diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 4c637573d0..a58202e636 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -2600,8 +2600,10 @@ void tst_QTreeView::setSortingEnabledChild() { QMainWindow win; QTreeView view; - QStandardItemModel model(1,1); + // two columns to not get in trouble with stretchLastSection + QStandardItemModel model(1,2); view.setModel(&model); + view.header()->setDefaultSectionSize(92); win.setCentralWidget(&view); const int size = view.header()->sectionSize(0); view.setSortingEnabled(true); diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index 321e4bcd0e..1f438f59eb 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -1938,23 +1938,38 @@ void tst_QTreeWidget::setData() } } +class QTreeWidgetDataChanged : public QTreeWidget +{ + Q_OBJECT +public: + using QTreeWidget::QTreeWidget; + + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override + { + QTreeWidget::dataChanged(topLeft, bottomRight, roles); + currentRoles = roles; + } + QVector<int> currentRoles; +}; + void tst_QTreeWidget::itemData() { - QTreeWidget widget; + QTreeWidgetDataChanged widget; QTreeWidgetItem item(&widget); widget.setColumnCount(2); item.setFlags(item.flags() | Qt::ItemIsEditable); item.setData(0, Qt::DisplayRole, QString("0")); + QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); item.setData(0, Qt::CheckStateRole, Qt::PartiallyChecked); - item.setData(0, Qt::UserRole + 0, QString("1")); - item.setData(0, Qt::UserRole + 1, QString("2")); - item.setData(0, Qt::UserRole + 2, QString("3")); - item.setData(0, Qt::UserRole + 3, QString("4")); - + QCOMPARE(widget.currentRoles, {Qt::CheckStateRole}); + for (int i = 0; i < 4; ++i) { + item.setData(0, Qt::UserRole + i, QString::number(i + 1)); + QCOMPARE(widget.currentRoles, {Qt::UserRole + i}); + } QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0)); QCOMPARE(flags.count(), 6); - QCOMPARE(flags[Qt::UserRole + 0].toString(), QString("1")); - + for (int i = 0; i < 4; ++i) + QCOMPARE(flags[Qt::UserRole + i].toString(), QString::number(i + 1)); flags = widget.model()->itemData(widget.model()->index(0, 1)); QCOMPARE(flags.count(), 0); } diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp index 8314dbedf5..b2650d1f32 100644 --- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp @@ -56,6 +56,7 @@ private slots: void taskQTBUG_40609_addingWidgetToItsOwnLayout(); void taskQTBUG_40609_addingLayoutToItself(); void replaceWidget(); + void indexOf(); }; class CustomLayoutStyle : public QProxyStyle @@ -512,5 +513,24 @@ void tst_QBoxLayout::replaceWidget() QCOMPARE(boxLayout->indexOf(replaceTo), 1); } +void tst_QBoxLayout::indexOf() +{ + QWidget w; + auto outer = new QVBoxLayout(&w); + auto inner = new QHBoxLayout(); + outer->addLayout(inner); + auto widget1 = new QWidget(); + QWidget widget2; + inner->addWidget(widget1); + + QCOMPARE(inner->indexOf(widget1), 0); + QCOMPARE(inner->indexOf(&widget2), -1); + QCOMPARE(outer->indexOf(widget1), -1); + QCOMPARE(outer->indexOf(&widget2), -1); + QCOMPARE(outer->indexOf(outer), -1); + QCOMPARE(outer->indexOf(inner), 0); + QCOMPARE(inner->indexOf(inner->itemAt(0)), 0); +} + QTEST_MAIN(tst_QBoxLayout) #include "tst_qboxlayout.moc" diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST index 6cebce26e8..ae2534a8c1 100644 --- a/tests/auto/widgets/kernel/qwidget/BLACKLIST +++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST @@ -15,22 +15,15 @@ rhel-7.4 osx [focusProxyAndInputMethods] linux -[showMaximized] -osx -[setGeometry] -osx [raise] # QTBUG-68175 opensuse -osx -[resizeEvent] -osx [setWindowGeometry] osx [windowMoveResize] osx [childEvents] -osx +osx ci [renderInvisible] osx [optimizedResizeMove] @@ -42,27 +35,8 @@ osx [showMinimizedKeepsFocus] osx-10.11 ci osx-10.12 ci -[moveWindowInShowEvent:1] -osx -[moveWindowInShowEvent:2] -osx -[taskQTBUG_4055_sendSyntheticEnterLeave] -osx -[syntheticEnterLeave] -osx [maskedUpdate] -osx opensuse-42.3 -[hideOpaqueChildWhileHidden] -osx -[resizeStaticContentsChildWidget_QTBUG35282] -osx -[lower] -osx -[setClearAndResizeMask] -osx -[setToolTip] -osx [moveInResizeEvent] ubuntu-16.04 [moveChild:right] diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 47ffee1501..ff2d8fd191 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -9122,7 +9122,8 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave() void mouseMoveEvent(QMouseEvent *event) { QCOMPARE(event->button(), Qt::NoButton); - QCOMPARE(event->buttons(), Qt::MouseButtons(Qt::NoButton)); + QCOMPARE(event->buttons(), QApplication::mouseButtons()); + QCOMPARE(event->modifiers(), QApplication::keyboardModifiers()); ++numMouseMoveEvents; } void reset() { numEnterEvents = numMouseMoveEvents = 0; } @@ -9156,11 +9157,11 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave() child.setMouseTracking(true); child.show(); - // Make sure the child gets enter event and mouse move event. + // Make sure the child gets enter event. // Note that we verify event->button() and event->buttons() // in SELChild::mouseMoveEvent(). QTRY_COMPARE(child.numEnterEvents, 1); - QCOMPARE(child.numMouseMoveEvents, 1); + QCOMPARE(child.numMouseMoveEvents, 0); // Sending synthetic enter/leave trough the parent's mousePressEvent handler. parent.child = &child; @@ -9169,10 +9170,19 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave() child.reset(); QTest::mouseClick(&parent, Qt::LeftButton); - // Make sure the child gets enter event and one mouse move event. + // Make sure the child gets enter event. QTRY_COMPARE(child.numEnterEvents, 1); - QCOMPARE(child.numMouseMoveEvents, 1); + QCOMPARE(child.numMouseMoveEvents, 0); + + child.hide(); + child.reset(); + QTest::keyPress(&parent, Qt::Key_Shift); + QTest::mouseClick(&parent, Qt::LeftButton); + // Make sure the child gets enter event + QTRY_COMPARE(child.numEnterEvents, 1); + QCOMPARE(child.numMouseMoveEvents, 0); + QTest::keyRelease(&child, Qt::Key_Shift); child.hide(); child.reset(); child.setMouseTracking(false); diff --git a/tests/auto/widgets/widgets/qcombobox/qcombobox.pro b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro index 939153dc88..d118833ae3 100644 --- a/tests/auto/widgets/widgets/qcombobox/qcombobox.pro +++ b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro @@ -1,4 +1,5 @@ CONFIG += testcase TARGET = tst_qcombobox QT += widgets widgets-private gui-private core-private testlib testlib-private +DEFINES += QTEST_QPA_MOUSE_HANDLING SOURCES += tst_qcombobox.cpp diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 7c1deb8fff..80844715ef 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -2719,32 +2719,18 @@ void tst_QComboBox::resetModel() } -static inline void centerCursor(const QWidget *w) -{ -#ifndef QT_NO_CURSOR - // Force cursor movement to prevent QCursor::setPos() from returning prematurely on QPA: - const QPoint target(w->mapToGlobal(w->rect().center())); - QCursor::setPos(QPoint(target.x() + 1, target.y())); - QCursor::setPos(target); -#else // !QT_NO_CURSOR - Q_UNUSED(w) -#endif -} - void tst_QComboBox::keyBoardNavigationWithMouse() { QComboBox combo; combo.setEditable(false); setFrameless(&combo); - combo.move(200, 200); - for (int i = 0; i < 80; i++) - combo.addItem( QString::number(i)); + for (int i = 0; i < 200; i++) + combo.addItem(QString::number(i)); + combo.move(200, 200); combo.showNormal(); - centerCursor(&combo); // QTBUG-33973, cursor needs to be within view from start on Mac. QApplication::setActiveWindow(&combo); QVERIFY(QTest::qWaitForWindowActive(&combo)); - QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo)); QCOMPARE(combo.currentText(), QLatin1String("0")); @@ -2752,18 +2738,12 @@ void tst_QComboBox::keyBoardNavigationWithMouse() QTRY_VERIFY(combo.hasFocus()); QTest::keyClick(combo.lineEdit(), Qt::Key_Space); - QTest::qWait(30); QTRY_VERIFY(combo.view()); QTRY_VERIFY(combo.view()->isVisible()); - QTest::qWait(130); QCOMPARE(combo.currentText(), QLatin1String("0")); - // When calling cursor function, Windows CE responds with: This function is not supported on this system. -#if !defined Q_OS_QNX - // Force cursor movement to prevent QCursor::setPos() from returning prematurely on QPA: - centerCursor(combo.view()); - QTest::qWait(200); + QTest::mouseMove(&combo, combo.rect().center()); #define GET_SELECTION(SEL) \ QCOMPARE(combo.view()->selectionModel()->selection().count(), 1); \ @@ -2771,23 +2751,19 @@ void tst_QComboBox::keyBoardNavigationWithMouse() SEL = combo.view()->selectionModel()->selection().indexes().first().row() int selection; - GET_SELECTION(selection); - - //since we moved the mouse is in the middle it should even be around 5; - QVERIFY2(selection > 3, (QByteArrayLiteral("selection=") + QByteArray::number(selection)).constData()); + GET_SELECTION(selection); // get initial selection - static const int final = 40; + const int final = 40; for (int i = selection + 1; i <= final; i++) { QTest::keyClick(combo.view(), Qt::Key_Down); - QTest::qWait(20); GET_SELECTION(selection); QCOMPARE(selection, i); } QTest::keyClick(combo.view(), Qt::Key_Enter); QTRY_COMPARE(combo.currentText(), QString::number(final)); -#endif +#undef GET_SELECTION } void tst_QComboBox::task_QTBUG_1071_changingFocusEmitsActivated() diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index 22e8097949..9c56d30dfb 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -31,6 +31,7 @@ #include <qapplication.h> #include <limits.h> +#include <cmath> #include <float.h> #include <qspinbox.h> @@ -135,6 +136,8 @@ private slots: void setGroupSeparatorShown_data(); void setGroupSeparatorShown(); + void adaptiveDecimalStep(); + public slots: void valueChangedHelper(const QString &); void valueChangedHelper(double); @@ -1139,5 +1142,133 @@ void tst_QDoubleSpinBox::setGroupSeparatorShown() QCOMPARE(spinBox.value()+1000, 33000.44); } +void tst_QDoubleSpinBox::adaptiveDecimalStep() +{ + DoubleSpinBox spinBox; + spinBox.setRange(-100000, 100000); + spinBox.setDecimals(4); + spinBox.setStepType(DoubleSpinBox::StepType::AdaptiveDecimalStepType); + + // Positive values + + spinBox.setValue(0); + + // Go from 0 to 0.01 + for (double i = 0; i < 0.00999; i += 0.0001) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } + + // Go from 0.01 to 0.1 + for (double i = 0.01; i < 0.0999; i += 0.001) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } + + // Go from 0.1 to 1 + for (double i = 0.1; i < 0.999; i += 0.01) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } + + // Go from 1 to 10 + for (double i = 1; i < 9.99; i += 0.1) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } + + // Go from 10 to 100 + for (int i = 10; i < 100; i++) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } + + // Go from 100 to 1000 + for (int i = 100; i < 1000; i += 10) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } + + // Go from 1000 to 10000 + for (int i = 1000; i < 10000; i += 100) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } + + // Test decreasing the values now + + // Go from 10000 down to 1000 + for (int i = 10000; i > 1000; i -= 100) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Go from 1000 down to 100 + for (int i = 1000; i > 100; i -= 10) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Negative values + + spinBox.setValue(0); + + // Go from 0 to -0.01 + for (double i = 0; i > -0.00999; i -= 0.0001) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Go from -0.01 to -0.1 + for (double i = -0.01; i > -0.0999; i -= 0.001) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Go from -0.1 to -1 + for (double i = -0.1; i > -0.999; i -= 0.01) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Go from -1 to -10 + for (double i = -1; i > -9.99; i -= 0.1) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Go from -10 to -100 + for (int i = -10; i > -100; i--) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Go from -100 to -1000 + for (int i = -100; i > -1000; i -= 10) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Go from 1000 to 10000 + for (int i = -1000; i > -10000; i -= 100) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(-1); + } + + // Test increasing the values now + + // Go from -10000 up to -1000 + for (int i = -10000; i < -1000; i += 100) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } + + // Go from -1000 up to -100 + for (int i = -1000; i < -100; i += 10) { + QVERIFY(qFuzzyCompare(spinBox.value(), i)); + spinBox.stepBy(1); + } +} + QTEST_MAIN(tst_QDoubleSpinBox) #include "tst_qdoublespinbox.moc" diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 17462a5f86..7eb739611a 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -2279,6 +2279,16 @@ void tst_QLineEdit::deleteSelectedText() } +class ToUpperValidator : public QValidator +{ +public: + ToUpperValidator() {} + State validate(QString &input, int &) const override + { + input = input.toUpper(); + return QValidator::Acceptable; + } +}; void tst_QLineEdit::textChangedAndTextEdited() { @@ -2320,6 +2330,23 @@ void tst_QLineEdit::textChangedAndTextEdited() QCOMPARE(edited_count, 0); QVERIFY(changed_string.isEmpty()); QVERIFY(!changed_string.isNull()); + + changed_count = 0; + edited_count = 0; + changed_string.clear(); + + QScopedPointer<ToUpperValidator> validator(new ToUpperValidator()); + testWidget->setValidator(validator.data()); + testWidget->setText("foo"); + QCOMPARE(changed_count, 1); + QCOMPARE(edited_count, 0); + QCOMPARE(changed_string, QLatin1String("FOO")); + testWidget->setCursorPosition(sizeof("foo")); + QTest::keyClick(testWidget, 'b'); + QCOMPARE(changed_count, 2); + QCOMPARE(edited_count, 1); + QCOMPARE(changed_string, QLatin1String("FOOB")); + testWidget->setValidator(nullptr); } void tst_QLineEdit::onTextChanged(const QString &text) diff --git a/tests/auto/widgets/widgets/qmenu/qmenu.pro b/tests/auto/widgets/widgets/qmenu/qmenu.pro index 84b6530184..4a492ee941 100644 --- a/tests/auto/widgets/widgets/qmenu/qmenu.pro +++ b/tests/auto/widgets/widgets/qmenu/qmenu.pro @@ -5,4 +5,6 @@ SOURCES += tst_qmenu.cpp macx:{ OBJECTIVE_SOURCES += tst_qmenu_mac.mm LIBS += -lobjc +} else { + DEFINES += QTEST_QPA_MOUSE_HANDLING } diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 0dde385bdb..4a7d653064 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -986,9 +986,6 @@ void tst_QMenu::task258920_mouseBorder() QAction *action = menu.addAction("test"); const QPoint center = QApplication::desktop()->availableGeometry().center(); -#ifndef QT_NO_CURSOR - QCursor::setPos(center - QPoint(100, 100)); // Mac: Ensure cursor is outside -#endif menu.popup(center); QVERIFY(QTest::qWaitForWindowExposed(&menu)); QRect actionRect = menu.actionGeometry(action); @@ -1229,96 +1226,90 @@ public: void tst_QMenu::QTBUG47515_widgetActionEnterLeave() { -#if !QT_CONFIG(cursor) - QSKIP("This test requires QCursor API"); -#else if (QGuiApplication::platformName() == QLatin1String("cocoa")) QSKIP("See QTBUG-63031"); - QPoint screenCenter = QGuiApplication::primaryScreen()->availableGeometry().center(); - QPoint pointOutsideMenu = screenCenter - QPoint(100, 100); + const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry(); + QRect geometry(QPoint(), availableGeometry.size() / 3); + geometry.moveCenter(availableGeometry.center()); + QPoint pointOutsideMenu = geometry.bottomRight() - QPoint(5, 5); - QMenu menu("Menu1"); - QMenu submenu("Menu2"); + QMainWindow topLevel; + topLevel.setGeometry(geometry); - QWidgetAction menuAction(&menu); - MyWidget w1(&menu); - menuAction.setDefaultWidget(&w1); + QMenuBar *menuBar = topLevel.menuBar(); + menuBar->setNativeMenuBar(false); + QMenu *menu = menuBar->addMenu("Menu1"); + QMenu *submenu = menu->addMenu("Menu2"); - QWidgetAction submenuAction(&submenu); - MyWidget w2(&submenu); - submenuAction.setDefaultWidget(&w2); + QWidgetAction *menuAction = new QWidgetAction(menu); + MyWidget *w1 = new MyWidget(menu); + menuAction->setDefaultWidget(w1); - QAction *nextMenuAct = menu.addMenu(&submenu); + QWidgetAction *submenuAction = new QWidgetAction(submenu); + MyWidget *w2 = new MyWidget(submenu); + submenuAction->setDefaultWidget(w2); - menu.addAction(&menuAction); - submenu.addAction(&submenuAction); + QAction *nextMenuAct = menu->addMenu(submenu); - // Root menu - { - QCursor::setPos(pointOutsideMenu); - QTRY_COMPARE(QCursor::pos(), pointOutsideMenu); - menu.popup(screenCenter); - QVERIFY(QTest::qWaitForWindowExposed(&menu)); + menu->addAction(menuAction); + submenu->addAction(submenuAction); - w1.enter = 0; - w1.leave = 0; - QPoint w1Center = w1.rect().center(); - const QPoint w1CenterGlobal = w1.mapToGlobal(w1Center); - QCursor::setPos(w1CenterGlobal); - QTRY_COMPARE(QCursor::pos(), w1CenterGlobal); - QVERIFY(w1.isVisible()); - QTRY_COMPARE(w1.leave, 0); - QTRY_COMPARE(w1.enter, 1); + topLevel.show(); + topLevel.setWindowTitle(QTest::currentTestFunction()); + QVERIFY(QTest::qWaitForWindowActive(&topLevel)); + QWindow *topLevelWindow = topLevel.windowHandle(); + QVERIFY(topLevelWindow); + + // Root menu: Click on menu bar to open menu1 + { + const QPoint menuActionPos = menuBar->mapTo(&topLevel, menuBar->actionGeometry(menu->menuAction()).center()); + QTest::mouseClick(topLevelWindow, Qt::LeftButton, Qt::KeyboardModifiers(), menuActionPos); + QVERIFY(QTest::qWaitForWindowExposed(menu)); + + w1->enter = 0; + w1->leave = 0; + QPoint w1Center = topLevel.mapFromGlobal(w1->mapToGlobal(w1->rect().center())); + QTest::mouseMove(topLevelWindow, w1Center); + QVERIFY(w1->isVisible()); + QTRY_COMPARE(w1->leave, 0); + QTRY_COMPARE(w1->enter, 1); // Check whether leave event is not delivered on mouse move - w1.move = 0; - QWidget *nativeParent = w1.nativeParentWidget(); - QVERIFY(nativeParent); - QWindow *window = nativeParent->windowHandle(); - QVERIFY(window); - QTest::mouseMove(window, w1.mapTo(nativeParent, w1Center + QPoint(1, 1))); - QTRY_COMPARE(w1.move, 1); - QTRY_COMPARE(w1.leave, 0); - QTRY_COMPARE(w1.enter, 1); - - QCursor::setPos(pointOutsideMenu); - QTRY_COMPARE(QCursor::pos(), pointOutsideMenu); - QTRY_COMPARE(w1.leave, 1); - QTRY_COMPARE(w1.enter, 1); + w1->move = 0; + QTest::mouseMove(topLevelWindow, w1Center + QPoint(1, 1)); + QTRY_COMPARE(w1->move, 1); + QTRY_COMPARE(w1->leave, 0); + QTRY_COMPARE(w1->enter, 1); + + QTest::mouseMove(topLevelWindow, topLevel.mapFromGlobal(pointOutsideMenu)); + QTRY_COMPARE(w1->leave, 1); + QTRY_COMPARE(w1->enter, 1); } // Submenu { - menu.setActiveAction(nextMenuAct); - QVERIFY(QTest::qWaitForWindowExposed(&submenu)); + menu->setActiveAction(nextMenuAct); + QVERIFY(QTest::qWaitForWindowExposed(submenu)); - QPoint w2Center = w2.rect().center(); - const QPoint w2CenterGlobal = w2.mapToGlobal(w2Center); - QCursor::setPos(w2CenterGlobal); - QTRY_COMPARE(QCursor::pos(), w2CenterGlobal); + QPoint w2Center = topLevel.mapFromGlobal(w2->mapToGlobal(w2->rect().center())); + QTest::mouseMove(topLevelWindow, w2Center); - QVERIFY(w2.isVisible()); - QTRY_COMPARE(w2.leave, 0); - QTRY_COMPARE(w2.enter, 1); + QVERIFY(w2->isVisible()); + QTRY_COMPARE(w2->leave, 0); + QTRY_COMPARE(w2->enter, 1); // Check whether leave event is not delivered on mouse move - w2.move = 0; - QWidget *nativeParent = w2.nativeParentWidget(); - QVERIFY(nativeParent); - QWindow *window = nativeParent->windowHandle(); - QVERIFY(window); - QTest::mouseMove(window, w2.mapTo(nativeParent, w2Center + QPoint(1, 1))); - QTRY_COMPARE(w2.move, 1); - QTRY_COMPARE(w2.leave, 0); - QTRY_COMPARE(w2.enter, 1); - - QCursor::setPos(pointOutsideMenu); - QTRY_COMPARE(QCursor::pos(), pointOutsideMenu); - QTRY_COMPARE(w2.leave, 1); - QTRY_COMPARE(w2.enter, 1); + w2->move = 0; + QTest::mouseMove(topLevelWindow, w2Center + QPoint(1, 1)); + QTRY_COMPARE(w2->move, 1); + QTRY_COMPARE(w2->leave, 0); + QTRY_COMPARE(w2->enter, 1); + + QTest::mouseMove(topLevelWindow, topLevel.mapFromGlobal(pointOutsideMenu)); + QTRY_COMPARE(w2->leave, 1); + QTRY_COMPARE(w2->enter, 1); } -#endif // QT_NO_CURSOR } class MyMenu : public QMenu diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index ab82268578..60fdd6c204 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -1754,7 +1754,6 @@ void tst_QMenuBar::QTBUG_57404_existingMenuItemException() mb->addMenu(editMenu); QAction *copyAction = editMenu->addAction("&Copy"); copyAction->setShortcut(QKeySequence("Ctrl+C")); - QTest::ignoreMessage(QtWarningMsg, "Menu item \"&Copy\" has unsupported role QPlatformMenuItem::MenuRole(NoRole)"); copyAction->setMenuRole(QAction::NoRole); QVERIFY(QTest::qWaitForWindowExposed(&mw2)); diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 57816f9f70..2223fb55cc 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -145,6 +145,8 @@ private slots: void wheelEvents(); + void adaptiveDecimalStep(); + public slots: void valueChangedHelper(const QString &); void valueChangedHelper(int); @@ -1239,5 +1241,84 @@ void tst_QSpinBox::wheelEvents() #endif } +void tst_QSpinBox::adaptiveDecimalStep() +{ + SpinBox spinBox; + spinBox.setRange(-100000, 100000); + spinBox.setStepType(SpinBox::StepType::AdaptiveDecimalStepType); + + // Positive values + + spinBox.setValue(0); + + // Go from 0 to 100 + for (int i = 0; i < 100; i++) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(1); + } + + // Go from 100 to 1000 + for (int i = 100; i < 1000; i += 10) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(1); + } + + // Go from 1000 to 10000 + for (int i = 1000; i < 10000; i += 100) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(1); + } + + // Test decreasing the values now + + // Go from 10000 down to 1000 + for (int i = 10000; i > 1000; i -= 100) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(-1); + } + + // Go from 1000 down to 100 + for (int i = 1000; i > 100; i -= 10) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(-1); + } + + // Negative values + + spinBox.setValue(0); + + // Go from 0 to -100 + for (int i = 0; i > -100; i--) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(-1); + } + + // Go from -100 to -1000 + for (int i = -100; i > -1000; i -= 10) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(-1); + } + + // Go from 1000 to 10000 + for (int i = -1000; i > -10000; i -= 100) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(-1); + } + + // Test increasing the values now + + // Go from -10000 up to -1000 + for (int i = -10000; i < -1000; i += 100) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(1); + } + + // Go from -1000 up to -100 + for (int i = -1000; i < -100; i += 10) { + QCOMPARE(spinBox.value(), i); + spinBox.stepBy(1); + } +} + QTEST_MAIN(tst_QSpinBox) #include "tst_qspinbox.moc" |
