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

CppLocatorFilterTest: De-noise

Browse Source 
Change-Id: Ie7c8bdb55764a229b24a9acf68d1e93d82f5edef
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2019-08-10 22:58:38 +02:00
committed by André Hartmann
parent c54a2aedbc
commit a1db400e65
1 changed files with 161 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

324
src/plugins/cpptools/cpplocatorfilter_test.cpp
View File

@@ -54,8 +54,6 @@ const bool debug = qEnvironmentVariable("QTC_DEBUG_CPPLOCATORFILTERTESTCASE") ==
QTC_DECLARE_MYTESTDATADIR("../../../tests/cpplocators/") QTC_DECLARE_MYTESTDATADIR("../../../tests/cpplocators/")
inline QString _(const QByteArray &ba) { return QString::fromLatin1(ba, ba.size()); }
class CppLocatorFilterTestCase class CppLocatorFilterTestCase
: public BasicLocatorFilterTest : public BasicLocatorFilterTest
, public CppTools::Tests::TestCase , public CppTools::Tests::TestCase
@@ -172,153 +170,153 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data()
QTest::newRow("CppFunctionsFilter") QTest::newRow("CppFunctionsFilter")
<< testFile << testFile
<< cppFunctionsFilter << cppFunctionsFilter
<< _("function") << "function"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("functionDefinedInClass(bool, int)"), _("MyClass (file1.cpp)")) ResultData("functionDefinedInClass(bool, int)", "MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("<anonymous namespace>::MyClass (file1.cpp)")) "<anonymous namespace>::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClass(char)"), _("MyClass (file1.cpp)")) ResultData("functionDefinedOutSideClass(char)", "MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClass(char)"), ResultData("functionDefinedOutSideClass(char)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClass(char)"), ResultData("functionDefinedOutSideClass(char)",
_("<anonymous namespace>::MyClass (file1.cpp)")) "<anonymous namespace>::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClassAndNamespace(float)"), ResultData("functionDefinedOutSideClassAndNamespace(float)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("myFunction(bool, int)"), testFileShort) ResultData("myFunction(bool, int)", testFileShort),
<< ResultData(_("myFunction(bool, int)"), _("MyNamespace (file1.cpp)")) ResultData("myFunction(bool, int)", "MyNamespace (file1.cpp)"),
<< ResultData(_("myFunction(bool, int)"), _("<anonymous namespace> (file1.cpp)")) ResultData("myFunction(bool, int)", "<anonymous namespace> (file1.cpp)")
); };
QTest::newRow("CppFunctionsFilter-Sorting") QTest::newRow("CppFunctionsFilter-Sorting")
<< testFile << testFile
<< cppFunctionsFilter << cppFunctionsFilter
<< _("pos") << "pos"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("positiveNumber()"), testFileShort) ResultData("positiveNumber()", testFileShort),
<< ResultData(_("somePositionWithin()"), testFileShort) ResultData("somePositionWithin()", testFileShort),
<< ResultData(_("pointOfService()"), testFileShort) ResultData("pointOfService()", testFileShort),
<< ResultData(_("matchArgument(Pos)"), testFileShort) ResultData("matchArgument(Pos)", testFileShort)
); };
QTest::newRow("CppFunctionsFilter-arguments") QTest::newRow("CppFunctionsFilter-arguments")
<< testFile << testFile
<< cppFunctionsFilter << cppFunctionsFilter
<< _("function*bool") << "function*bool"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("MyClass (file1.cpp)")) "MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("<anonymous namespace>::MyClass (file1.cpp)")) "<anonymous namespace>::MyClass (file1.cpp)"),
<< ResultData(_("myFunction(bool, int)"), testFileShort) ResultData("myFunction(bool, int)", testFileShort),
<< ResultData(_("myFunction(bool, int)"), _("MyNamespace (file1.cpp)")) ResultData("myFunction(bool, int)", "MyNamespace (file1.cpp)"),
<< ResultData(_("myFunction(bool, int)"), _("<anonymous namespace> (file1.cpp)")) ResultData("myFunction(bool, int)", "<anonymous namespace> (file1.cpp)")
); };
QTest::newRow("CppFunctionsFilter-WithNamespacePrefix") QTest::newRow("CppFunctionsFilter-WithNamespacePrefix")
<< testFile << testFile
<< cppFunctionsFilter << cppFunctionsFilter
<< _("mynamespace::") << "mynamespace::"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("MyClass()"), _("MyNamespace::MyClass (file1.cpp)")) ResultData("MyClass()", "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClass(char)"), ResultData("functionDefinedOutSideClass(char)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClassAndNamespace(float)"), ResultData("functionDefinedOutSideClassAndNamespace(float)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("myFunction(bool, int)"), _("MyNamespace (file1.cpp)")) ResultData("myFunction(bool, int)", "MyNamespace (file1.cpp)"),
); };
QTest::newRow("CppFunctionsFilter-WithClassPrefix") QTest::newRow("CppFunctionsFilter-WithClassPrefix")
<< testFile << testFile
<< cppFunctionsFilter << cppFunctionsFilter
<< _("MyClass::func") << "MyClass::func"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("MyClass (file1.cpp)")) "MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedInClass(bool, int)"), ResultData("functionDefinedInClass(bool, int)",
_("<anonymous namespace>::MyClass (file1.cpp)")) "<anonymous namespace>::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClass(char)"), ResultData("functionDefinedOutSideClass(char)",
_("MyClass (file1.cpp)")) "MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClass(char)"), ResultData("functionDefinedOutSideClass(char)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClass(char)"), ResultData("functionDefinedOutSideClass(char)",
_("<anonymous namespace>::MyClass (file1.cpp)")) "<anonymous namespace>::MyClass (file1.cpp)"),
<< ResultData(_("functionDefinedOutSideClassAndNamespace(float)"), ResultData("functionDefinedOutSideClassAndNamespace(float)",
_("MyNamespace::MyClass (file1.cpp)")) "MyNamespace::MyClass (file1.cpp)"),
); };
QTest::newRow("CppClassesFilter") QTest::newRow("CppClassesFilter")
<< testFile << testFile
<< cppClassesFilter << cppClassesFilter
<< _("myclass") << "myclass"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("MyClass"), testFileShort) ResultData("MyClass", testFileShort),
<< ResultData(_("MyClass"), _("MyNamespace")) ResultData("MyClass", "MyNamespace"),
<< ResultData(_("MyClass"), _("<anonymous namespace>")) ResultData("MyClass", "<anonymous namespace>")
); };
QTest::newRow("CppClassesFilter-WithNamespacePrefix") QTest::newRow("CppClassesFilter-WithNamespacePrefix")
<< testFile << testFile
<< cppClassesFilter << cppClassesFilter
<< _("mynamespace::") << "mynamespace::"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("MyClass"), _("MyNamespace")) ResultData("MyClass", "MyNamespace")
); };
// all symbols in the left column are expected to be fully qualified. // all symbols in the left column are expected to be fully qualified.
QTest::newRow("CppLocatorFilter-filtered") QTest::newRow("CppLocatorFilter-filtered")
<< testFile << testFile
<< cppLocatorFilter << cppLocatorFilter
<< _("my") << "my"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("MyClass"), testFileShort) ResultData("MyClass", testFileShort),
<< ResultData(_("MyClass::MyClass"), _("()")) ResultData("MyClass::MyClass", "()"),
<< ResultData(_("MyClass::functionDefinedOutSideClass"), _("(char)")) ResultData("MyClass::functionDefinedOutSideClass", "(char)"),
<< ResultData(_("MyEnum"), testFileShort) ResultData("MyEnum", testFileShort),
<< ResultData(_("MyNamespace::MyClass"), testFileShort) ResultData("MyNamespace::MyClass", testFileShort),
<< ResultData(_("MyNamespace::MyClass::MyClass"), _("()")) ResultData("MyNamespace::MyClass::MyClass", "()"),
<< ResultData(_("MyNamespace::MyClass::functionDefinedOutSideClass"), ResultData("MyNamespace::MyClass::functionDefinedOutSideClass",
_("(char)")) "(char)"),
<< ResultData(_("MyNamespace::MyClass::functionDefinedOutSideClassAndNamespace"), ResultData("MyNamespace::MyClass::functionDefinedOutSideClassAndNamespace",
_("(float)")) "(float)"),
<< ResultData(_("MyNamespace::MyEnum"), testFileShort) ResultData("MyNamespace::MyEnum", testFileShort),
<< ResultData(_("MyNamespace::myFunction"), _("(bool, int)")) ResultData("MyNamespace::myFunction", "(bool, int)"),
<< ResultData(_("myFunction"), _("(bool, int)")) ResultData("myFunction", "(bool, int)"),
<< ResultData(_("<anonymous namespace>::MyClass"), testFileShort) ResultData("<anonymous namespace>::MyClass", testFileShort),
<< ResultData(_("<anonymous namespace>::MyClass::MyClass"), _("()")) ResultData("<anonymous namespace>::MyClass::MyClass", "()"),
<< ResultData(_("<anonymous namespace>::MyClass::functionDefinedOutSideClass"), ResultData("<anonymous namespace>::MyClass::functionDefinedOutSideClass",
_("(char)")) "(char)"),
<< ResultData(_("<anonymous namespace>::MyEnum"), testFileShort) ResultData("<anonymous namespace>::MyEnum", testFileShort),
<< ResultData(_("<anonymous namespace>::myFunction"), _("(bool, int)")) ResultData("<anonymous namespace>::myFunction", "(bool, int)")
); };
QTest::newRow("CppClassesFilter-ObjC") QTest::newRow("CppClassesFilter-ObjC")
<< objTestFile << objTestFile
<< cppClassesFilter << cppClassesFilter
<< _("M") << "M"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("MyClass"), objTestFileShort) ResultData("MyClass", objTestFileShort),
<< ResultData(_("MyClass"), objTestFileShort) ResultData("MyClass", objTestFileShort),
<< ResultData(_("MyClass"), objTestFileShort) ResultData("MyClass", objTestFileShort),
<< ResultData(_("MyProtocol"), objTestFileShort) ResultData("MyProtocol", objTestFileShort),
); };
QTest::newRow("CppFunctionsFilter-ObjC") QTest::newRow("CppFunctionsFilter-ObjC")
<< objTestFile << objTestFile
<< cppFunctionsFilter << cppFunctionsFilter
<< _("M") << "M"
<< (QList<ResultData>() << ResultDataList{
<< ResultData(_("anotherMethod"), _("MyClass (file1.mm)")) ResultData("anotherMethod", "MyClass (file1.mm)"),
<< ResultData(_("anotherMethod:"), _("MyClass (file1.mm)")) ResultData("anotherMethod:", "MyClass (file1.mm)"),
<< ResultData(_("someMethod"), _("MyClass (file1.mm)")) ResultData("someMethod", "MyClass (file1.mm)")
); };
} }
void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter() void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter()
@@ -326,51 +324,51 @@ void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter()
MyTestDataDir testDirectory("testdata_basic"); MyTestDataDir testDirectory("testdata_basic");
const QString testFile = testDirectory.file("file1.cpp"); const QString testFile = testDirectory.file("file1.cpp");
QList<ResultData> expectedResults = QList<ResultData>() auto expectedResults = ResultDataList{
<< ResultData(_("int myVariable"), _("")) ResultData("int myVariable", ""),
<< ResultData(_("myFunction(bool, int)"), _("")) ResultData("myFunction(bool, int)", ""),
<< ResultData(_("Pos"), _("")) ResultData("Pos", ""),
<< ResultData(_("somePositionWithin()"), _("")) ResultData("somePositionWithin()", ""),
<< ResultData(_("pointOfService()"), _("")) ResultData("pointOfService()", ""),
<< ResultData(_("matchArgument(Pos)"), _("")) ResultData("matchArgument(Pos)", ""),
<< ResultData(_("positiveNumber()"), _("")) ResultData("positiveNumber()", ""),
<< ResultData(_("MyEnum"), _("")) ResultData("MyEnum", ""),
<< ResultData(_("int V1"), _("MyEnum")) ResultData("int V1", "MyEnum"),
<< ResultData(_("int V2"), _("MyEnum")) ResultData("int V2", "MyEnum"),
<< ResultData(_("MyClass"), _("")) ResultData("MyClass", ""),
<< ResultData(_("MyClass()"), _("MyClass")) ResultData("MyClass()", "MyClass"),
<< ResultData(_("functionDeclaredOnly()"), _("MyClass")) ResultData("functionDeclaredOnly()", "MyClass"),
<< ResultData(_("functionDefinedInClass(bool, int)"), _("MyClass")) ResultData("functionDefinedInClass(bool, int)", "MyClass"),
<< ResultData(_("functionDefinedOutSideClass(char)"), _("MyClass")) ResultData("functionDefinedOutSideClass(char)", "MyClass"),
<< ResultData(_("functionDefinedOutSideClass(char)"), _("MyClass")) ResultData("functionDefinedOutSideClass(char)", "MyClass"),
<< ResultData(_("int myVariable"), _("MyNamespace")) ResultData("int myVariable", "MyNamespace"),
<< ResultData(_("myFunction(bool, int)"), _("MyNamespace")) ResultData("myFunction(bool, int)", "MyNamespace"),
<< ResultData(_("MyEnum"), _("MyNamespace")) ResultData("MyEnum", "MyNamespace"),
<< ResultData(_("int V1"), _("MyNamespace::MyEnum")) ResultData("int V1", "MyNamespace::MyEnum"),
<< ResultData(_("int V2"), _("MyNamespace::MyEnum")) ResultData("int V2", "MyNamespace::MyEnum"),
<< ResultData(_("MyClass"), _("MyNamespace")) ResultData("MyClass", "MyNamespace"),
<< ResultData(_("MyClass()"), _("MyNamespace::MyClass")) ResultData("MyClass()", "MyNamespace::MyClass"),
<< ResultData(_("functionDeclaredOnly()"), _("MyNamespace::MyClass")) ResultData("functionDeclaredOnly()", "MyNamespace::MyClass"),
<< ResultData(_("functionDefinedInClass(bool, int)"), _("MyNamespace::MyClass")) ResultData("functionDefinedInClass(bool, int)", "MyNamespace::MyClass"),
<< ResultData(_("functionDefinedOutSideClass(char)"), _("MyNamespace::MyClass")) ResultData("functionDefinedOutSideClass(char)", "MyNamespace::MyClass"),
<< ResultData(_("functionDefinedOutSideClassAndNamespace(float)"), ResultData("functionDefinedOutSideClassAndNamespace(float)",
_("MyNamespace::MyClass")) "MyNamespace::MyClass"),
<< ResultData(_("functionDefinedOutSideClass(char)"), _("MyNamespace::MyClass")) ResultData("functionDefinedOutSideClass(char)", "MyNamespace::MyClass"),
<< ResultData(_("functionDefinedOutSideClassAndNamespace(float)"), ResultData("functionDefinedOutSideClassAndNamespace(float)",
_("MyNamespace::MyClass")) "MyNamespace::MyClass"),
<< ResultData(_("int myVariable"), _("<anonymous namespace>")) ResultData("int myVariable", "<anonymous namespace>"),
<< ResultData(_("myFunction(bool, int)"), _("<anonymous namespace>")) ResultData("myFunction(bool, int)", "<anonymous namespace>"),
<< ResultData(_("MyEnum"), _("<anonymous namespace>")) ResultData("MyEnum", "<anonymous namespace>"),
<< ResultData(_("int V1"), _("<anonymous namespace>::MyEnum")) ResultData("int V1", "<anonymous namespace>::MyEnum"),
<< ResultData(_("int V2"), _("<anonymous namespace>::MyEnum")) ResultData("int V2", "<anonymous namespace>::MyEnum"),
<< ResultData(_("MyClass"), _("<anonymous namespace>")) ResultData("MyClass", "<anonymous namespace>"),
<< ResultData(_("MyClass()"), _("<anonymous namespace>::MyClass")) ResultData("MyClass()", "<anonymous namespace>::MyClass"),
<< ResultData(_("functionDeclaredOnly()"), _("<anonymous namespace>::MyClass")) ResultData("functionDeclaredOnly()", "<anonymous namespace>::MyClass"),
<< ResultData(_("functionDefinedInClass(bool, int)"), _("<anonymous namespace>::MyClass")) ResultData("functionDefinedInClass(bool, int)", "<anonymous namespace>::MyClass"),
<< ResultData(_("functionDefinedOutSideClass(char)"), _("<anonymous namespace>::MyClass")) ResultData("functionDefinedOutSideClass(char)", "<anonymous namespace>::MyClass"),
<< ResultData(_("functionDefinedOutSideClass(char)"), _("<anonymous namespace>::MyClass")) ResultData("functionDefinedOutSideClass(char)", "<anonymous namespace>::MyClass"),
<< ResultData(_("main()"), _("")) ResultData("main()", ""),
; };
CppCurrentDocumentFilterTestCase(testFile, expectedResults); CppCurrentDocumentFilterTestCase(testFile, expectedResults);
} }