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

CppEditor: Make connect refactoring work with 3-args form

Browse Source 
Change-Id: I256753726cd543e157663faddabf960b26b04300
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2014-10-01 14:45:38 +02:00
parent 3277180b0c
commit af23e254df
3 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/cppeditor/cppquickfix_test.cpp
View File

@@ -3860,8 +3860,25 @@ void CppEditorPlugin::test_quickfix_ConvertQt4Connect_connectOutOfClass()
QuickFixTestCase(testFiles, &factory);
}
void CppEditorPlugin::test_quickfix_ConvertQt4Connect_connectWithinClass_data()
{
QTest::addColumn<QByteArray>("original");
QTest::addColumn<QByteArray>("expected");
QTest::newRow("case1")
<< QByteArray("conne@ct(this, SIGNAL(sigFoo(int)), this, SLOT(setProp(int)));")
<< QByteArray("connect(this, &TestClass::sigFoo, this, &TestClass::setProp);");
QTest::newRow("case2")
<< QByteArray("conne@ct(this, SIGNAL(sigFoo(int)), SLOT(setProp(int)));")
<< QByteArray("connect(this, &TestClass::sigFoo, this, &TestClass::setProp);");
}
void CppEditorPlugin::test_quickfix_ConvertQt4Connect_connectWithinClass()
{
QFETCH(QByteArray, original);
QFETCH(QByteArray, expected);
QByteArray prefix =
"class QObject {};\n"
"class TestClass : public QObject\n"
@@ -3877,16 +3894,10 @@ void CppEditorPlugin::test_quickfix_ConvertQt4Connect_connectWithinClass()
QByteArray suffix = "\n}\n";
QByteArray original = prefix
+ " conne@ct(this, SIGNAL(sigFoo(int)), this, SLOT(setProp(int)));"
+ suffix;
QByteArray expected = prefix
+ " connect(this, &TestClass::sigFoo, this, &TestClass::setProp);"
+ suffix;
QList<QuickFixTestDocument::Ptr> testFiles;
testFiles << QuickFixTestDocument::create("file.cpp", original, expected);
testFiles << QuickFixTestDocument::create("file.cpp",
prefix + original + suffix,
prefix + expected + suffix);
ConvertQt4Connect factory;
QuickFixTestCase(testFiles, &factory);