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

Cpp{Tools,Editor}: Tests: Use QString instead of QByteArray

Browse Source 
This is necessary in order to add tests with multi-byte UTF-8 code
points. Otherwise the initial and target source code marker positions
will be calculated on the QByteArray (test code) but used with a QString
(editor document).

Change-Id: I108961b13d32912a4d3193cf26eb59f65d296f57
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-05-08 13:21:42 -04:00
parent 41aa2cb3bd
commit cadc4b42ba
7 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,12 +77,13 @@ QuickFixTestDocument::QuickFixTestDocument(const QByteArray &fileName,
const QByteArray &source,
const QByteArray &expectedSource)
: TestDocument(fileName, source)
, m_expectedSource(expectedSource)
, m_expectedSource(QString::fromUtf8(expectedSource))
{
if (m_cursorPosition > -1)
m_source.remove(m_cursorPosition, 1);
const int cursorPositionInExpectedSource = m_expectedSource.indexOf(m_cursorMarker);
const int cursorPositionInExpectedSource
= m_expectedSource.indexOf(QLatin1Char(m_cursorMarker));
if (cursorPositionInExpectedSource > -1)
m_expectedSource.remove(cursorPositionInExpectedSource, 1);
}
@@ -96,15 +97,15 @@ QList<QuickFixTestDocument::Ptr> singleDocument(const QByteArray &original,
/// Leading whitespace is not removed, so we can check if the indetation ranges
/// have been set correctly by the quick-fix.
static QByteArray &removeTrailingWhitespace(QByteArray &input)
static QString &removeTrailingWhitespace(QString &input)
{
QList<QByteArray> lines = input.split('\n');
const QStringList lines = input.split(QLatin1Char('\n'));
input.resize(0);
for (int i = 0, total = lines.size(); i < total; ++i) {
QByteArray line = lines.at(i);
QString line = lines.at(i);
while (line.length() > 0) {
char lastChar = line[line.length() - 1];
if (lastChar == ' ' || lastChar == '\t')
QChar lastChar = line[line.length() - 1];
if (lastChar == QLatin1Char(' ') || lastChar == QLatin1Char('\t'))
line.chop(1);
else
break;
@@ -113,7 +114,7 @@ static QByteArray &removeTrailingWhitespace(QByteArray &input)
const bool isLastLine = i == lines.size() - 1;
if (!isLastLine)
input.append('\n');
input.append(QLatin1Char('\n'));
}
return input;
}
@@ -197,14 +198,14 @@ QuickFixTestCase::QuickFixTestCase(const QList<QuickFixTestDocument::Ptr> &theTe
// Compare all files
foreach (const QuickFixTestDocument::Ptr testFile, m_testFiles) {
// Check
QByteArray result = testFile->m_editorWidget->document()->toPlainText().toUtf8();
QString result = testFile->m_editorWidget->document()->toPlainText();
removeTrailingWhitespace(result);
QCOMPARE(QLatin1String(result), QLatin1String(testFile->m_expectedSource));
QCOMPARE(result, testFile->m_expectedSource);
// Undo the change
for (int i = 0; i < 100; ++i)
testFile->m_editorWidget->undo();
result = testFile->m_editorWidget->document()->toPlainText().toUtf8();
result = testFile->m_editorWidget->document()->toPlainText();
QCOMPARE(result, testFile->m_source);
}
}