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
|
// Copyright (C) 2002 Graydon Hoare <graydon@pobox.com>
// 2008 Stephen Leake <stephen_leake@stephe-leake.org>
//
// This program is made available under the GNU GPL version 2.0 or
// greater. See the accompanying file COPYING for details.
//
// This program is distributed WITHOUT ANY WARRANTY; without even the
// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE.
#include "../../../src/base.hh"
#include "../unit_tests.hh"
#include "../../../src/merge_content.hh"
#include "../../../src/lexical_cast.hh"
#include "../../../src/paths.hh"
#include "../randomfile.hh"
#include "../../../src/simplestring_xform.hh"
#include <iostream>
using std::cerr;
using std::cout;
using std::stringstream;
using std::string;
using std::vector;
using boost::lexical_cast;
static void dump_incorrect_merge(vector<string> const & expected,
vector<string> const & got,
string const & prefix)
{
size_t mx = expected.size();
if (mx < got.size())
mx = got.size();
for (size_t i = 0; i < mx; ++i)
{
cerr << "bad merge: " << i << " [" << prefix << "]\t";
if (i < expected.size())
cerr << '[' << expected[i] << "]\t";
else
cerr << "[--nil--]\t";
if (i < got.size())
cerr << '[' << got[i] << "]\t";
else
cerr << "[--nil--]\t";
cerr << '\n';
}
}
// high tech randomizing test
UNIT_TEST(randomizing_merge)
{
randomizer rng;
for (int i = 0; i < 30; ++i)
{
vector<string> anc, d1, d2, m1, m2, gm;
file_randomizer::build_random_fork(anc, d1, d2, gm, (10 + 2 * i), rng);
UNIT_TEST_CHECK(merge3(anc, d1, d2, m1));
if (gm != m1)
dump_incorrect_merge (gm, m1, "random_merge 1");
UNIT_TEST_CHECK(gm == m1);
UNIT_TEST_CHECK(merge3(anc, d2, d1, m2));
if (gm != m2)
dump_incorrect_merge (gm, m2, "random_merge 2");
UNIT_TEST_CHECK(gm == m2);
}
}
// old boring tests
UNIT_TEST(merge_prepend)
{
UNIT_TEST_CHECKPOINT("prepend test");
vector<string> anc, d1, d2, m1, m2, gm;
for (int i = 10; i < 20; ++i)
{
d2.push_back(lexical_cast<string>(i));
gm.push_back(lexical_cast<string>(i));
}
for (int i = 0; i < 10; ++i)
{
anc.push_back(lexical_cast<string>(i));
d1.push_back(lexical_cast<string>(i));
d2.push_back(lexical_cast<string>(i));
gm.push_back(lexical_cast<string>(i));
}
UNIT_TEST_CHECK(merge3(anc, d1, d2, m1));
if (gm != m1)
dump_incorrect_merge (gm, m1, "merge_prepend 1");
UNIT_TEST_CHECK(gm == m1);
UNIT_TEST_CHECK(merge3(anc, d2, d1, m2));
if (gm != m2)
dump_incorrect_merge (gm, m2, "merge_prepend 2");
UNIT_TEST_CHECK(gm == m2);
}
UNIT_TEST(merge_append)
{
UNIT_TEST_CHECKPOINT("append test");
vector<string> anc, d1, d2, m1, m2, gm;
for (int i = 0; i < 10; ++i)
anc.push_back(lexical_cast<string>(i));
d1 = anc;
d2 = anc;
gm = anc;
for (int i = 10; i < 20; ++i)
{
d2.push_back(lexical_cast<string>(i));
gm.push_back(lexical_cast<string>(i));
}
UNIT_TEST_CHECK(merge3(anc, d1, d2, m1));
if (gm != m1)
dump_incorrect_merge (gm, m1, "merge_append 1");
UNIT_TEST_CHECK(gm == m1);
UNIT_TEST_CHECK(merge3(anc, d2, d1, m2));
if (gm != m2)
dump_incorrect_merge (gm, m2, "merge_append 2");
UNIT_TEST_CHECK(gm == m2);
}
UNIT_TEST(merge_additions)
{
UNIT_TEST_CHECKPOINT("additions test");
string ancestor("I like oatmeal\nI like orange juice\nI like toast");
string desc1("I like oatmeal\nI don't like spam\nI like orange juice\nI like toast");
string confl("I like oatmeal\nI don't like tuna\nI like orange juice\nI like toast");
string desc2("I like oatmeal\nI like orange juice\nI don't like tuna\nI like toast");
string good_merge("I like oatmeal\nI don't like spam\nI like orange juice\nI don't like tuna\nI like toast");
vector<string> anc, d1, cf, d2, m1, m2, gm;
split_into_lines(ancestor, anc);
split_into_lines(desc1, d1);
split_into_lines(confl, cf);
split_into_lines(desc2, d2);
split_into_lines(good_merge, gm);
UNIT_TEST_CHECK(merge3(anc, d1, d2, m1));
if (gm != m1)
dump_incorrect_merge (gm, m1, "merge_addition 1");
UNIT_TEST_CHECK(gm == m1);
UNIT_TEST_CHECK(merge3(anc, d2, d1, m2));
if (gm != m2)
dump_incorrect_merge (gm, m2, "merge_addition 2");
UNIT_TEST_CHECK(gm == m2);
UNIT_TEST_CHECK(!merge3(anc, d1, cf, m1));
}
UNIT_TEST(merge_deletions)
{
string ancestor("I like oatmeal\nI like orange juice\nI like toast");
string desc2("I like oatmeal\nI like toast");
vector<string> anc, d1, d2, m1, m2, gm;
split_into_lines(ancestor, anc);
split_into_lines(desc2, d2);
d1 = anc;
gm = d2;
UNIT_TEST_CHECK(merge3(anc, d1, d2, m1));
if (gm != m1)
dump_incorrect_merge (gm, m1, "merge_deletion 1");
UNIT_TEST_CHECK(gm == m1);
UNIT_TEST_CHECK(merge3(anc, d2, d1, m2));
if (gm != m2)
dump_incorrect_merge (gm, m2, "merge_deletion 2");
UNIT_TEST_CHECK(gm == m2);
}
// Local Variables:
// mode: C++
// fill-column: 76
// c-file-style: "gnu"
// indent-tabs-mode: nil
// End:
// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
|
