|
Rex Dieter |
8b4426 |
From c23607679fa1451f0c6890bd4a5656c07d519853 Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
8b4426 |
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
|
|
Rex Dieter |
8b4426 |
Date: Fri, 6 Feb 2015 13:33:50 +0100
|
|
Rex Dieter |
8b4426 |
Subject: [PATCH 31/34] Less C++11, fixes build with clang
|
|
Rex Dieter |
8b4426 |
|
|
Rex Dieter |
8b4426 |
---
|
|
Rex Dieter |
8b4426 |
server/tests/unittest/searchtest.cpp | 28 ++++++++++++++--------------
|
|
Rex Dieter |
8b4426 |
1 file changed, 14 insertions(+), 14 deletions(-)
|
|
Rex Dieter |
8b4426 |
|
|
Rex Dieter |
8b4426 |
diff --git a/server/tests/unittest/searchtest.cpp b/server/tests/unittest/searchtest.cpp
|
|
Rex Dieter |
8b4426 |
index f523b09..969d296 100644
|
|
Rex Dieter |
8b4426 |
--- a/server/tests/unittest/searchtest.cpp
|
|
Rex Dieter |
8b4426 |
+++ b/server/tests/unittest/searchtest.cpp
|
|
Rex Dieter |
8b4426 |
@@ -119,21 +119,21 @@ private Q_SLOTS:
|
|
Rex Dieter |
8b4426 |
QTest::addColumn<QStringList>("mimetypes");
|
|
Rex Dieter |
8b4426 |
QTest::addColumn<QVector<qint64>>("expectedResults");
|
|
Rex Dieter |
8b4426 |
|
|
Rex Dieter |
8b4426 |
- QTest::newRow("") << QVector<qint64>({ 0 })
|
|
Rex Dieter |
8b4426 |
- << QStringList({ QLatin1String("text/plain") })
|
|
Rex Dieter |
8b4426 |
- << QVector<qint64>({ col4.id(), col5.id(), col7.id() });
|
|
Rex Dieter |
8b4426 |
- QTest::newRow("") << QVector<qint64>({ 0 })
|
|
Rex Dieter |
8b4426 |
- << QStringList({ QLatin1String("application/octet-stream") })
|
|
Rex Dieter |
8b4426 |
- << QVector<qint64>({ col2.id(), col3.id(), col6.id(), col8.id() });
|
|
Rex Dieter |
8b4426 |
- QTest::newRow("") << QVector<qint64>({ col1.id() })
|
|
Rex Dieter |
8b4426 |
- << QStringList({ QLatin1String("text/plain") })
|
|
Rex Dieter |
8b4426 |
- << QVector<qint64>({ col4.id() });
|
|
Rex Dieter |
8b4426 |
- QTest::newRow("") << QVector<qint64>({ col1.id() })
|
|
Rex Dieter |
8b4426 |
- << QStringList({ QLatin1String("unique/mime-type") })
|
|
Rex Dieter |
8b4426 |
+ QTest::newRow("") << (QVector<qint64>() << 0)
|
|
Rex Dieter |
8b4426 |
+ << (QStringList() << QLatin1String("text/plain"))
|
|
Rex Dieter |
8b4426 |
+ << (QVector<qint64>() << col4.id() << col5.id() << col7.id());
|
|
Rex Dieter |
8b4426 |
+ QTest::newRow("") << (QVector<qint64>() << 0)
|
|
Rex Dieter |
8b4426 |
+ << (QStringList() << QLatin1String("application/octet-stream"))
|
|
Rex Dieter |
8b4426 |
+ << (QVector<qint64>() << col2.id() << col3.id() << col6.id() << col8.id());
|
|
Rex Dieter |
8b4426 |
+ QTest::newRow("") << (QVector<qint64>() << col1.id())
|
|
Rex Dieter |
8b4426 |
+ << (QStringList() << QLatin1String("text/plain"))
|
|
Rex Dieter |
8b4426 |
+ << (QVector<qint64>() << col4.id());
|
|
Rex Dieter |
8b4426 |
+ QTest::newRow("") << (QVector<qint64>() << col1.id())
|
|
Rex Dieter |
8b4426 |
+ << (QStringList() << QLatin1String("unique/mime-type"))
|
|
Rex Dieter |
8b4426 |
<< QVector<qint64>();
|
|
Rex Dieter |
8b4426 |
- QTest::newRow("") << QVector<qint64>({ col2.id(), col7.id() })
|
|
Rex Dieter |
8b4426 |
- << QStringList({ QLatin1String("application/octet-stream") })
|
|
Rex Dieter |
8b4426 |
- << QVector<qint64>({ col3.id(), col8.id() });
|
|
Rex Dieter |
8b4426 |
+ QTest::newRow("") << (QVector<qint64>() << col2.id() << col7.id())
|
|
Rex Dieter |
8b4426 |
+ << (QStringList() << QLatin1String("application/octet-stream"))
|
|
Rex Dieter |
8b4426 |
+ << (QVector<qint64>() << col3.id() << col8.id());
|
|
Rex Dieter |
8b4426 |
}
|
|
Rex Dieter |
8b4426 |
|
|
Rex Dieter |
8b4426 |
void testSearchHelperCollectionListing()
|
|
Rex Dieter |
8b4426 |
--
|
|
Rex Dieter |
8b4426 |
2.4.3
|
|
Rex Dieter |
8b4426 |
|