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

DiffEditor: Fix test

Browse Source 
* Add trailing newline
* Fix offset by 1 for line numbers
* Swap expected and actual result
* Join short lines

Change-Id: Ia1c618e5fc86dc16956176241205a2108a1ba3e4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-08 23:09:51 +03:00
committed by Orgad Shaneh
parent ef87889b63
commit 67561efd29
1 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/plugins/diffeditor/diffeditorplugin.cpp
View File

@@ -453,7 +453,7 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch_data()
"+}\n" "+}\n"
"+\n" "+\n"
" } // namespace Internal\n" " } // namespace Internal\n"
" } // namespace DiffEditor"); " } // namespace DiffEditor\n");
FileData fileData1; FileData fileData1;
fileData1.leftFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffeditor.cpp"), fileData1.leftFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffeditor.cpp"),
@@ -461,8 +461,8 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch_data()
fileData1.rightFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffeditor.cpp"), fileData1.rightFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffeditor.cpp"),
QLatin1String("082c135")); QLatin1String("082c135"));
ChunkData chunkData1; ChunkData chunkData1;
chunkData1.leftStartingLineNumber = 187; chunkData1.leftStartingLineNumber = 186;
chunkData1.rightStartingLineNumber = 187; chunkData1.rightStartingLineNumber = 186;
QList<RowData> rows1; QList<RowData> rows1;
rows1.append(RowData(TextLineData(QLatin1String(" m_controller = m_document->controller();")))); rows1.append(RowData(TextLineData(QLatin1String(" m_controller = m_document->controller();"))));
rows1.append(RowData(TextLineData(QLatin1String(" m_guiController = new DiffEditorGuiController(m_controller, this);")))); rows1.append(RowData(TextLineData(QLatin1String(" m_guiController = new DiffEditorGuiController(m_controller, this);"))));
@@ -485,8 +485,8 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch_data()
fileData2.rightFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffutils.cpp"), fileData2.rightFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffutils.cpp"),
QLatin1String("f8ff795")); QLatin1String("f8ff795"));
ChunkData chunkData2; ChunkData chunkData2;
chunkData2.leftStartingLineNumber = 464; chunkData2.leftStartingLineNumber = 463;
chunkData2.rightStartingLineNumber = 464; chunkData2.rightStartingLineNumber = 463;
QList<RowData> rows2; QList<RowData> rows2;
rows2.append(RowData(TextLineData(QLatin1String(" return diffText;")))); rows2.append(RowData(TextLineData(QLatin1String(" return diffText;"))));
rows2.append(RowData(TextLineData(QLatin1String("}")))); rows2.append(RowData(TextLineData(QLatin1String("}"))));
@@ -531,40 +531,26 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch()
for (int i = 0; i < fileDataList.count(); i++) { for (int i = 0; i < fileDataList.count(); i++) {
const FileData &origFileData = fileDataList.at(i); const FileData &origFileData = fileDataList.at(i);
const FileData &resultFileData = result.at(i); const FileData &resultFileData = result.at(i);
QCOMPARE(origFileData.leftFileInfo.fileName, QCOMPARE(resultFileData.leftFileInfo.fileName, origFileData.leftFileInfo.fileName);
resultFileData.leftFileInfo.fileName); QCOMPARE(resultFileData.leftFileInfo.typeInfo, origFileData.leftFileInfo.typeInfo);
QCOMPARE(origFileData.leftFileInfo.typeInfo, QCOMPARE(resultFileData.rightFileInfo.fileName, origFileData.rightFileInfo.fileName);
resultFileData.leftFileInfo.typeInfo); QCOMPARE(resultFileData.rightFileInfo.typeInfo, origFileData.rightFileInfo.typeInfo);
QCOMPARE(origFileData.rightFileInfo.fileName, QCOMPARE(resultFileData.chunks.count(), origFileData.chunks.count());
resultFileData.rightFileInfo.fileName);
QCOMPARE(origFileData.rightFileInfo.typeInfo,
resultFileData.rightFileInfo.typeInfo);
QCOMPARE(origFileData.chunks.count(),
resultFileData.chunks.count());
for (int j = 0; j < origFileData.chunks.count(); j++) { for (int j = 0; j < origFileData.chunks.count(); j++) {
const ChunkData &origChunkData = origFileData.chunks.at(j); const ChunkData &origChunkData = origFileData.chunks.at(j);
const ChunkData &resultChunkData = resultFileData.chunks.at(j); const ChunkData &resultChunkData = resultFileData.chunks.at(j);
QCOMPARE(origChunkData.leftStartingLineNumber, QCOMPARE(resultChunkData.leftStartingLineNumber, origChunkData.leftStartingLineNumber);
resultChunkData.leftStartingLineNumber); QCOMPARE(resultChunkData.rightStartingLineNumber, origChunkData.rightStartingLineNumber);
QCOMPARE(origChunkData.rightStartingLineNumber, QCOMPARE(resultChunkData.contextChunk, origChunkData.contextChunk);
resultChunkData.rightStartingLineNumber); QCOMPARE(resultChunkData.rows.count(), origChunkData.rows.count());
QCOMPARE(origChunkData.contextChunk,
resultChunkData.contextChunk);
QCOMPARE(origChunkData.rows.count(),
resultChunkData.rows.count());
for (int k = 0; k < origChunkData.rows.count(); k++) { for (int k = 0; k < origChunkData.rows.count(); k++) {
const RowData &origRowData = origChunkData.rows.at(k); const RowData &origRowData = origChunkData.rows.at(k);
const RowData &resultRowData = resultChunkData.rows.at(k); const RowData &resultRowData = resultChunkData.rows.at(k);
QCOMPARE(origRowData.equal, QCOMPARE(resultRowData.equal, origRowData.equal);
resultRowData.equal); QCOMPARE(resultRowData.leftLine.text, origRowData.leftLine.text);
QCOMPARE(origRowData.leftLine.text, QCOMPARE(resultRowData.leftLine.textLineType, origRowData.leftLine.textLineType);
resultRowData.leftLine.text); QCOMPARE(resultRowData.rightLine.text, origRowData.rightLine.text);
QCOMPARE(origRowData.leftLine.textLineType, QCOMPARE(resultRowData.rightLine.textLineType, origRowData.rightLine.textLineType);
resultRowData.leftLine.textLineType);
QCOMPARE(origRowData.rightLine.text,
resultRowData.rightLine.text);
QCOMPARE(origRowData.rightLine.textLineType,
resultRowData.rightLine.textLineType);
} }
} }
} }