diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2018-01-10 22:04:13 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2018-11-02 09:32:41 +0000 |
| commit | a59097086b5f87cd4e5d71498e35f987f4239741 (patch) | |
| tree | efdabc674480ab06cab21024d5fa4a8da4644e50 /src/plugins/cpptools/cpplocatorfilter_test.cpp | |
| parent | a80396f807f8b270a20f4a4ad6f315770ccd54c6 (diff) | |
CppLocatorFilter: Fix result sorting
* Fix rating items with startsWith()/contains() higher
* Rate matches in function parameter list lower
Task-number: QTCREATORBUG-19377
Change-Id: I2ea4c3ba96cd086aef82627326fa0888f700850f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cpplocatorfilter_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpplocatorfilter_test.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp index a9fc6e3405b..e7a1775fd70 100644 --- a/src/plugins/cpptools/cpplocatorfilter_test.cpp +++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp @@ -198,8 +198,9 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data() << _("pos") << (QList<ResultData>() << ResultData(_("positiveNumber()"), testFileShort) - << ResultData(_("matchArgument(Pos)"), testFileShort) + << ResultData(_("somePositionWithin()"), testFileShort) << ResultData(_("pointOfService()"), testFileShort) + << ResultData(_("matchArgument(Pos)"), testFileShort) ); QTest::newRow("CppFunctionsFilter-arguments") @@ -238,13 +239,15 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data() << cppFunctionsFilter << _("MyClass::func") << (QList<ResultData>() - << ResultData(_("functionDefinedInClass(bool, int)"), _("MyClass (file1.cpp)")) - << ResultData(_("functionDefinedOutSideClass(char)"), _("MyClass (file1.cpp)")) + << ResultData(_("functionDefinedInClass(bool, int)"), + _("MyClass (file1.cpp)")) << ResultData(_("functionDefinedInClass(bool, int)"), _("MyNamespace::MyClass (file1.cpp)")) << ResultData(_("functionDefinedInClass(bool, int)"), _("<anonymous namespace>::MyClass (file1.cpp)")) << ResultData(_("functionDefinedOutSideClass(char)"), + _("MyClass (file1.cpp)")) + << ResultData(_("functionDefinedOutSideClass(char)"), _("MyNamespace::MyClass (file1.cpp)")) << ResultData(_("functionDefinedOutSideClass(char)"), _("<anonymous namespace>::MyClass (file1.cpp)")) @@ -276,12 +279,6 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data() << cppLocatorFilter << _("my") << (QList<ResultData>() - << ResultData(_("<anonymous namespace>::MyClass"), testFileShort) - << ResultData(_("<anonymous namespace>::MyClass::MyClass"), _("()")) - << ResultData(_("<anonymous namespace>::MyClass::functionDefinedOutSideClass"), - _("(char)")) - << ResultData(_("<anonymous namespace>::MyEnum"), testFileShort) - << ResultData(_("<anonymous namespace>::myFunction"), _("(bool, int)")) << ResultData(_("MyClass"), testFileShort) << ResultData(_("MyClass::MyClass"), _("()")) << ResultData(_("MyClass::functionDefinedOutSideClass"), _("(char)")) @@ -295,6 +292,12 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data() << ResultData(_("MyNamespace::MyEnum"), testFileShort) << ResultData(_("MyNamespace::myFunction"), _("(bool, int)")) << ResultData(_("myFunction"), _("(bool, int)")) + << ResultData(_("<anonymous namespace>::MyClass"), testFileShort) + << ResultData(_("<anonymous namespace>::MyClass::MyClass"), _("()")) + << ResultData(_("<anonymous namespace>::MyClass::functionDefinedOutSideClass"), + _("(char)")) + << ResultData(_("<anonymous namespace>::MyEnum"), testFileShort) + << ResultData(_("<anonymous namespace>::myFunction"), _("(bool, int)")) ); QTest::newRow("CppClassesFilter-ObjC") @@ -328,6 +331,7 @@ void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter() << ResultData(_("int myVariable"), _("")) << ResultData(_("myFunction(bool, int)"), _("")) << ResultData(_("Pos"), _("")) + << ResultData(_("somePositionWithin()"), _("")) << ResultData(_("pointOfService()"), _("")) << ResultData(_("matchArgument(Pos)"), _("")) << ResultData(_("positiveNumber()"), _("")) |