Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-11-05 02:46:56 +03:00
Code Issues Projects Releases Wiki Activity
1828a48411
Gittyup/test/EditorLineInfos.cpp
Martin Marmsoler 2a327cf588 fix test
2022-11-29 15:19:35 +01:00

1052 lines
39 KiB
C++
Raw Blame History

#include "Test.h"
#include "dialogs/ExternalToolsDialog.h"
#include "ui/DiffView/HunkWidget.h"
#include "ui/DiffView/FileWidget.h"
#include "ui/MainWindow.h"
#include "ui/DiffView/DiffView.h"
#include "ui/RepoView.h"
#include <QString>
#include "git/Reference.h"
#include "git/Diff.h"
#include "git/Commit.h"
#include "git/Tree.h"
#define INIT_REPO(repoPath, /* bool */ useTempDir) \
QString path = Test::extractRepository(repoPath, useTempDir); \
QVERIFY2(!path.isEmpty(), qPrintable("Extracting repository failed")); \
mRepo = git::Repository::open(path); \
QVERIFY2(mRepo.isValid(), qPrintable("Unable to open repository")); \
Test::initRepo(mRepo); \
MainWindow window(mRepo); \
window.show(); \
QVERIFY(QTest::qWaitForWindowExposed(&window)); \
\
git::Reference head = mRepo.head(); \
git::Commit commit = head.target(); \
git::Diff stagedDiff = mRepo.diffTreeToIndex(commit.tree()); /* correct */ \
\
RepoView *repoView = window.currentView(); \
Test::refresh(repoView); \
DiffView diffView = DiffView(mRepo, repoView); \
auto diff = mRepo.status(mRepo.index(), nullptr, false);
#define BITSET(value, bit) ((value & (1 << bit)) == (1 << bit))
#define checkEditorMarkers(editor, unstagedAddition, stagedAddition, \
unstagedDeletion, stagedDeletion) \
for (int i = 0; i < editor->lineCount(); i++) { \
QString line = editor->line(i); \
int markers = editor->markers(i); \
\
QString state = ""; \
if (BITSET(markers, TextEditor::Marker::Addition)) \
state = "Addition"; \
else if (BITSET(markers, TextEditor::Marker::Deletion)) \
state = "Deletion"; \
else if (BITSET(markers, TextEditor::Marker::Context)) \
state = "Unchanged"; \
else \
state = QString::number(markers); \
\
qDebug() << "Index: " << i << ", State: " << state << ", Staged: " \
<< BITSET(markers, TextEditor::Marker::StagedMarker) << line; \
if (unstagedAddition.indexOf(i) != -1) { \
/* unstaged addition */ \
QVERIFY2(BITSET(markers, TextEditor::Marker::Addition), \
qPrintable("Line index: " + QString::number(i))); \
QVERIFY2(!BITSET(markers, TextEditor::Marker::StagedMarker), \
qPrintable("Line index: " + QString::number(i))); \
} else if (stagedAddition.indexOf(i) != -1) { \
/* staged addition */ \
QVERIFY2(BITSET(markers, TextEditor::Marker::Addition), \
qPrintable("Line index: " + QString::number(i))); \
QVERIFY2(BITSET(markers, TextEditor::Marker::StagedMarker), \
qPrintable("Line index: " + QString::number(i))); \
} else if (unstagedDeletion.indexOf(i) != -1) { \
/* unstaged deletion */ \
QVERIFY2(BITSET(markers, TextEditor::Marker::Deletion), \
qPrintable("Line index: " + QString::number(i))); \
QVERIFY2(!BITSET(markers, TextEditor::Marker::StagedMarker), \
qPrintable("Line index: " + QString::number(i))); \
} else if (stagedDeletion.indexOf(i) != -1) { \
/* staged deletion */ \
QVERIFY2(BITSET(markers, TextEditor::Marker::Deletion), \
qPrintable("Line index: " + QString::number(i))); \
QVERIFY2(BITSET(markers, TextEditor::Marker::StagedMarker), \
qPrintable("Line index: " + QString::number(i))); \
} else { \
QVERIFY2(!BITSET(markers, TextEditor::Marker::Deletion), \
qPrintable("Line index: " + QString::number(i))); \
QVERIFY2(!BITSET(markers, TextEditor::Marker::Addition), \
qPrintable("Line index: " + QString::number(i))); \
QVERIFY2(!BITSET(markers, TextEditor::Marker::StagedMarker), \
qPrintable("Line index: " + QString::number(i))); \
} \
}
/*
* For DEBUGGING PURPOSE:
* git diff HEAD: to get the diff shown in the editor
* git diff --cached: to get the staged diff
*/
#define EXECUTE_ONLY_LAST_TEST 0
using namespace QTest;
class TestEditorLineInfo : public QObject {
Q_OBJECT
private slots:
void initTestCase();
void cleanupTestCase();
// void editorLineMarkers1();
#if EXECUTE_ONLY_LAST_TEST == 0
void editorLineSingleHunkAdditionStaged();
void editorLineSingleHunkDeletionStaged();
void editorLineSingleHunkChangeStaged();
void editorLineSingleHunkChange_onlyAdditionStaged();
void editorLineSingleHunkChange_onlyDeletionStaged();
void singleHunk_multipleDeletions();
void singleHunk_multipleAdditions();
void multipleHunks_multipleDeletions();
void multipleHunks_multipleAdditions();
void multipleHunks_misc1();
void singleHunk_additionsOnly_secondStagedPatch();
void singleHunk_deletionsOnly_secondStagedPatch();
void multipleHunks_StageSingleLines();
void multipleHunks_StageSingleLines2();
#ifdef Q_OS_WIN
void windowsCRLF();
#endif // Q_OS_WIN
void windowsCRLFMultiHunk();
void sameContentRemoveLine();
void sameContentAddLine();
#endif // EXECUTE_ONLY_LAST_TEST == 0
void discardCompleteDeletedContent();
void discardCompleteAddedContent();
// void deleteCompleteContent();
private:
int closeDelay = 0;
git::Repository mRepo;
};
void TestEditorLineInfo::initTestCase() {}
#if EXECUTE_ONLY_LAST_TEST == 0
void TestEditorLineInfo::editorLineSingleHunkAdditionStaged() {
INIT_REPO("01_singleHunkAdditionStaged.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
if (i == 3) {
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
QCOMPARE(line, "3.5\n");
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
void TestEditorLineInfo::editorLineSingleHunkDeletionStaged() {
INIT_REPO("02_singleHunkDeletionStaged.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
if (i == 2) {
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
QCOMPARE(line, "3\n");
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
void TestEditorLineInfo::editorLineSingleHunkChangeStaged() {
INIT_REPO("03_singleHunkChangeSingleLine.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
switch (i) {
case 2:
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
QCOMPARE(line, "3\n");
break;
case 3:
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
QCOMPARE(line, "3.5\n");
break;
default:
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
break;
}
}
}
void TestEditorLineInfo::editorLineSingleHunkChange_onlyAdditionStaged() {
INIT_REPO("04_singleHunkChange_onlyAdditionStaged.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
switch (i) {
case 2:
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
QCOMPARE(line, "3\n");
break;
case 3:
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
QCOMPARE(line, "3.5\n");
break;
default:
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
break;
}
}
}
void TestEditorLineInfo::editorLineSingleHunkChange_onlyDeletionStaged() {
INIT_REPO("05_singleHunkChange_onlyDeletionStaged.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
switch (i) {
case 2:
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
QCOMPARE(line, "3\n");
break;
case 3:
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
QCOMPARE(line, "3.5\n");
break;
default:
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
break;
}
}
}
void TestEditorLineInfo::singleHunk_multipleDeletions() {
INIT_REPO("06_singleHunk_multipleDeletions.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstaged({3, 4, 7, 8, 10});
QVector<int> staged({5, 6, 9});
if (unstaged.indexOf(i) != -1) {
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (staged.indexOf(i) != -1) {
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
void TestEditorLineInfo::singleHunk_multipleAdditions() {
INIT_REPO("07_singleHunk_multipleAdditions.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstaged({3, 6, 7, 10});
QVector<int> staged({4, 5, 8, 9, 11});
if (unstaged.indexOf(i) != -1) {
// unstaged
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (staged.indexOf(i) != -1) {
// staged
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
void TestEditorLineInfo::multipleHunks_multipleDeletions() {
INIT_REPO("08_multipleHunks_multipleDeletions.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstaged({3, 6, 7});
QVector<int> staged({4, 5});
if (unstaged.indexOf(i) != -1) {
// unstaged
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (staged.indexOf(i) != -1) {
// staged
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
// Second hunk
auto hw2 = HunkWidget(&diffView, diff, patch, stagedPatch, 1, false, false,
repoView);
hw2.load(stagedPatch, true);
editor = hw2.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstaged({3, 4, 7, 8});
QVector<int> staged({5, 6});
if (unstaged.indexOf(i) != -1) {
// unstaged
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (staged.indexOf(i) != -1) {
// staged
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
void TestEditorLineInfo::multipleHunks_multipleAdditions() {
INIT_REPO("09_multipleHunks_multipleAdditions.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstaged({3, 4, 7, 8});
QVector<int> staged({5, 6, 9});
if (unstaged.indexOf(i) != -1) {
// unstaged
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (staged.indexOf(i) != -1) {
// staged
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
// Second hunk
auto hw2 = HunkWidget(&diffView, diff, patch, stagedPatch, 1, false, false,
repoView);
hw2.load(stagedPatch, true);
editor = hw2.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstaged({3, 6, 7, 8, 10});
QVector<int> staged({4, 5, 9, 11});
if (unstaged.indexOf(i) != -1) {
// unstaged
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (staged.indexOf(i) != -1) {
// staged
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
void TestEditorLineInfo::singleHunk_additionsOnly_secondStagedPatch() {
// Testing the finding of the staged patch index
INIT_REPO("11_singleHunk_additionsOnly_secondStagedPatch.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstagedAddition({2});
QVector<int> stagedAddition({6});
if (unstagedAddition.indexOf(i) != -1) {
// unstaged addition
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (stagedAddition.indexOf(i) != -1) {
// staged addition
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
void TestEditorLineInfo::singleHunk_deletionsOnly_secondStagedPatch() {
// Testing the finding of the staged patch index
INIT_REPO("12_singleHunk_deletionsOnly_secondStagedPatch.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstagedDeletion({1});
QVector<int> stagedDeletion({4});
if (unstagedDeletion.indexOf(i) != -1) {
// unstaged addition
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (stagedDeletion.indexOf(i) != -1) {
// staged addition
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
void TestEditorLineInfo::multipleHunks_misc1() {
INIT_REPO("10_misc.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
auto editor = hw.editor();
for (int i = 0; i < editor->lineCount(); i++) {
QString line = editor->line(i);
int markers = editor->markers(i);
QVector<int> unstagedAddition({6, 9, 19, 23});
QVector<int> stagedAddition({24, 25});
QVector<int> unstagedDeletion({3, 4, 5, 16, 17, 18, 21, 22});
QVector<int> stagedDeletion({});
if (unstagedAddition.indexOf(i) != -1) {
// unstaged addition
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (stagedAddition.indexOf(i) != -1) {
// staged addition
QVERIFY(BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (unstagedDeletion.indexOf(i) != -1) {
// unstaged deletion
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
} else if (stagedDeletion.indexOf(i) != -1) {
// staged deletion
QVERIFY(BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(BITSET(markers, TextEditor::Marker::StagedMarker));
} else {
QVERIFY(!BITSET(markers, TextEditor::Marker::Deletion));
QVERIFY(!BITSET(markers, TextEditor::Marker::Addition));
QVERIFY(!BITSET(markers, TextEditor::Marker::StagedMarker));
}
}
}
// void TestEditorLineInfo::editorLineMarkers1() {
// //INIT_REPO("editorLineMarkers1.zip")
//// QString path =
/// Test::extractRepository("01_singleHunkAdditionStaged.zip"); /
/// QVERIFY(!path.isEmpty()); / mRepo = git::Repository::open(path); /
/// QVERIFY(mRepo.isValid()); / auto window = new MainWindow(mRepo);
//// git::Reference head = mRepo.head();
//// git::Commit commit = head.target();
//// git::Diff stagedDiff = mRepo.diffTreeToIndex(commit.tree()); // correct
//// QVERIFY(stagedDiff.count() > 0);
//// RepoView *view = window->currentView();
//// //Test::refresh(view);
//// auto diff = mRepo.status(mRepo.index(), nullptr, false);
/////commit.diff(git::Commit(), -1, false); / QVERIFY(diff.count() > 0); /
/// git::Patch patch = diff.patch(0); / auto stagedPatch =
/// stagedDiff.patch(0); / DiffView diffView = DiffView(mRepo, view);
//// auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false,
/// false, view); / hw.load(stagedPatch, true);
//}
void TestEditorLineInfo::multipleHunks_StageSingleLines() {
INIT_REPO("13_singleHunkNoStaged.zip", true)
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
// no staged lines yet, so no staged patch
QCOMPARE(mRepo.diffTreeToIndex(commit.tree()).count(), 0);
git::Patch stagedPatch = git::Patch();
QString name = patch.name();
QString path_ = mRepo.workdir().filePath(name);
bool submodule = mRepo.lookupSubmodule(name).isValid();
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path_, submodule);
fw.setStageState(git::Index::StagedState::Unstaged);
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 2);
for (auto *hunk : hunks)
hunk->load();
checkEditorMarkers(hunks.at(0)->editor(),
QVector<int>({0, 1, 2, 3, 4, 5, 11}), QVector<int>(),
QVector<int>(), QVector<int>());
checkEditorMarkers(
hunks.at(1)->editor(),
QVector<int>({3, 4, 5, 6, 7, 8, 9, 10, 15, 16, 20, 21, 22, 23, 30}),
QVector<int>({}), QVector<int>({14, 19, 29}), QVector<int>());
// Stage single lines
hunks.at(0)->stageSelected(5, 6); // stage line 5
}
Test::refresh(repoView);
stagedDiff = mRepo.diffTreeToIndex(commit.tree()); /* correct */
diff = mRepo.status(mRepo.index(), nullptr, false);
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
stagedPatch = stagedDiff.patch(0);
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path, submodule);
// It is important that all hunks are loaded!!!!
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 2);
for (auto *hunk : hunks)
hunk->load();
checkEditorMarkers(hunks.at(0)->editor(), QVector<int>({0, 1, 2, 3, 4, 11}),
QVector<int>({5}), QVector<int>(), QVector<int>());
checkEditorMarkers(
hunks.at(1)->editor(),
QVector<int>({3, 4, 5, 6, 7, 8, 9, 10, 15, 16, 20, 21, 22, 23, 30}),
QVector<int>({}), QVector<int>({14, 19, 29}), QVector<int>());
hunks.at(0)->stageSelected(4, 5); // stage line 4
}
Test::refresh(repoView);
stagedDiff = mRepo.diffTreeToIndex(commit.tree()); /* correct */
diff = mRepo.status(mRepo.index(), nullptr, false);
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
stagedPatch = stagedDiff.patch(0);
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path, submodule);
auto hunks = fw.hunks();
QCOMPARE(hunks.count(), 2);
for (auto *hunk : hunks)
hunk->load();
checkEditorMarkers(hunks.at(0)->editor(), QVector<int>({0, 1, 2, 3, 11}),
QVector<int>({4, 5}), QVector<int>(), QVector<int>());
checkEditorMarkers(
hunks.at(1)->editor(),
QVector<int>({3, 4, 5, 6, 7, 8, 9, 10, 15, 16, 20, 21, 22, 23, 30}),
QVector<int>({}), QVector<int>({14, 19, 29}), QVector<int>());
}
}
void TestEditorLineInfo::multipleHunks_StageSingleLines2() {
/*
* Staging the last line, first only the deleted one
* and then the added line
*/
INIT_REPO("13_singleHunkNoStaged.zip", true)
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
// no staged lines yet, so no staged patch
QCOMPARE(mRepo.diffTreeToIndex(commit.tree()).count(), 0);
git::Patch stagedPatch = git::Patch();
QString name = patch.name();
QString path_ = mRepo.workdir().filePath(name);
bool submodule = mRepo.lookupSubmodule(name).isValid();
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path_, submodule);
fw.setStageState(git::Index::StagedState::Unstaged);
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 2);
for (auto *hunk : hunks)
hunk->load();
checkEditorMarkers(hunks.at(0)->editor(),
QVector<int>({0, 1, 2, 3, 4, 5, 11}), QVector<int>(),
QVector<int>(), QVector<int>());
checkEditorMarkers(
hunks.at(1)->editor(),
QVector<int>({3, 4, 5, 6, 7, 8, 9, 10, 15, 16, 20, 21, 22, 23, 30}),
QVector<int>({}), QVector<int>({14, 19, 29}), QVector<int>());
// Stage single lines
hunks.at(1)->stageSelected(29, 30);
}
Test::refresh(repoView);
stagedDiff = mRepo.diffTreeToIndex(commit.tree()); /* correct */
diff = mRepo.status(mRepo.index(), nullptr, false);
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
stagedPatch = stagedDiff.patch(0);
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path, submodule);
// It is important that all hunks are loaded!!!!
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 2);
for (auto *hunk : hunks)
hunk->load();
checkEditorMarkers(hunks.at(0)->editor(),
QVector<int>({0, 1, 2, 3, 4, 5, 11}), QVector<int>(),
QVector<int>(), QVector<int>());
checkEditorMarkers(
hunks.at(1)->editor(),
QVector<int>({3, 4, 5, 6, 7, 8, 9, 10, 15, 16, 20, 21, 22, 23, 30}),
QVector<int>({}), QVector<int>({14, 19}), QVector<int>({29}));
hunks.at(1)->stageSelected(30, 31);
}
Test::refresh(repoView);
stagedDiff = mRepo.diffTreeToIndex(commit.tree()); /* correct */
diff = mRepo.status(mRepo.index(), nullptr, false);
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
stagedPatch = stagedDiff.patch(0);
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path, submodule);
auto hunks = fw.hunks();
QCOMPARE(hunks.count(), 2);
for (auto *hunk : hunks)
hunk->load();
checkEditorMarkers(hunks.at(0)->editor(),
QVector<int>({0, 1, 2, 3, 4, 5, 11}), QVector<int>(),
QVector<int>(), QVector<int>());
checkEditorMarkers(
hunks.at(1)->editor(),
QVector<int>({3, 4, 5, 6, 7, 8, 9, 10, 15, 16, 20, 21, 22, 23}),
QVector<int>({30}), QVector<int>({14, 19}), QVector<int>({29}));
}
}
#ifdef Q_OS_WIN
// This test is only relevant on windows, because on linux this scenario does
// not happen. The problem with this repo on linux is that the repo was created
// on windows but git uses internally \n instead of \r\n so when opening this
// repo on linux, the diff shows more than it should, because all unchanged
// lines have \n and all changed lines have \r\n so the diff looks different.
// This cannot happen normaly, because when cloning, git converts automatically
// for the used OS
void TestEditorLineInfo::windowsCRLF() {
/*
* Staging single lines in a file with CRLF instead of single LF
* The repository was created on windows
*/
INIT_REPO("14_windowsCRLF.zip", true)
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
// no staged lines yet, so no staged patch
QCOMPARE(mRepo.diffTreeToIndex(commit.tree()).count(), 0);
git::Patch stagedPatch = git::Patch();
QString name = patch.name();
QString path_ = mRepo.workdir().filePath(name);
bool submodule = mRepo.lookupSubmodule(name).isValid();
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path_, submodule);
fw.setStageState(git::Index::StagedState::Unstaged);
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 1);
hunks[0]->load();
checkEditorMarkers(hunks.at(0)->editor(), QVector<int>(), QVector<int>(),
QVector<int>({3, 4, 5}), QVector<int>());
// Stage single lines
hunks[0]->stageSelected(3, 5);
}
Test::refresh(repoView);
stagedDiff = mRepo.diffTreeToIndex(commit.tree()); /* correct */
diff = mRepo.status(mRepo.index(), nullptr, false);
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
stagedPatch = stagedDiff.patch(0);
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path, submodule);
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 1);
hunks[0]->load();
checkEditorMarkers(hunks.at(0)->editor(), QVector<int>(), QVector<int>(),
QVector<int>({5}), QVector<int>({3, 4}));
}
}
#endif // Q_OS_WIN
void TestEditorLineInfo::windowsCRLFMultiHunk() {
/*
* Staging single lines in a file with CRLF instead of single LF for multiple
* hunks. The CRLF file was created directly on linux and not on windows
*/
INIT_REPO("15_windowsCRLF_multipleHunks.zip", true)
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
// no staged lines yet, so no staged patch
QCOMPARE(mRepo.diffTreeToIndex(commit.tree()).count(), 0);
git::Patch stagedPatch = git::Patch();
QString name = patch.name();
QString path_ = mRepo.workdir().filePath(name);
bool submodule = mRepo.lookupSubmodule(name).isValid();
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path_, submodule);
fw.setStageState(git::Index::StagedState::Unstaged);
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 2);
hunks[0]->load();
hunks[1]->load();
checkEditorMarkers(hunks.at(0)->editor(), QVector<int>(), QVector<int>(),
QVector<int>({3, 4}), QVector<int>());
checkEditorMarkers(hunks.at(1)->editor(), QVector<int>(), QVector<int>(),
QVector<int>({3}), QVector<int>());
// Stage single lines
hunks[0]->stageSelected(3, 4); // stage first deletion
}
Test::refresh(repoView);
stagedDiff = mRepo.diffTreeToIndex(commit.tree()); /* correct */
diff = mRepo.status(mRepo.index(), nullptr, false);
QVERIFY(stagedDiff.count() == 1);
QVERIFY(diff.count() == 1); // one file changed
stagedPatch = stagedDiff.patch(0);
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path, submodule);
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 2);
hunks[0]->load();
hunks[1]->load();
checkEditorMarkers(hunks.at(0)->editor(), QVector<int>(), QVector<int>(),
QVector<int>({4}), QVector<int>({3}));
checkEditorMarkers(hunks.at(1)->editor(), QVector<int>(), QVector<int>(),
QVector<int>({3}), QVector<int>({}));
}
}
void TestEditorLineInfo::sameContentRemoveLine() {
INIT_REPO("16_LinestagingLineContent.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
checkEditorMarkers(hw.editor(), QVector<int>({3, 4, 5, 12, 13, 21, 22}),
QVector<int>(), QVector<int>({11, 19, 20}),
QVector<int>({10}));
}
void TestEditorLineInfo::sameContentAddLine() {
INIT_REPO("17_LinestagingLineContentStageAddedLine.zip", true)
QVERIFY(stagedDiff.count() > 0);
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
git::Patch stagedPatch = stagedDiff.patch(0);
auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
repoView);
hw.load(stagedPatch, true);
checkEditorMarkers(hw.editor(), QVector<int>({3, 4}), QVector<int>({9}),
QVector<int>({}), QVector<int>({}));
}
#endif
// void TestEditorLineInfo::deleteCompleteContent() {
// INIT_REPO("18_deleteLinesStagedLast.zip", true)
// QVERIFY(stagedDiff.count() > 0);
// QVERIFY(diff.count() > 0);
// git::Patch patch = diff.patch(0);
// git::Patch stagedPatch = stagedDiff.patch(0);
// auto hw = HunkWidget(&diffView, diff, patch, stagedPatch, 0, false, false,
// repoView);
// hw.load(stagedPatch, true);
// checkEditorMarkers(
// hw.editor(), QVector<int>({24}), QVector<int>({}),
// QVector<int>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
// 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22}),
// QVector<int>({23}));
//}
void TestEditorLineInfo::discardCompleteDeletedContent() {
INIT_REPO("19_discardCompleteDeletedContent.zip", true)
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
// no staged lines yet, so no staged patch
QCOMPARE(mRepo.diffTreeToIndex(commit.tree()).count(), 0);
git::Patch stagedPatch = git::Patch();
QString name = patch.name();
QString path_ = mRepo.workdir().filePath(name);
bool submodule = mRepo.lookupSubmodule(name).isValid();
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path_, submodule, repoView);
fw.setStageState(git::Index::StagedState::Unstaged);
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 1);
for (auto *hunk : hunks)
hunk->load();
QCOMPARE(hunks.at(0)->hunk(), QByteArray());
hunks.at(0)->discardSelected(0, 1);
}
// Check that discard was successfull and the application does not crash
QFile f(path + "/File.txt");
QVERIFY(f.open(QIODevice::ReadOnly));
QCOMPARE(f.readAll(), "Content\n");
}
void TestEditorLineInfo::discardCompleteAddedContent() {
INIT_REPO("20_discardCompleteAddedContent.zip", true)
QVERIFY(diff.count() > 0);
git::Patch patch = diff.patch(0);
// no staged lines yet, so no staged patch
QCOMPARE(mRepo.diffTreeToIndex(commit.tree()).count(), 0);
git::Patch stagedPatch = git::Patch();
QString name = patch.name();
QString path_ = mRepo.workdir().filePath(name);
bool submodule = mRepo.lookupSubmodule(name).isValid();
{
FileWidget fw(&diffView, diff, patch, stagedPatch, QModelIndex(), name,
path_, submodule, repoView);
fw.setStageState(git::Index::StagedState::Unstaged);
auto hunks = fw.hunks();
QVERIFY(hunks.count() == 1);
for (auto *hunk : hunks)
hunk->load();
hunks.at(0)->discardSelected(0, 1);
}
// Check that discard was successfull and the application does not crash
QFile f(path + "/Test.txt");
QVERIFY(f.open(QIODevice::ReadOnly));
QCOMPARE(f.readAll(), "");
}
void TestEditorLineInfo::cleanupTestCase() { qWait(closeDelay); }
TEST_MAIN(TestEditorLineInfo)
#include "EditorLineInfos.moc"
Reference in New Issue View Git Blame Copy Permalink