aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cpptools/cpplocatorfilter_test.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-07-16 16:35:03 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-07-24 11:38:54 +0200
commit3a242495fe28811c535fab909db5aa42dc68873b (patch)
tree8612d3bb40e3b1a43c6198cf0d880d26f88b5b72 /src/plugins/cpptools/cpplocatorfilter_test.cpp
parentb8adc786157b81b0400cf701d02694a380d3e780 (diff)
ObjC++: also index ObjC symbols.
@classes, @protocols, @properties and -methods (and +methods) will now show up in the locator. Change-Id: I33f904c456c321fc80b8aba7ff52d5f1207c58be Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpplocatorfilter_test.cpp')
-rw-r--r--src/plugins/cpptools/cpplocatorfilter_test.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp
index 1a6b2472f22..ad4da2fc5cc 100644
--- a/src/plugins/cpptools/cpplocatorfilter_test.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp
@@ -168,7 +168,9 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data()
MyTestDataDir testDirectory(QLatin1String("testdata_basic"));
const QString testFile = testDirectory.file(QLatin1String("file1.cpp"));
+ const QString objTestFile = testDirectory.file(QLatin1String("file1.mm"));
const QString testFileShort = FileUtils::shortNativePath(FileName::fromString(testFile));
+ const QString objTestFileShort = FileUtils::shortNativePath(FileName::fromString(objTestFile));
QTest::newRow("CppFunctionsFilter")
<< testFile
@@ -247,6 +249,27 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data()
<< ResultData(_("MyNamespace::myFunction"), _("(bool, int)"))
<< ResultData(_("myFunction"), _("(bool, int)"))
);
+
+ QTest::newRow("CppClassesFilter-ObjC")
+ << objTestFile
+ << cppClassesFilter
+ << _("M")
+ << (QList<ResultData>()
+ << ResultData(_("MyClass"), objTestFileShort)
+ << ResultData(_("MyClass"), objTestFileShort)
+ << ResultData(_("MyClass"), objTestFileShort)
+ << ResultData(_("MyProtocol"), objTestFileShort)
+ );
+
+ QTest::newRow("CppFunctionsFilter-ObjC")
+ << objTestFile
+ << cppFunctionsFilter
+ << _("M")
+ << (QList<ResultData>()
+ << ResultData(_("anotherMethod"), _("MyClass"))
+ << ResultData(_("anotherMethod:"), _("MyClass"))
+ << ResultData(_("someMethod"), _("MyClass"))
+ );
}
void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter()