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

CppEditor: Tests: Call QByteArray::remove() only with i >= 0

Browse Source 
For example test_quickfix_InsertDefFromDecl_afterClass led to a
QByteArray::remove(-1) call. According to the doc nothing happens, but
it will become problematic later when we change to QString (with that, a
character will be removed from the end).

Change-Id: Ie89dd7834e44fbcfde63ea6ca3ab181dfe50e191
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-05-08 15:40:42 -04:00
parent 4dd8a8fdd9
commit 7fbfdb737c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,8 +79,12 @@ QuickFixTestDocument::QuickFixTestDocument(const QByteArray &fileName,
: TestDocument(fileName, source)
, m_expectedSource(expectedSource)
{
m_source.remove(m_cursorPosition, 1);
m_expectedSource.remove(expectedSource.indexOf(m_cursorMarker), 1);
if (m_cursorPosition > -1)
m_source.remove(m_cursorPosition, 1);
const int cursorPositionInExpectedSource = m_expectedSource.indexOf(m_cursorMarker);
if (cursorPositionInExpectedSource > -1)
m_expectedSource.remove(cursorPositionInExpectedSource, 1);
}
QList<QuickFixTestDocument::Ptr> singleDocument(const QByteArray &original,