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
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
|
use strict;
use Wiki::Toolkit::TestLib;
use Test::More;
use VCS::Lite;
my $newlite = (VCS::Lite->VERSION >= 0.08);
my $iterator = Wiki::Toolkit::TestLib->new_wiki_maker;
plan tests => ( 1 + $iterator->number * 18 );
use_ok( "Wiki::Toolkit::Plugin::Diff" );
while ( my $wiki = $iterator->new_wiki ) {
print "#\n##### TEST CONFIG: Store: " . (ref $wiki->store) . "\n";
# Add test data
$wiki->write_node( "Jerusalem Tavern",
"Pub in Clerkenwell with St Peter's beer.",
undef,
{ category => [ "Pubs" ]
}
);
my %j1 = $wiki->retrieve_node( "Jerusalem Tavern");
$wiki->write_node( "Jerusalem Tavern",
"Tiny pub in Clerkenwell with St Peter's beer.
Near Farringdon station",
$j1{checksum},
{ category => [ "Pubs" ]
}
);
my %j2 = $wiki->retrieve_node( "Jerusalem Tavern");
$wiki->write_node( "Jerusalem Tavern",
"Tiny pub in Clerkenwell with St Peter's beer.
Near Farringdon station",
$j2{checksum},
{ category => [ "Pubs", "Real Ale" ],
locale => [ "Farringdon" ]
}
);
my %j3 = $wiki->retrieve_node( "Jerusalem Tavern");
$wiki->write_node( "Jerusalem Tavern",
"Tiny pub in Clerkenwell with St Peter's beer but no food.
Near Farringdon station",
$j3{checksum},
{ category => [ "Pubs", "Real Ale" ],
locale => [ "Farringdon" ]
}
);
$wiki->write_node( "IvorW",
"
In real life: Ivor Williams
Ideas & things to work on:
* Threaded discussion wiki
* Generify diff
* SuperSearch for Wiki::Toolkit
* Authentication module
* Autoindex generation
",
undef,
{ username => 'Foo',
metatest => 'Moo' },
);
my %i1 = $wiki->retrieve_node( "IvorW");
$wiki->write_node( "IvorW",
$i1{content}."
[[IvorW's Test Page]]\n",
$i1{checksum},
{ username => 'Bar',
metatest => 'Boo' },
);
my %i2 = $wiki->retrieve_node( "IvorW");
$wiki->write_node( "IvorW",
$i2{content}."
[[Another Test Page]]\n",
$i2{checksum},
{ username => 'Bar',
metatest => 'Quack' },
);
my %i3 = $wiki->retrieve_node( "IvorW");
my $newcont = $i3{content};
$newcont =~ s/\n/ \n/s;
$wiki->write_node( "IvorW",
$newcont,
$i3{checksum},
{ username => 'Bar',
metatest => 'Quack' },
);
$wiki->write_node( "Test",
"a",
undef,
{ },
);
%i3 = $wiki->retrieve_node( "Test");
$wiki->write_node( "Test",
"a\n",
$i3{checksum},
{ },
);
pass "backend primed with test data";
# Real tests
my $differ = eval { Wiki::Toolkit::Plugin::Diff->new; };
is( $@, "", "'new' doesn't croak" );
isa_ok( $differ, "Wiki::Toolkit::Plugin::Diff" );
$wiki->register_plugin( plugin => $differ );
# Test ->null diff
my %nulldiff = $differ->differences(
node => "Jerusalem Tavern",
left_version => 1,
right_version => 1);
ok( !exists($nulldiff{diff}), "Diffing the same version returns empty diff");
# Test ->body diff
my %bodydiff = $differ->differences(
node => "Jerusalem Tavern",
left_version => 1,
right_version => 2);
is( @{$bodydiff{diff}}, 2, "Differ returns 2 elements for body diff");
is_deeply( $bodydiff{diff}[0], {
left => "== Line 0 ==\n",
right => "== Line 1 ==\n"},
"First element is line number on right");
is_deeply( $bodydiff{diff}[1], $newlite ? {
left => '<span class="diff1">Pub </span>'.
'in Clerkenwell with St Peter\'s beer.'.
"<br />",
right => '<span class="diff2">Tiny pub </span>'.
'in Clerkenwell with St Peter\'s beer.'.
'<span class="diff2"><br />'.
"\nNear Farringdon station</span>".
"<br />",
} : {
left => '<span class="diff1">Pub </span>'.
'in Clerkenwell with St Peter\'s beer.'.
"<br />\n",
right => '<span class="diff2">Tiny pub </span>'.
'in Clerkenwell with St Peter\'s beer.'.
'<span class="diff2"><br />'.
"\nNear Farringdon station</span>".
"<br />\n",
},
"Differences highlights body diff with span tags");
# Test ->meta diff
my %metadiff = $differ->differences(
node => "Jerusalem Tavern",
left_version => 2,
right_version => 3);
is( @{$metadiff{diff}}, 2, "Differ returns 2 elements for meta diff");
is_deeply( $metadiff{diff}[0], {
left => "== Line 2 ==\n",
right => "== Line 2 ==\n"},
"First element is line number on right");
is_deeply( $metadiff{diff}[1], $newlite ? {
left => "\ncategory='Pubs'\nlocale='Farringdon'",
right => "\ncategory='Pubs'\n".
'<span class="diff2">category=\'Pubs,Real Ale\'<br />'.
"\n</span>locale='Farringdon'",
} : {
left => "category='Pubs'",
right => "category='Pubs".
'<span class="diff2">,Real Ale\'<br />'.
"\nlocale='Farringdon</span>'",
},
"Differences highlights metadata diff with span tags");
# Another body diff with bracketed content
%bodydiff = $differ->differences(
node => 'IvorW',
left_version => 1,
right_version => 2);
is_deeply( $bodydiff{diff}[0], {
left => "== Line 11 ==\n",
right => "== Line 11 ==\n"},
"Diff finds the right line number on right");
is_deeply( $bodydiff{diff}[1], $newlite ? {
left => "\nmetatest='Moo'\nmetatest='Boo'",
right => "\nmetatest='Moo'\n".
'<span class="diff2">'.
"[[IvorW's Test Page]]<br />\n".
"<br />\n</span>".
"metatest='Boo'"
} : {
left => "metatest='".
'<span class="diff1">Moo</span>\'',
right => '<span class="diff2">'.
"[[IvorW's Test Page]]<br />\n".
"<br />\n</span>".
"metatest='".
'<span class="diff2">Boo</span>\'',
},
"Diff scans words correctly");
# And now a check for framing
%bodydiff = $differ->differences(
node => 'IvorW',
left_version => 2,
right_version => 3);
is_deeply( $bodydiff{diff}[0], {
left => "== Line 13 ==\n",
right => "== Line 13 ==\n"},
"Diff finds the right line number on right");
is_deeply( $bodydiff{diff}[1], $newlite ? {
left => "\nmetatest='Boo'\nmetatest='Quack'",
right => "\nmetatest='Boo'\n".
'<span class="diff2">'.
"[[Another Test Page]]<br />\n".
"<br />\n</span>".
"metatest='Quack'",
} : {
left => "metatest='".
'<span class="diff1">Boo</span>\'',
right => '<span class="diff2">'.
"[[Another Test Page]]<br />\n".
"<br />\n</span>".
"metatest='".
'<span class="diff2">Quack</span>\'',
},
"Diff frames correctly");
# Trailing whitespace test 1
%bodydiff = $differ->differences(
node => 'IvorW',
left_version => 3,
right_version => 4);
ok(!exists($bodydiff{diff}), 'No change found for trailing whitespace');
# Trailing whitespace test 2
%bodydiff = $differ->differences(
node => 'Jerusalem Tavern',
left_version => 3,
right_version => 4);
is_deeply( $bodydiff{diff}[0], {
left => "== Line 0 ==\n",
right => "== Line 0 ==\n" },
"Diff finds the right line numbers");
is_deeply( $bodydiff{diff}[1], $newlite ? {
left => "Tiny pub in Clerkenwell with St Peter's beer".
".<br />",
right => "Tiny pub in Clerkenwell with St Peter's beer".
' <span class="diff2">but no food</span>.'.
"<br />",
} : {
left => "Tiny pub in Clerkenwell with St Peter's beer".
".<br />\n",
right => "Tiny pub in Clerkenwell with St Peter's beer".
' <span class="diff2">but no food</span>.'.
"<br />\n",
},
"Diff handles trailing whitespace correctly");
eval {
$differ->differences(
node => 'Test',
left_version => 1,
right_version => 2 ) };
is( $@, "", "differences doesn't die when only difference is a newline");
}
|
