|
324
|
1 |
"{ Package: 'stx:goodies/monticello' }"
|
|
|
2 |
|
|
|
3 |
MCTestCase subclass:#MCWorkingCopyTest
|
|
|
4 |
instanceVariableNames:'savedInitials workingCopy repositoryGroup versions versions2'
|
|
|
5 |
classVariableNames:''
|
|
|
6 |
poolDictionaries:''
|
|
|
7 |
category:'Monticello-Tests'
|
|
|
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, '-', Author initials, '.', 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 |
repositoryGroup disableCache.
|
|
|
85 |
workingCopy := MCWorkingCopy forPackage: self mockPackage.
|
|
|
86 |
versions := Dictionary new.
|
|
|
87 |
versions2 := Dictionary new.
|
|
|
88 |
repos1 := MCDictionaryRepository new dictionary: versions.
|
|
|
89 |
repos2 := MCDictionaryRepository new dictionary: versions2.
|
|
|
90 |
repositoryGroup addRepository: repos1.
|
|
|
91 |
repositoryGroup addRepository: repos2.
|
|
|
92 |
MCRepositoryGroup default removeRepository: repos1; removeRepository: repos2.
|
|
|
93 |
workingCopy repositoryGroup: repositoryGroup.
|
|
|
94 |
savedInitials := Author initials.
|
|
|
95 |
Author initials: 'abc'.
|
|
|
96 |
|
|
|
97 |
"Modified: / 13-09-2010 / 12:00:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
98 |
!
|
|
|
99 |
|
|
|
100 |
tearDown
|
|
|
101 |
workingCopy unregister.
|
|
|
102 |
self restoreMocks.
|
|
|
103 |
self clearPackageCache.
|
|
|
104 |
Author initials: savedInitials.
|
|
|
105 |
! !
|
|
|
106 |
|
|
|
107 |
!MCWorkingCopyTest methodsFor:'tests'!
|
|
|
108 |
|
|
|
109 |
testAncestorMerge
|
|
|
110 |
| base revA revB revC |
|
|
|
111 |
|
|
|
112 |
base := self snapshot.
|
|
|
113 |
self change: #a toReturn: 'a1'.
|
|
|
114 |
revA := self snapshot.
|
|
|
115 |
self change: #b toReturn: 'b1'.
|
|
|
116 |
revB := self snapshot.
|
|
|
117 |
self change: #c toReturn: 'c1'.
|
|
|
118 |
revC := self snapshot.
|
|
|
119 |
|
|
|
120 |
self should: [self basicMerge: revA] raise: MCNoChangesException.
|
|
|
121 |
|
|
|
122 |
"Modified: / 13-09-2010 / 12:18:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
123 |
!
|
|
|
124 |
|
|
|
125 |
testBackport
|
|
|
126 |
| inst base final backported |
|
|
|
127 |
inst := self mockInstanceA.
|
|
|
128 |
base := self snapshot.
|
|
|
129 |
self assert: inst one = 1.
|
|
|
130 |
self change: #one toReturn: 2.
|
|
|
131 |
self change: #two toReturn: 3.
|
|
|
132 |
final := self snapshot.
|
|
|
133 |
[workingCopy backportChangesTo: base info]
|
|
|
134 |
on: MCChangeSelectionRequest
|
|
|
135 |
do: [:e | e resume: e patch].
|
|
|
136 |
self assert: inst one = 2.
|
|
|
137 |
self assert: inst two = 3.
|
|
|
138 |
self assert: workingCopy ancestry ancestors size = 1.
|
|
|
139 |
self assert: workingCopy ancestry ancestors first = base info.
|
|
|
140 |
self assert: workingCopy ancestry stepChildren size = 1.
|
|
|
141 |
self assert: workingCopy ancestry stepChildren first = final info.
|
|
|
142 |
backported := self snapshot.
|
|
|
143 |
[workingCopy backportChangesTo: base info]
|
|
|
144 |
on: MCChangeSelectionRequest
|
|
|
145 |
do: [:e | e resume: e patch].
|
|
|
146 |
self assert: workingCopy ancestry ancestors size = 1.
|
|
|
147 |
self assert: workingCopy ancestry ancestors first = base info.
|
|
|
148 |
self assert: workingCopy ancestry stepChildren size = 1.
|
|
|
149 |
self assert: workingCopy ancestry stepChildren first = backported info.
|
|
|
150 |
|
|
|
151 |
!
|
|
|
152 |
|
|
|
153 |
testDoubleRepeatedMerge
|
|
|
154 |
| base motherA1 motherA2 motherB1 motherB2 inst |
|
|
|
155 |
|
|
|
156 |
base := self snapshot.
|
|
|
157 |
self change: #a toReturn: 'a1'.
|
|
|
158 |
motherA1 := self snapshot.
|
|
|
159 |
self change: #c toReturn: 'c1'.
|
|
|
160 |
motherA2 := self snapshot.
|
|
|
161 |
|
|
|
162 |
self load: base.
|
|
|
163 |
self change: #b toReturn: 'b1'.
|
|
|
164 |
motherB1 := self snapshot.
|
|
|
165 |
self change: #d toReturn: 'd1'.
|
|
|
166 |
motherB2 := self snapshot.
|
|
|
167 |
|
|
|
168 |
self load: base.
|
|
|
169 |
self merge: motherA1.
|
|
|
170 |
self merge: motherB1.
|
|
|
171 |
self change: #a toReturn: 'a2'.
|
|
|
172 |
self change: #b toReturn: 'b2'.
|
|
|
173 |
self snapshot.
|
|
|
174 |
|
|
|
175 |
self shouldnt: [self merge: motherA2] raise: Error.
|
|
|
176 |
self shouldnt: [self merge: motherB2] raise: Error.
|
|
|
177 |
|
|
|
178 |
inst := self mockInstanceA.
|
|
|
179 |
self assert: inst a = 'a2'.
|
|
|
180 |
self assert: inst b = 'b2'.
|
|
|
181 |
self assert: inst c = 'c1'.
|
|
|
182 |
self assert: inst d = 'd1'.
|
|
|
183 |
|
|
|
184 |
!
|
|
|
185 |
|
|
|
186 |
testMergeIntoImageWithNoChanges
|
|
|
187 |
| base revB revA1 |
|
|
|
188 |
|
|
|
189 |
self change: #a toReturn: 'a'.
|
|
|
190 |
base := self snapshot.
|
|
|
191 |
self change: #b toReturn: 'b'.
|
|
|
192 |
revB := self snapshot.
|
|
|
193 |
|
|
|
194 |
self load: base.
|
|
|
195 |
self change: #a toReturn: 'a1'.
|
|
|
196 |
revA1 := self snapshot.
|
|
|
197 |
|
|
|
198 |
self change: #a toReturn: 'a'.
|
|
|
199 |
self snapshot.
|
|
|
200 |
self merge: revB.
|
|
|
201 |
|
|
|
202 |
self assert: (workingCopy ancestors size = 2)
|
|
|
203 |
|
|
|
204 |
!
|
|
|
205 |
|
|
|
206 |
testMergeIntoUnmodifiedImage
|
|
|
207 |
| base revA |
|
|
|
208 |
|
|
|
209 |
base := self snapshot.
|
|
|
210 |
self change: #a toReturn: 'a1'.
|
|
|
211 |
revA := self snapshot.
|
|
|
212 |
|
|
|
213 |
self load: base.
|
|
|
214 |
|
|
|
215 |
self merge: revA.
|
|
|
216 |
|
|
|
217 |
self assert: (workingCopy ancestors size = 1)
|
|
|
218 |
|
|
|
219 |
!
|
|
|
220 |
|
|
|
221 |
testNaming
|
|
|
222 |
| repos version |
|
|
|
223 |
|
|
|
224 |
repos := MCDictionaryRepository new.
|
|
|
225 |
self assertNameWhenSavingTo: repos is: self packageName, '-abc.1'.
|
|
|
226 |
self assertNameWhenSavingTo: repos is: self packageName, '-abc.2'.
|
|
|
227 |
repos := MCDictionaryRepository new.
|
|
|
228 |
self assertNameWhenSavingTo: repos is: self packageName, '-abc.3'.
|
|
|
229 |
version := self snapshot.
|
|
|
230 |
version info instVarNamed: 'name' put: 'foo-jf.32'.
|
|
|
231 |
version load.
|
|
|
232 |
self assertNameWhenSavingTo: repos is: 'foo-abc.33'.
|
|
|
233 |
self assertNameWhenSavingTo: repos is: 'foo-abc.34'.
|
|
|
234 |
version info instVarNamed: 'name' put: 'foo-abc.35'.
|
|
|
235 |
repos storeVersion: version.
|
|
|
236 |
self assertNameWhenSavingTo: repos is: 'foo-abc.36'.
|
|
|
237 |
self assertNameWhenSavingTo: repos is: 'foo-abc.37'.
|
|
|
238 |
version info instVarNamed: 'name' put: 'foo-abc.10'.
|
|
|
239 |
repos storeVersion: version.
|
|
|
240 |
self assertNameWhenSavingTo: repos is: 'foo-abc.38'.
|
|
|
241 |
version info instVarNamed: 'name' put: 'foo2-ab.40'.
|
|
|
242 |
version load.
|
|
|
243 |
self assertNameWhenSavingTo: repos is: 'foo2-abc.41'.
|
|
|
244 |
!
|
|
|
245 |
|
|
|
246 |
testOptimizedLoad
|
|
|
247 |
| inst base diffy |
|
|
|
248 |
inst := self mockInstanceA.
|
|
|
249 |
base := self snapshot.
|
|
|
250 |
self change: #one toReturn: 2.
|
|
|
251 |
self assert: inst one = 2.
|
|
|
252 |
diffy := self snapshot asDiffAgainst: base.
|
|
|
253 |
self deny: diffy canOptimizeLoading.
|
|
|
254 |
self load: base.
|
|
|
255 |
self assert: inst one = 1.
|
|
|
256 |
self assert: diffy canOptimizeLoading.
|
|
|
257 |
self load: diffy.
|
|
|
258 |
self assert: inst one = 2.
|
|
|
259 |
|
|
|
260 |
!
|
|
|
261 |
|
|
|
262 |
testRedundantMerge
|
|
|
263 |
| base |
|
|
|
264 |
base := self snapshot.
|
|
|
265 |
self merge: base.
|
|
|
266 |
self shouldnt: [self merge: base] raise: Error.
|
|
|
267 |
!
|
|
|
268 |
|
|
|
269 |
testRepeatedMerge
|
|
|
270 |
| base mother1 mother2 inst |
|
|
|
271 |
|
|
|
272 |
base := self snapshot.
|
|
|
273 |
self change: #one toReturn: 2.
|
|
|
274 |
mother1 := self snapshot.
|
|
|
275 |
self change: #two toReturn: 3.
|
|
|
276 |
mother2 := self snapshot.
|
|
|
277 |
|
|
|
278 |
self load: base.
|
|
|
279 |
self change: #truth toReturn: false.
|
|
|
280 |
self snapshot.
|
|
|
281 |
|
|
|
282 |
inst := self mockInstanceA.
|
|
|
283 |
self assert: inst one = 1.
|
|
|
284 |
self assert: inst two = 2.
|
|
|
285 |
|
|
|
286 |
self merge: mother1.
|
|
|
287 |
self assert: inst one = 2.
|
|
|
288 |
self assert: inst two = 2.
|
|
|
289 |
|
|
|
290 |
self change: #one toReturn: 7.
|
|
|
291 |
self assert: inst one = 7.
|
|
|
292 |
self assert: inst two = 2.
|
|
|
293 |
|
|
|
294 |
self shouldnt: [self merge: mother2] raise: Error.
|
|
|
295 |
self assert: inst one = 7.
|
|
|
296 |
self assert: inst two = 3.
|
|
|
297 |
!
|
|
|
298 |
|
|
|
299 |
testRepositoryFallback
|
|
|
300 |
| version |
|
|
|
301 |
version := self snapshot.
|
|
|
302 |
self assert: (repositoryGroup versionWithInfo: version info) == version.
|
|
|
303 |
versions removeKey: version info.
|
|
|
304 |
versions2 at: version info put: version.
|
|
|
305 |
self assert: ( repositoryGroup versionWithInfo: version info) == version.
|
|
|
306 |
versions2 removeKey: version info.
|
|
|
307 |
self should: [repositoryGroup versionWithInfo: version info] raise: Error.
|
|
|
308 |
!
|
|
|
309 |
|
|
|
310 |
testSelectiveBackport
|
|
|
311 |
| inst base intermediate final patch selected |
|
|
|
312 |
inst := self mockInstanceA.
|
|
|
313 |
base := self snapshot.
|
|
|
314 |
self assert: inst one = 1.
|
|
|
315 |
self change: #one toReturn: 2.
|
|
|
316 |
intermediate := self snapshot.
|
|
|
317 |
self change: #two toReturn: 3.
|
|
|
318 |
final := self snapshot.
|
|
|
319 |
[workingCopy backportChangesTo: base info]
|
|
|
320 |
on: MCChangeSelectionRequest
|
|
|
321 |
do: [:e |
|
|
|
322 |
patch := e patch.
|
|
|
323 |
selected := patch operations select: [:ea | ea definition selector = #two].
|
|
|
324 |
e resume: (MCPatch operations: selected)].
|
|
|
325 |
self assert: inst one = 1.
|
|
|
326 |
self assert: inst two = 3.
|
|
|
327 |
self assert: workingCopy ancestry ancestors size = 1.
|
|
|
328 |
self assert: workingCopy ancestry ancestors first = base info.
|
|
|
329 |
self assert: workingCopy ancestry stepChildren size = 1.
|
|
|
330 |
self assert: workingCopy ancestry stepChildren first = final info
|
|
|
331 |
!
|
|
|
332 |
|
|
|
333 |
testSimpleMerge
|
|
|
334 |
| mother base inst |
|
|
|
335 |
inst := self mockInstanceA.
|
|
|
336 |
base := self snapshot.
|
|
|
337 |
self change: #one toReturn: 2.
|
|
|
338 |
mother := self snapshot.
|
|
|
339 |
self load: base.
|
|
|
340 |
self change: #two toReturn: 3.
|
|
|
341 |
self snapshot.
|
|
|
342 |
self assert: inst one = 1.
|
|
|
343 |
self assert: inst two = 3.
|
|
|
344 |
|
|
|
345 |
self merge: mother.
|
|
|
346 |
self assert: inst one = 2.
|
|
|
347 |
self assert: inst two = 3.
|
|
|
348 |
!
|
|
|
349 |
|
|
|
350 |
testSnapshotAndLoad
|
|
|
351 |
| base inst |
|
|
|
352 |
inst := self mockInstanceA.
|
|
|
353 |
base := self snapshot.
|
|
|
354 |
self change: #one toReturn: 2.
|
|
|
355 |
self assert: inst one = 2.
|
|
|
356 |
self load: base.
|
|
|
357 |
self assert: inst one = 1.
|
|
|
358 |
! !
|
|
|
359 |
|
|
|
360 |
!MCWorkingCopyTest class methodsFor:'documentation'!
|
|
|
361 |
|
|
|
362 |
version
|
|
|
363 |
^ '$Header: /cvs/stx/stx/goodies/monticello/MCWorkingCopyTest.st,v 1.1 2011-08-20 12:26:52 cg Exp $'
|
|
|
364 |
!
|
|
|
365 |
|
|
|
366 |
version_CVS
|
|
|
367 |
^ '$Header: /cvs/stx/stx/goodies/monticello/MCWorkingCopyTest.st,v 1.1 2011-08-20 12:26:52 cg Exp $'
|
|
|
368 |
!
|
|
|
369 |
|
|
|
370 |
version_SVN
|
|
|
371 |
^ '§Id: MCWorkingCopyTest.st 10 2010-09-13 11:28:19Z vranyj1 §'
|
|
|
372 |
! !
|