diff options
Diffstat (limited to 'tests/benchmarks')
6 files changed, 58 insertions, 11 deletions
diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp index 272bafc7dd..42d36a22f8 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp +++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp @@ -223,12 +223,12 @@ void tst_qdiriterator::fsiterator() int c = 0; dump && printf("\n\n\n\n"); - QFileSystemIterator dir(dirpath, + QDirIteratorTest::QFileSystemIterator dir(dirpath, //QDir::AllEntries | QDir::Hidden | QDir::NoDotAndDotDot, //QDir::AllEntries | QDir::Hidden, //QDir::Files | QDir::NoDotAndDotDot, QDir::Files, - QFileSystemIterator::Subdirectories); + QDirIteratorTest::QFileSystemIterator::Subdirectories); for (; !dir.atEnd(); dir.next()) { dump && printf("%d %s\n", diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp index 1b28f462aa..a4db21742d 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp +++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp @@ -99,6 +99,8 @@ QT_BEGIN_NAMESPACE +namespace QDirIteratorTest { + class QFileSystemIteratorPrivate { public: @@ -671,4 +673,6 @@ QString QFileSystemIterator::path() const return QString::fromLocal8Bit(d->m_dirPaths.top()); } +} // QDirIteratorTest:: + QT_END_NAMESPACE diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h index b940c0061b..96fa5177a0 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h +++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h @@ -38,6 +38,7 @@ QT_BEGIN_NAMESPACE +namespace QDirIteratorTest { class QFileSystemIteratorPrivate; class //Q_CORE_EXPORT @@ -81,6 +82,8 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QFileSystemIterator::IteratorFlags) +} // namespace QDirIteratorTest + QT_END_NAMESPACE #endif diff --git a/tests/benchmarks/corelib/tools/qringbuffer/main.cpp b/tests/benchmarks/corelib/tools/qringbuffer/main.cpp index 6bb82a8056..cf55aeaee5 100644 --- a/tests/benchmarks/corelib/tools/qringbuffer/main.cpp +++ b/tests/benchmarks/corelib/tools/qringbuffer/main.cpp @@ -48,10 +48,10 @@ void tst_qringbuffer::reserveAndRead() { QRingBuffer ringBuffer; QBENCHMARK { - for (int i = 1; i < 256; ++i) + for (qint64 i = 1; i < 256; ++i) ringBuffer.reserve(i); - for (int i = 1; i < 256; ++i) + for (qint64 i = 1; i < 256; ++i) ringBuffer.read(0, i); } } diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp index 224d9619ec..f20b3f6cce 100644 --- a/tests/benchmarks/gui/text/qtext/main.cpp +++ b/tests/benchmarks/gui/text/qtext/main.cpp @@ -42,7 +42,7 @@ #include <QBuffer> #include <qtest.h> -Q_DECLARE_METATYPE(QList<QTextLayout::FormatRange>) +Q_DECLARE_METATYPE(QVector<QTextLayout::FormatRange>) class tst_QText: public QObject { @@ -324,13 +324,13 @@ void tst_QText::layout() void tst_QText::formattedLayout_data() { QTest::addColumn<QString>("text"); - QTest::addColumn<QList<QTextLayout::FormatRange> >("ranges"); + QTest::addColumn<QVector<QTextLayout::FormatRange> >("ranges"); QTextCharFormat format; format.setForeground(QColor("steelblue")); { - QList<QTextLayout::FormatRange> ranges; + QVector<QTextLayout::FormatRange> ranges; QTextLayout::FormatRange formatRange; formatRange.format = format; @@ -341,7 +341,7 @@ void tst_QText::formattedLayout_data() QTest::newRow("short-single") << m_shortLorem << ranges; } { - QList<QTextLayout::FormatRange> ranges; + QVector<QTextLayout::FormatRange> ranges; QString text = m_lorem.repeated(100); const int width = 1; @@ -360,15 +360,15 @@ void tst_QText::formattedLayout_data() void tst_QText::formattedLayout() { QFETCH(QString, text); - QFETCH(QList<QTextLayout::FormatRange>, ranges); + QFETCH(QVector<QTextLayout::FormatRange>, ranges); QTextLayout layout(text); - layout.setAdditionalFormats(ranges); + layout.setFormats(ranges); setupTextLayout(&layout); QBENCHMARK { QTextLayout layout(text); - layout.setAdditionalFormats(ranges); + layout.setFormats(ranges); setupTextLayout(&layout); } } diff --git a/tests/benchmarks/sql/kernel/qsqlquery/main.cpp b/tests/benchmarks/sql/kernel/qsqlquery/main.cpp index 63aa6f7250..b5937b76b0 100644 --- a/tests/benchmarks/sql/kernel/qsqlquery/main.cpp +++ b/tests/benchmarks/sql/kernel/qsqlquery/main.cpp @@ -55,6 +55,8 @@ public slots: private slots: void benchmark_data() { generic_data(); } void benchmark(); + void benchmarkSelectPrepared_data() { generic_data(); } + void benchmarkSelectPrepared(); private: // returns all database connections @@ -264,4 +266,42 @@ void tst_QSqlQuery::benchmark() tst_Databases::safeDropTable( db, tableName ); } +void tst_QSqlQuery::benchmarkSelectPrepared() +{ + QFETCH( QString, dbName ); + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + if (tst_Databases::getMySqlVersion(db).section(QChar('.'), 0, 0).toInt() < 5) + QSKIP("Test requires MySQL >= 5.0"); + + QSqlQuery q(db); + const QString tableName(qTableName("benchmark", __FILE__, db)); + + tst_Databases::safeDropTable(db, tableName); + + QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + "(id INT NOT NULL)")); + + const int NUM_ROWS = 1000; + int expectedSum = 0; + QString fillQuery = "INSERT INTO " + tableName + " VALUES (0)"; + for (int i = 1; i < NUM_ROWS; ++i) { + fillQuery += ", (" + QString::number(i) + ")"; + expectedSum += i; + } + QVERIFY_SQL(q, exec(fillQuery)); + + QVERIFY_SQL(q, prepare("SELECT id FROM "+tableName)); + QBENCHMARK { + QVERIFY_SQL(q, exec()); + int sum = 0; + + while (q.next()) + sum += q.value(0).toInt(); + + QCOMPARE(sum, expectedSum); + } + + tst_Databases::safeDropTable(db, tableName); +} + #include "main.moc" |