From 7a0a5cb7f4835b0fac25d59805d962ffd1626b3b Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Sun, 25 Nov 2018 16:31:17 +0100
Subject: [PATCH] Locator: Deduplicate and simplify test logic

Change-Id: I9c28f9ffb08b8827bd64941b3d37446051bac2ef
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/coreplugin/locator/locator_test.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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