Rename CamelHumpMatcher -> FuzzyMatcher

Change-Id: Ia8a2eeb985bcdd500b4faf9605e5092a52dad372
Reviewed-by: André Hartmann <aha_1980@gmx.de>

6 files changed, 24 insertions, 24 deletions

diff --git a/tests/auto/utils/camelhumpmatcher/camelhumpmatcher.qbs b/tests/auto/utils/camelhumpmatcher/camelhumpmatcher.qbs
deleted file mode 100644
index 4cda318242..0000000000
--- a/tests/auto/utils/camelhumpmatcher/camelhumpmatcher.qbs
+++ /dev/null
@@ -1,7 +0,0 @@
-import qbs
-
-QtcAutotest {
-    name: "CamelHumpMatcher autotest"
-    Depends { name: "Utils" }
-    files: "tst_camelhumpmatcher.cpp"
-}
diff --git a/tests/auto/utils/camelhumpmatcher/camelhumpmatcher.pro b/tests/auto/utils/fuzzymatcher/fuzzymatcher.pro
index 74469073f6..827bdadc19 100644
--- a/tests/auto/utils/camelhumpmatcher/camelhumpmatcher.pro
+++ b/tests/auto/utils/fuzzymatcher/fuzzymatcher.pro
@@ -3,4 +3,4 @@ include(../../qttest.pri)
 
 DEFINES += QTCREATOR_UTILS_LIB
 
-SOURCES += tst_camelhumpmatcher.cpp
+SOURCES += tst_fuzzymatcher.cpp
diff --git a/tests/auto/utils/fuzzymatcher/fuzzymatcher.qbs b/tests/auto/utils/fuzzymatcher/fuzzymatcher.qbs
new file mode 100644
index 0000000000..f1c7d87034
--- /dev/null
+++ b/tests/auto/utils/fuzzymatcher/fuzzymatcher.qbs
@@ -0,0 +1,7 @@
+import qbs
+
+QtcAutotest {
+    name: "FuzzyMatcher autotest"
+    Depends { name: "Utils" }
+    files: "tst_fuzzymatcher.cpp"
+}
diff --git a/tests/auto/utils/camelhumpmatcher/tst_camelhumpmatcher.cpp b/tests/auto/utils/fuzzymatcher/tst_fuzzymatcher.cpp
index b7a979e4c5..396fb4b35d 100644
--- a/tests/auto/utils/camelhumpmatcher/tst_camelhumpmatcher.cpp
+++ b/tests/auto/utils/fuzzymatcher/tst_fuzzymatcher.cpp
@@ -24,33 +24,33 @@
 **
 ****************************************************************************/
 
-#include <utils/camelhumpmatcher.h>
+#include <utils/fuzzymatcher.h>
 
 #include <QtTest>
 
-class tst_CamelHumpMatcher : public QObject
+class tst_FuzzyMatcher : public QObject
 {
     Q_OBJECT
 
 private slots:
-    void camelHumpMatcher();
-    void camelHumpMatcher_data();
+    void fuzzyMatcher();
+    void fuzzyMatcher_data();
     void highlighting();
     void highlighting_data();
 };
 
-void tst_CamelHumpMatcher::camelHumpMatcher()
+void tst_FuzzyMatcher::fuzzyMatcher()
 {
     QFETCH(QString, pattern);
     QFETCH(QString, candidate);
     QFETCH(int, expectedIndex);
 
-    const QRegularExpression regExp = CamelHumpMatcher::createCamelHumpRegExp(pattern);
+    const QRegularExpression regExp = FuzzyMatcher::createRegExp(pattern);
     const QRegularExpressionMatch match = regExp.match(candidate);
     QCOMPARE(match.capturedStart(), expectedIndex);
 }
 
-void tst_CamelHumpMatcher::camelHumpMatcher_data()
+void tst_FuzzyMatcher::fuzzyMatcher_data()
 {
     QTest::addColumn<QString>("pattern");
     QTest::addColumn<QString>("candidate");
@@ -86,17 +86,17 @@ void tst_CamelHumpMatcher::camelHumpMatcher_data()
 typedef QVector<int> MatchStart;
 typedef QVector<int> MatchLength;
 
-void tst_CamelHumpMatcher::highlighting()
+void tst_FuzzyMatcher::highlighting()
 {
     QFETCH(QString, pattern);
     QFETCH(QString, candidate);
     QFETCH(MatchStart, matchStart);
     QFETCH(MatchLength, matchLength);
 
-    const QRegularExpression regExp = CamelHumpMatcher::createCamelHumpRegExp(pattern);
+    const QRegularExpression regExp = FuzzyMatcher::createRegExp(pattern);
     const QRegularExpressionMatch match = regExp.match(candidate);
-    const CamelHumpMatcher::HighlightingPositions positions =
-            CamelHumpMatcher::highlightingPositions(match);
+    const FuzzyMatcher::HighlightingPositions positions =
+            FuzzyMatcher::highlightingPositions(match);
 
     QCOMPARE(positions.starts.size(), matchStart.size());
     for (int i = 0; i < positions.starts.size(); ++i) {
@@ -105,7 +105,7 @@ void tst_CamelHumpMatcher::highlighting()
     }
 }
 
-void tst_CamelHumpMatcher::highlighting_data()
+void tst_FuzzyMatcher::highlighting_data()
 {
     QTest::addColumn<QString>("pattern");
     QTest::addColumn<QString>("candidate");
@@ -148,5 +148,5 @@ void tst_CamelHumpMatcher::highlighting_data()
                                     << MatchStart{4} << MatchLength{6};
 }
 
-QTEST_APPLESS_MAIN(tst_CamelHumpMatcher)
-#include "tst_camelhumpmatcher.moc"
+QTEST_APPLESS_MAIN(tst_FuzzyMatcher)
+#include "tst_fuzzymatcher.moc"
diff --git a/tests/auto/utils/utils.pro b/tests/auto/utils/utils.pro
index b5b44098a5..02142ddd19 100644
--- a/tests/auto/utils/utils.pro
+++ b/tests/auto/utils/utils.pro
@@ -3,7 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS = \
     fileutils \
     ansiescapecodehandler \
-    camelhumpmatcher \
+    fuzzymatcher \
     objectpool \
     stringutils \
     templateengine \
diff --git a/tests/auto/utils/utils.qbs b/tests/auto/utils/utils.qbs
index 4cd2d22902..13c3dad38f 100644
--- a/tests/auto/utils/utils.qbs
+++ b/tests/auto/utils/utils.qbs
@@ -5,7 +5,7 @@ Project {
     references: [
         "fileutils/fileutils.qbs",
         "ansiescapecodehandler/ansiescapecodehandler.qbs",
-        "camelhumpmatcher/camelhumpmatcher.qbs",
+        "fuzzymatcher/fuzzymatcher.qbs",
         "stringutils/stringutils.qbs",
         "objectpool/objectpool.qbs",
         "templateengine/templateengine.qbs",