| author | Claus Gittinger <cg@exept.de> |
| Sun, 01 Feb 2015 15:14:41 +0100 | |
| changeset 961 | d7d23e7c5c83 |
| parent 813 | eabdb5055eac |
| child 1032 | 87c1dd3b8e46 |
| child 1121 | c5661215109c |
| permissions | -rw-r--r-- |
| 13 | 1 |
"{ Package: 'stx:goodies/monticello/test' }"
|
2 |
||
3 |
MCTestCase subclass:#MCWorkingCopyTest |
|
4 |
instanceVariableNames:'savedInitials workingCopy repositoryGroup versions versions2' |
|
5 |
classVariableNames:'' |
|
6 |
poolDictionaries:'' |
|
|
813
eabdb5055eac
Tests moved to category SCM-Monticello-Tests
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13
diff
changeset
|
7 |
category:'SCM-Monticello-Tests' |
| 13 | 8 |
! |
9 |
||
10 |
||
11 |
!MCWorkingCopyTest methodsFor:'accessing'! |
|
12 |
||
13 |
description |
|
14 |
^ self class name |
|
15 |
! ! |
|
16 |
||
17 |
!MCWorkingCopyTest methodsFor:'actions'! |
|
18 |
||
19 |
basicMerge: aVersion |
|
20 |
aVersion merge |
|
21 |
! |
|
22 |
||
23 |
load: aVersion |
|
24 |
aVersion load |
|
25 |
! |
|
26 |
||
27 |
merge: aVersion |
|
28 |
[[self basicMerge: aVersion] |
|
29 |
on: MCMergeResolutionRequest do: [:n | n resume: true]] |
|
30 |
on: MCNoChangesException do: [:n | ] |
|
31 |
! |
|
32 |
||
33 |
snapshot |
|
34 |
| version | |
|
35 |
[version _ workingCopy newVersion] |
|
36 |
on: MCVersionNameAndMessageRequest |
|
37 |
do: [:n | n resume: (Array with: n suggestedName with: '')]. |
|
38 |
versions at: version info put: version. |
|
39 |
^ version |
|
40 |
! ! |
|
41 |
||
42 |
!MCWorkingCopyTest methodsFor:'asserting'! |
|
43 |
||
44 |
assertNameWhenSavingTo: aRepository is: aString |
|
45 |
| name | |
|
46 |
name _ nil. |
|
47 |
[aRepository storeVersion: workingCopy newVersion] |
|
48 |
on: MCVersionNameAndMessageRequest |
|
49 |
do: [:n | name _ n suggestedName. n resume: (Array with: name with: '')]. |
|
50 |
self assert: name = aString |
|
51 |
! |
|
52 |
||
53 |
assertNumberWhenSavingTo: aRepository is: aNumber |
|
54 |
| name | |
|
55 |
name _ nil. |
|
56 |
[aRepository storeVersion: workingCopy newVersion] |
|
57 |
on: MCVersionNameAndMessageRequest |
|
58 |
do: [:n | name _ n suggestedName. n resume: (Array with: name with: '')]. |
|
59 |
self assert: name = (self packageName, '-', Utilities authorInitials, '.', aNumber asString) |
|
60 |
! ! |
|
61 |
||
62 |
!MCWorkingCopyTest methodsFor:'private'! |
|
63 |
||
64 |
packageName |
|
65 |
^ self mockPackage name |
|
66 |
! ! |
|
67 |
||
68 |
!MCWorkingCopyTest methodsFor:'running'! |
|
69 |
||
70 |
clearPackageCache |
|
71 |
| dir | |
|
72 |
dir _ MCCacheRepository default directory. |
|
73 |
(dir fileNamesMatching: 'MonticelloMocks*') do: [:ea | dir deleteFileNamed: ea]. |
|
74 |
(dir fileNamesMatching: 'MonticelloTest*') do: [:ea | dir deleteFileNamed: ea]. |
|
75 |
(dir fileNamesMatching: 'rev*') do: [:ea | dir deleteFileNamed: ea]. |
|
76 |
(dir fileNamesMatching: 'foo-*') do: [:ea | dir deleteFileNamed: ea]. |
|
77 |
(dir fileNamesMatching: 'foo2-*') do: [:ea | dir deleteFileNamed: ea]. |
|
78 |
! |
|
79 |
||
80 |
setUp |
|
81 |
| repos1 repos2 | |
|
82 |
self clearPackageCache. |
|
83 |
repositoryGroup _ MCRepositoryGroup new. |
|
84 |
workingCopy _ MCWorkingCopy forPackage: self mockPackage. |
|
85 |
versions _ Dictionary new. |
|
86 |
versions2 _ Dictionary new. |
|
87 |
repos1 _ MCDictionaryRepository new dictionary: versions. |
|
88 |
repos2 _ MCDictionaryRepository new dictionary: versions2. |
|
89 |
repositoryGroup addRepository: repos1. |
|
90 |
repositoryGroup addRepository: repos2. |
|
91 |
MCRepositoryGroup default removeRepository: repos1; removeRepository: repos2. |
|
92 |
workingCopy repositoryGroup: repositoryGroup. |
|
93 |
savedInitials _ Utilities authorInitials. |
|
94 |
Utilities setAuthorInitials: 'abc'. |
|
95 |
! |
|
96 |
||
97 |
tearDown |
|
98 |
workingCopy unregister. |
|
99 |
self restoreMocks. |
|
100 |
self clearPackageCache. |
|
101 |
Utilities setAuthorInitials: savedInitials. |
|
102 |
! ! |
|
103 |
||
104 |
!MCWorkingCopyTest methodsFor:'tests'! |
|
105 |
||
106 |
testAncestorMerge |
|
107 |
| base revA revB revC | |
|
108 |
||
109 |
base _ self snapshot. |
|
110 |
self change: #a toReturn: 'a1'. |
|
111 |
revA _ self snapshot. |
|
112 |
self change: #b toReturn: 'b1'. |
|
113 |
revB _ self snapshot. |
|
114 |
self change: #c toReturn: 'c1'. |
|
115 |
revC _ self snapshot. |
|
116 |
||
117 |
self should: [self basicMerge: revA] raise: MCNoChangesException. |
|
118 |
||
119 |
! |
|
120 |
||
121 |
testBackport |
|
122 |
| inst base final backported | |
|
123 |
inst _ self mockInstanceA. |
|
124 |
base _ self snapshot. |
|
125 |
self assert: inst one = 1. |
|
126 |
self change: #one toReturn: 2. |
|
127 |
self change: #two toReturn: 3. |
|
128 |
final _ self snapshot. |
|
129 |
[workingCopy backportChangesTo: base info] |
|
130 |
on: MCChangeSelectionRequest |
|
131 |
do: [:e | e resume: e patch]. |
|
132 |
self assert: inst one = 2. |
|
133 |
self assert: inst two = 3. |
|
134 |
self assert: workingCopy ancestry ancestors size = 1. |
|
135 |
self assert: workingCopy ancestry ancestors first = base info. |
|
136 |
self assert: workingCopy ancestry stepChildren size = 1. |
|
137 |
self assert: workingCopy ancestry stepChildren first = final info. |
|
138 |
backported _ self snapshot. |
|
139 |
[workingCopy backportChangesTo: base info] |
|
140 |
on: MCChangeSelectionRequest |
|
141 |
do: [:e | e resume: e patch]. |
|
142 |
self assert: workingCopy ancestry ancestors size = 1. |
|
143 |
self assert: workingCopy ancestry ancestors first = base info. |
|
144 |
self assert: workingCopy ancestry stepChildren size = 1. |
|
145 |
self assert: workingCopy ancestry stepChildren first = backported info. |
|
146 |
||
147 |
! |
|
148 |
||
149 |
testDoubleRepeatedMerge |
|
150 |
| base motherA1 motherA2 motherB1 motherB2 inst | |
|
151 |
||
152 |
base _ self snapshot. |
|
153 |
self change: #a toReturn: 'a1'. |
|
154 |
motherA1 _ self snapshot. |
|
155 |
self change: #c toReturn: 'c1'. |
|
156 |
motherA2 _ self snapshot. |
|
157 |
||
158 |
self load: base. |
|
159 |
self change: #b toReturn: 'b1'. |
|
160 |
motherB1 _ self snapshot. |
|
161 |
self change: #d toReturn: 'd1'. |
|
162 |
motherB2 _ self snapshot. |
|
163 |
||
164 |
self load: base. |
|
165 |
self merge: motherA1. |
|
166 |
self merge: motherB1. |
|
167 |
self change: #a toReturn: 'a2'. |
|
168 |
self change: #b toReturn: 'b2'. |
|
169 |
self snapshot. |
|
170 |
||
171 |
self shouldnt: [self merge: motherA2] raise: Error. |
|
172 |
self shouldnt: [self merge: motherB2] raise: Error. |
|
173 |
||
174 |
inst _ self mockInstanceA. |
|
175 |
self assert: inst a = 'a2'. |
|
176 |
self assert: inst b = 'b2'. |
|
177 |
self assert: inst c = 'c1'. |
|
178 |
self assert: inst d = 'd1'. |
|
179 |
||
180 |
! |
|
181 |
||
182 |
testMergeIntoImageWithNoChanges |
|
183 |
| base revB revA1 | |
|
184 |
||
185 |
self change: #a toReturn: 'a'. |
|
186 |
base _ self snapshot. |
|
187 |
self change: #b toReturn: 'b'. |
|
188 |
revB _ self snapshot. |
|
189 |
||
190 |
self load: base. |
|
191 |
self change: #a toReturn: 'a1'. |
|
192 |
revA1 _ self snapshot. |
|
193 |
||
194 |
self change: #a toReturn: 'a'. |
|
195 |
self snapshot. |
|
196 |
self merge: revB. |
|
197 |
||
198 |
self assert: (workingCopy ancestors size = 2) |
|
199 |
||
200 |
! |
|
201 |
||
202 |
testMergeIntoUnmodifiedImage |
|
203 |
| base revA | |
|
204 |
||
205 |
base _ self snapshot. |
|
206 |
self change: #a toReturn: 'a1'. |
|
207 |
revA _ self snapshot. |
|
208 |
||
209 |
self load: base. |
|
210 |
||
211 |
self merge: revA. |
|
212 |
||
213 |
self assert: (workingCopy ancestors size = 1) |
|
214 |
||
215 |
! |
|
216 |
||
217 |
testNaming |
|
218 |
| repos version | |
|
219 |
||
220 |
repos := MCDictionaryRepository new. |
|
221 |
self assertNameWhenSavingTo: repos is: self packageName, '-abc.1'. |
|
222 |
self assertNameWhenSavingTo: repos is: self packageName, '-abc.2'. |
|
223 |
repos := MCDictionaryRepository new. |
|
224 |
self assertNameWhenSavingTo: repos is: self packageName, '-abc.3'. |
|
225 |
version := self snapshot. |
|
226 |
version info instVarNamed: 'name' put: 'foo-jf.32'. |
|
227 |
version load. |
|
228 |
self assertNameWhenSavingTo: repos is: 'foo-abc.33'. |
|
229 |
self assertNameWhenSavingTo: repos is: 'foo-abc.34'. |
|
230 |
version info instVarNamed: 'name' put: 'foo-abc.35'. |
|
231 |
repos storeVersion: version. |
|
232 |
self assertNameWhenSavingTo: repos is: 'foo-abc.36'. |
|
233 |
self assertNameWhenSavingTo: repos is: 'foo-abc.37'. |
|
234 |
version info instVarNamed: 'name' put: 'foo-abc.10'. |
|
235 |
repos storeVersion: version. |
|
236 |
self assertNameWhenSavingTo: repos is: 'foo-abc.38'. |
|
237 |
version info instVarNamed: 'name' put: 'foo2-ab.40'. |
|
238 |
version load. |
|
239 |
self assertNameWhenSavingTo: repos is: 'foo2-abc.41'. |
|
240 |
! |
|
241 |
||
242 |
testOptimizedLoad |
|
243 |
| inst base diffy | |
|
244 |
inst _ self mockInstanceA. |
|
245 |
base _ self snapshot. |
|
246 |
self change: #one toReturn: 2. |
|
247 |
self assert: inst one = 2. |
|
248 |
diffy _ self snapshot asDiffAgainst: base. |
|
249 |
self deny: diffy canOptimizeLoading. |
|
250 |
self load: base. |
|
251 |
self assert: inst one = 1. |
|
252 |
self assert: diffy canOptimizeLoading. |
|
253 |
self load: diffy. |
|
254 |
self assert: inst one = 2. |
|
255 |
! |
|
256 |
||
257 |
testRedundantMerge |
|
258 |
| base | |
|
259 |
base _ self snapshot. |
|
260 |
self merge: base. |
|
261 |
self shouldnt: [self merge: base] raise: Error. |
|
262 |
! |
|
263 |
||
264 |
testRepeatedMerge |
|
265 |
| base mother1 mother2 inst | |
|
266 |
||
267 |
base _ self snapshot. |
|
268 |
self change: #one toReturn: 2. |
|
269 |
mother1 _ self snapshot. |
|
270 |
self change: #two toReturn: 3. |
|
271 |
mother2 _ self snapshot. |
|
272 |
||
273 |
self load: base. |
|
274 |
self change: #truth toReturn: false. |
|
275 |
self snapshot. |
|
276 |
||
277 |
inst _ self mockInstanceA. |
|
278 |
self assert: inst one = 1. |
|
279 |
self assert: inst two = 2. |
|
280 |
||
281 |
self merge: mother1. |
|
282 |
self assert: inst one = 2. |
|
283 |
self assert: inst two = 2. |
|
284 |
||
285 |
self change: #one toReturn: 7. |
|
286 |
self assert: inst one = 7. |
|
287 |
self assert: inst two = 2. |
|
288 |
||
289 |
self shouldnt: [self merge: mother2] raise: Error. |
|
290 |
self assert: inst one = 7. |
|
291 |
self assert: inst two = 3. |
|
292 |
! |
|
293 |
||
294 |
testRepositoryFallback |
|
295 |
| version | |
|
296 |
version _ self snapshot. |
|
297 |
self assert: (repositoryGroup versionWithInfo: version info) == version. |
|
298 |
versions removeKey: version info. |
|
299 |
versions2 at: version info put: version. |
|
300 |
self assert: ( repositoryGroup versionWithInfo: version info) == version. |
|
301 |
versions2 removeKey: version info. |
|
302 |
self should: [repositoryGroup versionWithInfo: version info] raise: Error. |
|
303 |
! |
|
304 |
||
305 |
testSelectiveBackport |
|
306 |
| inst base intermediate final patch selected | |
|
307 |
inst _ self mockInstanceA. |
|
308 |
base _ self snapshot. |
|
309 |
self assert: inst one = 1. |
|
310 |
self change: #one toReturn: 2. |
|
311 |
intermediate _ self snapshot. |
|
312 |
self change: #two toReturn: 3. |
|
313 |
final _ self snapshot. |
|
314 |
[workingCopy backportChangesTo: base info] |
|
315 |
on: MCChangeSelectionRequest |
|
316 |
do: [:e | |
|
317 |
patch _ e patch. |
|
318 |
selected _ patch operations select: [:ea | ea definition selector = #two]. |
|
319 |
e resume: (MCPatch operations: selected)]. |
|
320 |
self assert: inst one = 1. |
|
321 |
self assert: inst two = 3. |
|
322 |
self assert: workingCopy ancestry ancestors size = 1. |
|
323 |
self assert: workingCopy ancestry ancestors first = base info. |
|
324 |
self assert: workingCopy ancestry stepChildren size = 1. |
|
325 |
self assert: workingCopy ancestry stepChildren first = final info |
|
326 |
! |
|
327 |
||
328 |
testSimpleMerge |
|
329 |
| mother base inst | |
|
330 |
inst _ self mockInstanceA. |
|
331 |
base _ self snapshot. |
|
332 |
self change: #one toReturn: 2. |
|
333 |
mother _ self snapshot. |
|
334 |
self load: base. |
|
335 |
self change: #two toReturn: 3. |
|
336 |
self snapshot. |
|
337 |
self assert: inst one = 1. |
|
338 |
self assert: inst two = 3. |
|
339 |
||
340 |
self merge: mother. |
|
341 |
self assert: inst one = 2. |
|
342 |
self assert: inst two = 3. |
|
343 |
! |
|
344 |
||
345 |
testSnapshotAndLoad |
|
346 |
| base inst | |
|
347 |
inst _ self mockInstanceA. |
|
348 |
base _ self snapshot. |
|
349 |
self change: #one toReturn: 2. |
|
350 |
self assert: inst one = 2. |
|
351 |
self load: base. |
|
352 |
self assert: inst one = 1. |
|
353 |
! ! |
|
354 |
||
355 |
!MCWorkingCopyTest class methodsFor:'documentation'! |
|
356 |
||
357 |
version |
|
|
813
eabdb5055eac
Tests moved to category SCM-Monticello-Tests
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13
diff
changeset
|
358 |
^ '$Header: /cvs/stx/stx/goodies/monticello/test/MCWorkingCopyTest.st,v 1.2 2013-05-29 00:01:14 vrany Exp $' |
| 13 | 359 |
! ! |
|
813
eabdb5055eac
Tests moved to category SCM-Monticello-Tests
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13
diff
changeset
|
360 |