1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
/*
SPDX-FileCopyrightText: 2017 Friedrich W. H. Kossebau <kossebau@kde.org>
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "test_vcsdiff.h"
#include <QTest>
#include <QStandardPaths>
#include <vcs/vcslocation.h>
using namespace KDevelop;
void TestVcsDiff::initTestCase()
{
QStandardPaths::setTestModeEnabled(true);
QString path = QFINDTESTDATA("sample.diff");
QFile in(path);
QCOMPARE(in.open(QIODevice::ReadOnly), true);
sampleDiff = QString::fromUtf8(in.readAll());
QCOMPARE(sampleDiff.length(), 6235);
}
void TestVcsDiff::setDiff(VcsDiff& diff,
const QString& diffString,
const QUrl& baseDiff,
uint depth)
{
diff.setDiff(diffString);
diff.setBaseDiff(baseDiff);
diff.setDepth(depth);
}
void TestVcsDiff::compareDiff(const VcsDiff& diff,
const QString& diffString,
const QUrl& baseDiff,
uint depth)
{
QCOMPARE(diff.diff(), diffString);
QCOMPARE(diff.baseDiff(), baseDiff);
QCOMPARE(diff.depth(), depth);
}
void TestVcsDiff::testFileNames()
{
VcsDiff diff;
diff.setDiff(sampleDiff);
const QVector<VcsDiff::FilePair> expected = {
{"kdevplatform/vcs/vcsdiff.cpp", "kdevplatform/vcs/vcsdiff.cpp"},
{"kdevplatform/vcs/vcsdiff.h", "kdevplatform/vcs/vcsdiff.h"}
};
QCOMPARE(diff.fileNames(), expected);
}
void TestVcsDiff::testSubDiff()
{
/**************************
* Test a real world diff *
**************************/
VcsDiff diff;
diff.setDiff(sampleDiff);
QString expected(R"diff(--- a/kdevplatform/vcs/vcsdiff.cpp
+++ b/kdevplatform/vcs/vcsdiff.cpp
@@ -39,7 +39,7 @@ public:
, oldCount
, newStart
, newCount
- , firstLineIdx
+ , firstLineIdx /**< The 0-based line number (in the whole diff) of the hunk header line (the one starting with `@@`) */
;
QString srcFile /**< The source filename */
, tgtFile /**< The target filename */
)diff");
const auto subHunkDiffs = {
diff.subDiffHunk(15),
};
for(auto df: subHunkDiffs) {
QVERIFY(df.fileNames().count()>0);
QCOMPARE(df.fileNames().front().source, "kdevplatform/vcs/vcsdiff.cpp");
QCOMPARE(df.diff(), expected);
}
VcsDiff subHunkDiff = diff.subDiff(15, 50);
QVERIFY(subHunkDiff.fileNames().count()>0);
QCOMPARE(subHunkDiff.fileNames().front().source, "kdevplatform/vcs/vcsdiff.cpp");
/*********************************
* Test start offset computation *
*********************************/
VcsDiff skipDiff;
skipDiff.setDiff(R"diff(--- a/skip
+++ b/skip
@@ -1,2 +3,2 @@ heading
+ increase offset
+ dont increase offset
- deletion
- second deletion
)diff");
expected = QStringLiteral(R"diff(--- a/skip
+++ b/skip
@@ -2,3 +4,2 @@ heading
- deletion
second deletion
)diff");
auto subDiff = skipDiff.subDiff(6,6);
QCOMPARE(subDiff.diff(), expected);
}
void TestVcsDiff::testConflicts()
{
VcsDiff conflictDiff;
conflictDiff.setDiff(R"diff(--- a/skip
+++ b/skip
@@ -1,2 +3,2 @@ conflict
+ increase offset 3 2
4 0 3
+ dont increase offset 5 4
- deletion 6 1
<<<<<<< HEAD 7
blablabla 8 2
======= 9
yadayadayada 10 5
>>>>>>> commit 11
- second deletion 12 3
)diff");
QCOMPARE(conflictDiff.diffLineToSource(8).line, 2);
QCOMPARE(conflictDiff.diffLineToTarget(10).line, 5);
QCOMPARE(conflictDiff.diffLineToSource(7).line, -1);
QCOMPARE(conflictDiff.diffLineToSource(9).line, -1);
QCOMPARE(conflictDiff.diffLineToSource(11).line, -1);
}
void TestVcsDiff::testLineMapping()
{
VcsDiff diff;
diff.setDiff(sampleDiff);
auto src = QStringLiteral("kdevplatform/vcs/vcsdiff.cpp");
auto tgt = QStringLiteral("kdevplatform/vcs/vcsdiff.h");
QCOMPARE(diff.diffLineToSource(15-1).path, src);
QCOMPARE(diff.diffLineToTarget(147-1).path, tgt);
// We have no way to map the headings
QCOMPARE(diff.diffLineToSource(169-1).line, -1);
QCOMPARE(diff.diffLineToTarget(169-1).line, -1);
QCOMPARE(diff.diffLineToSource(15-1).line, 42-1);
QCOMPARE(diff.diffLineToTarget(15-1).line, -1);
QCOMPARE(diff.diffLineToTarget(147-1).line, 180-1);
QCOMPARE(diff.diffLineToSource(147-1).line, 150-1);
}
void TestVcsDiff::testCopyConstructor()
{
// test plain copy
const QString diffString("diff");
const QUrl baseDiff("git://1");
const uint depth = 1;
const VcsLocation location("server");
{
VcsDiff diffA;
setDiff(diffA,
diffString, baseDiff, depth);
VcsDiff diffB(diffA);
compareDiff(diffA,
diffString, baseDiff, depth);
compareDiff(diffB,
diffString, baseDiff, depth);
}
const QString diffStringNew("diffNew");
// test detach after changing A
{
VcsDiff diffA;
setDiff(diffA,
diffString, baseDiff, depth);
VcsDiff diffB(diffA);
// change a property of A
diffA.setDiff(diffStringNew);
compareDiff(diffA,
diffStringNew, baseDiff, depth);
compareDiff(diffB,
diffString, baseDiff, depth);
}
}
void TestVcsDiff::testAssignOperator()
{
// test plain copy
const QString diffString("diff");
const QUrl baseDiff("git://1");
const uint depth = 1;
const VcsLocation location("server");
{
VcsDiff diffA;
setDiff(diffA,
diffString, baseDiff, depth);
VcsDiff diffB;
diffB = diffA;
compareDiff(diffA,
diffString, baseDiff, depth);
compareDiff(diffB,
diffString, baseDiff, depth);
}
const QString diffStringNew("diffNew");
// test detach after changing A
{
VcsDiff diffA;
setDiff(diffA,
diffString, baseDiff, depth);
VcsDiff diffB;
diffB = diffA;
// change a property of A
diffA.setDiff(diffStringNew);
compareDiff(diffA,
diffStringNew, baseDiff, depth);
compareDiff(diffB,
diffString, baseDiff, depth);
}
}
QTEST_GUILESS_MAIN(TestVcsDiff)
|
