feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Locator: Deduplicate and simplify test logic

Browse Source 
Change-Id: I9c28f9ffb08b8827bd64941b3d37446051bac2ef
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Andre Hartmann
2018-11-25 16:31:17 +01:00
committed by André Hartmann
parent 187c5a5f4d
commit 7a0a5cb7f4
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/coreplugin/locator/locator_test.cpp
View File

@@ -29,6 +29,7 @@
#include "locatorfiltertest.h" #include "locatorfiltertest.h"
#include <coreplugin/testdatadir.h> #include <coreplugin/testdatadir.h>
#include <utils/algorithm.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <QDir> #include <QDir>
@@ -87,6 +88,10 @@ void Core::Internal::CorePlugin::test_basefilefilter()
void Core::Internal::CorePlugin::test_basefilefilter_data() void Core::Internal::CorePlugin::test_basefilefilter_data()
{ {
auto shortNativePath = [](const QString &file) {
return Utils::FileUtils::shortNativePath(Utils::FileName::fromString(file));
};
QTest::addColumn<QStringList>("testFiles"); QTest::addColumn<QStringList>("testFiles");
QTest::addColumn<QList<ReferenceData> >("referenceDataList"); QTest::addColumn<QList<ReferenceData> >("referenceDataList");
@@ -95,9 +100,7 @@ void Core::Internal::CorePlugin::test_basefilefilter_data()
const QStringList testFiles({QDir::fromNativeSeparators(testDir.file("file.cpp")), const QStringList testFiles({QDir::fromNativeSeparators(testDir.file("file.cpp")),
QDir::fromNativeSeparators(testDir.file("main.cpp")), QDir::fromNativeSeparators(testDir.file("main.cpp")),
QDir::fromNativeSeparators(testDir.file("subdir/main.cpp"))}); QDir::fromNativeSeparators(testDir.file("subdir/main.cpp"))});
QStringList testFilesShort; const QStringList testFilesShort = Utils::transform(testFiles, shortNativePath);
for (const QString &file : testFiles)
testFilesShort << Utils::FileUtils::shortNativePath(Utils::FileName::fromString(file));
QTest::newRow("BaseFileFilter-EmptyInput") QTest::newRow("BaseFileFilter-EmptyInput")
<< testFiles << testFiles
@@ -164,9 +167,7 @@ void Core::Internal::CorePlugin::test_basefilefilter_data()
testDir.file("foo_qmap.h"), testDir.file("foo_qmap.h"),
testDir.file("qmap.h"), testDir.file("qmap.h"),
testDir.file("bar.h")}); testDir.file("bar.h")});
QStringList priorityTestFilesShort; const QStringList priorityTestFilesShort = Utils::transform(priorityTestFiles, shortNativePath);
for (const QString &file : priorityTestFiles)
priorityTestFilesShort << Utils::FileUtils::shortNativePath(Utils::FileName::fromString(file));
QTest::newRow("BaseFileFilter-InputPriorizeFullOverFuzzy") QTest::newRow("BaseFileFilter-InputPriorizeFullOverFuzzy")
<< priorityTestFiles << priorityTestFiles
@@ -183,9 +184,7 @@ void Core::Internal::CorePlugin::test_basefilefilter_data()
const QStringList sortingTestFiles({QDir::fromNativeSeparators(testDir.file("aaa/zfile.cpp")), const QStringList sortingTestFiles({QDir::fromNativeSeparators(testDir.file("aaa/zfile.cpp")),
QDir::fromNativeSeparators(testDir.file("bbb/yfile.cpp")), QDir::fromNativeSeparators(testDir.file("bbb/yfile.cpp")),
QDir::fromNativeSeparators(testDir.file("ccc/xfile.cpp"))}); QDir::fromNativeSeparators(testDir.file("ccc/xfile.cpp"))});
QStringList sortingTestFilesShort; const QStringList sortingTestFilesShort = Utils::transform(sortingTestFiles, shortNativePath);
for (const QString &file : sortingTestFiles)
sortingTestFilesShort << Utils::FileUtils::shortNativePath(Utils::FileName::fromString(file));
QTest::newRow("BaseFileFilter-SortByDisplayName") QTest::newRow("BaseFileFilter-SortByDisplayName")
<< sortingTestFiles << sortingTestFiles