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

CppEditor: Move FollowSymbolTest into the Tests namespace

Browse Source 
This is now possible, as there is no ambiguity anymore regarding the
TestDocument class.

Change-Id: I6f736a5790d2eab1c82f5429a9292aa9d7bcda56
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-08-27 16:00:33 +02:00
parent 5fe3ead73e
commit 49211c4a5c
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/cppeditorplugin.cpp
View File

@@ -402,10 +402,10 @@ QVector<QObject *> CppEditorPlugin::createTestObjects() const
{ {
return { return {
#ifdef WITH_TESTS #ifdef WITH_TESTS
new FollowSymbolTest,
new Tests::AutoCompleterTest, new Tests::AutoCompleterTest,
new Tests::DoxygenTest, new Tests::DoxygenTest,
new Tests::FileAndTokenActionsTest, new Tests::FileAndTokenActionsTest,
new Tests::FollowSymbolTest,
new Tests::IncludeHierarchyTest, new Tests::IncludeHierarchyTest,
new Tests::InsertVirtualMethodsTest, new Tests::InsertVirtualMethodsTest,
new Tests::QuickfixTest, new Tests::QuickfixTest,

14
src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
View File

@@ -123,8 +123,7 @@ QT_END_NAMESPACE
typedef QByteArray _; typedef QByteArray _;
namespace CppEditor { namespace CppEditor::Internal::Tests {
namespace Internal {
/// A fake virtual functions assist provider that runs processor->perform() already in configure() /// A fake virtual functions assist provider that runs processor->perform() already in configure()
class VirtualFunctionTestAssistProvider : public VirtualFunctionAssistProvider class VirtualFunctionTestAssistProvider : public VirtualFunctionAssistProvider
@@ -546,13 +545,11 @@ TestDocumentPtr F2TestCase::testFileWithTargetCursorMarker(const QList<TestDocum
return TestDocumentPtr(); return TestDocumentPtr();
} }
} // namespace Internal } // namespace CppEditor::Internal::Tests
} // namespace CppEditor
Q_DECLARE_METATYPE(QList<CppEditor::Internal::TestDocumentPtr>) Q_DECLARE_METATYPE(QList<CppEditor::Internal::Tests::TestDocumentPtr>)
namespace CppEditor { namespace CppEditor::Internal::Tests {
namespace Internal {
void FollowSymbolTest::initTestCase() void FollowSymbolTest::initTestCase()
{ {
@@ -2080,8 +2077,7 @@ void FollowSymbolTest::testFollowVirtualFunctionCallMultipleDocuments()
F2TestCase(F2TestCase::FollowSymbolUnderCursorAction, testFiles, finalResults); F2TestCase(F2TestCase::FollowSymbolUnderCursorAction, testFiles, finalResults);
} }
} // namespace Internal } // namespace CppEditor::Internal::Tests
} // namespace CppEditor
/* /*
Potential test cases improving name lookup. Potential test cases improving name lookup.

6
src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.h
View File

@@ -27,9 +27,7 @@
#include <QObject> #include <QObject>
// Can't use Tests namespace because someone had the clever idea to create two namespace CppEditor::Internal::Tests {
// non-local TestDocument classes in this plugin.
namespace CppEditor::Internal {
class FollowSymbolTest : public QObject class FollowSymbolTest : public QObject
{ {
@@ -71,4 +69,4 @@ private slots:
void testFollowVirtualFunctionCallMultipleDocuments(); void testFollowVirtualFunctionCallMultipleDocuments();
}; };
} // namespace CppEditor::Internal } // namespace CppEditor::Internal::Tests