author | sr |
Thu, 12 Oct 2017 13:58:48 +0200 | |
changeset 691 | 6bb8fca6b69b |
parent 683 | 422655e65558 |
child 701 | 15b8c801b7f0 |
permissions | -rw-r--r-- |
691 | 1 |
"{ Encoding: utf8 }" |
2 |
||
0 | 3 |
"{ Package: 'stx:goodies/sunit' }" |
4 |
||
602 | 5 |
"{ NameSpace: Smalltalk }" |
6 |
||
0 | 7 |
Object subclass:#TestSuite |
103 | 8 |
instanceVariableNames:'tests resources name' |
0 | 9 |
classVariableNames:'' |
10 |
poolDictionaries:'' |
|
6
78bb1397e43d
added rerun-defect tests; fixed button enable bug
Claus Gittinger <cg@exept.de>
parents:
0
diff
changeset
|
11 |
category:'SUnit-Base' |
0 | 12 |
! |
13 |
||
222 | 14 |
TestSuite comment:'' |
103 | 15 |
! |
14 | 16 |
|
103 | 17 |
|
222 | 18 |
!TestSuite class methodsFor:'instance creation'! |
56 | 19 |
|
20 |
named: aString |
|
103 | 21 |
|
22 |
^self new |
|
23 |
name: aString; |
|
24 |
yourself |
|
56 | 25 |
! ! |
26 |
||
68 | 27 |
!TestSuite methodsFor:'accessing'! |
0 | 28 |
|
29 |
addTest: aTest |
|
450 | 30 |
self tests add: aTest |
437 | 31 |
|
32 |
"Modified: / 16-01-2012 / 14:07:03 / cg" |
|
450 | 33 |
"Modified: / 02-08-2012 / 11:56:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
6
78bb1397e43d
added rerun-defect tests; fixed button enable bug
Claus Gittinger <cg@exept.de>
parents:
0
diff
changeset
|
34 |
! |
0 | 35 |
|
222 | 36 |
addTests: aCollection |
6
78bb1397e43d
added rerun-defect tests; fixed button enable bug
Claus Gittinger <cg@exept.de>
parents:
0
diff
changeset
|
37 |
aCollection do: [:eachTest | self addTest: eachTest] |
78bb1397e43d
added rerun-defect tests; fixed button enable bug
Claus Gittinger <cg@exept.de>
parents:
0
diff
changeset
|
38 |
! |
0 | 39 |
|
47 | 40 |
defaultResources |
222 | 41 |
^self tests |
42 |
inject: OrderedCollection new |
|
43 |
into: |
|
44 |
[:coll :testCase | |
|
45 |
testCase resources do: |
|
46 |
[:each | |
|
47 |
(coll includes: each) ifFalse: [coll add: each]]. |
|
48 |
coll] |
|
49 |
! |
|
50 |
||
51 |
getTestName |
|
52 |
^self name |
|
53 |
||
54 |
"Created: / 12-09-2006 / 11:38:09 / cg" |
|
47 | 55 |
! |
56 |
||
37 | 57 |
name |
103 | 58 |
|
222 | 59 |
^name |
37 | 60 |
! |
61 |
||
103 | 62 |
name: aString |
63 |
||
64 |
name := aString |
|
37 | 65 |
! |
66 |
||
137 | 67 |
nameOfTest |
68 |
^ self name |
|
69 |
! |
|
70 |
||
47 | 71 |
resources |
72 |
resources isNil ifTrue: [resources := self defaultResources]. |
|
73 |
^resources |
|
74 |
! |
|
75 |
||
222 | 76 |
resources: someOrderedTestResourceClasses |
77 |
"The parameter should understand reverseDo: and should not contain duplicates." |
|
47 | 78 |
|
222 | 79 |
resources := someOrderedTestResourceClasses |
140 | 80 |
! |
81 |
||
306 | 82 |
testCount |
83 |
||
327 | 84 |
^tests notNil ifTrue:[ |
85 |
tests inject:0 into:[:count :test|count + test testCount] |
|
86 |
] ifFalse:[ |
|
87 |
0 |
|
88 |
] |
|
306 | 89 |
|
90 |
"Created: / 04-08-2011 / 13:03:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
91 |
! |
|
92 |
||
0 | 93 |
tests |
94 |
tests isNil ifTrue: [tests := OrderedCollection new]. |
|
6
78bb1397e43d
added rerun-defect tests; fixed button enable bug
Claus Gittinger <cg@exept.de>
parents:
0
diff
changeset
|
95 |
^tests |
78bb1397e43d
added rerun-defect tests; fixed button enable bug
Claus Gittinger <cg@exept.de>
parents:
0
diff
changeset
|
96 |
! ! |
0 | 97 |
|
68 | 98 |
!TestSuite methodsFor:'dependencies'! |
0 | 99 |
|
100 |
addDependentToHierachy: anObject |
|
222 | 101 |
self sunitAddDependent: anObject. |
102 |
self tests do: [ :each | each addDependentToHierachy: anObject] |
|
0 | 103 |
! |
104 |
||
105 |
removeDependentFromHierachy: anObject |
|
222 | 106 |
self sunitRemoveDependent: anObject. |
107 |
self tests do: [ :each | each removeDependentFromHierachy: anObject] |
|
0 | 108 |
! ! |
109 |
||
691 | 110 |
!TestSuite methodsFor:'printing'! |
111 |
||
112 |
printOn:aStream |
|
113 |
aStream |
|
114 |
nextPutAll:self class nameWithoutPrefix; |
|
115 |
nextPutAll:'['; |
|
116 |
nextPutAll:self name ? '???'; |
|
117 |
nextPutAll:']'. |
|
118 |
! ! |
|
119 |
||
122 | 120 |
!TestSuite methodsFor:'queries'! |
121 |
||
122 |
isTestCase |
|
123 |
^ false |
|
124 |
! |
|
125 |
||
126 |
isTestSuite |
|
127 |
^ true |
|
128 |
! ! |
|
129 |
||
68 | 130 |
!TestSuite methodsFor:'running'! |
0 | 131 |
|
602 | 132 |
debug |
133 |
||
134 |
^self run: TestResult defaultResultClass new debug:true. |
|
135 |
! |
|
136 |
||
0 | 137 |
run |
103 | 138 |
|
459
d2862af59031
use TestResultForSTX in SUnit runner
Claus Gittinger <cg@exept.de>
parents:
450
diff
changeset
|
139 |
^self run: TestResult defaultResultClass new. |
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
140 |
|
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
141 |
"Modified: / 29-07-2011 / 09:34:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
6
78bb1397e43d
added rerun-defect tests; fixed button enable bug
Claus Gittinger <cg@exept.de>
parents:
0
diff
changeset
|
142 |
! |
0 | 143 |
|
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
144 |
run:aTestResult |
222 | 145 |
|
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
146 |
^self run: aTestResult |
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
147 |
beforeEachDo: [:test :result|] |
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
148 |
afterEachDo: [:test :result|] |
222 | 149 |
|
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
150 |
"Modified: / 29-07-2011 / 09:59:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
40 | 151 |
! |
152 |
||
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
153 |
run:result beforeEachDo: before afterEachDo: after |
280
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
154 |
^ self |
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
155 |
run:result |
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
156 |
beforeEachDo:before afterEachDo:after |
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
157 |
resetResources:true |
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
158 |
|
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
159 |
"Modified: / 29-07-2011 / 12:09:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
160 |
"Modified: / 31-07-2011 / 13:58:08 / cg" |
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
161 |
! |
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
162 |
|
432 | 163 |
run:result beforeEachDo: before afterEachDo: after debug:doDebug |
164 |
^ self |
|
165 |
run:result |
|
166 |
beforeEachDo:before afterEachDo:after |
|
167 |
resetResources:true |
|
168 |
debug:doDebug |
|
169 |
||
170 |
"Modified: / 29-07-2011 / 12:09:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
171 |
"Modified: / 31-07-2011 / 13:58:08 / cg" |
|
172 |
"Created: / 21-08-2011 / 17:56:57 / cg" |
|
173 |
! |
|
174 |
||
280
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
175 |
run:result beforeEachDo:before afterEachDo:after resetResources:resetResources |
432 | 176 |
^ self |
177 |
run:result |
|
178 |
beforeEachDo:before |
|
179 |
afterEachDo:after |
|
180 |
resetResources:resetResources |
|
181 |
debug:false |
|
182 |
||
183 |
"Created: / 31-07-2011 / 13:57:25 / cg" |
|
184 |
"Modified: / 03-08-2011 / 14:11:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
185 |
"Modified: / 21-08-2011 / 17:56:16 / cg" |
|
186 |
! |
|
187 |
||
188 |
run:result beforeEachDo:before afterEachDo:after resetResources:resetResources debug:doDebug |
|
271
6b971d5e95b8
changed: #run:beforeEachDo:afterEachDo:
Claus Gittinger <cg@exept.de>
parents:
263
diff
changeset
|
189 |
result timestamp:(Timestamp now). |
503 | 190 |
result name isNil ifTrue:[ result name:name ]. "will only change once" |
222 | 191 |
[ |
243
cbce69b15370
changed: #run:beforeEachDo:afterEachDo:
Claus Gittinger <cg@exept.de>
parents:
238
diff
changeset
|
192 |
self tests do:[:each | |
cbce69b15370
changed: #run:beforeEachDo:afterEachDo:
Claus Gittinger <cg@exept.de>
parents:
238
diff
changeset
|
193 |
self sunitChanged:each. |
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
194 |
each run:result |
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
195 |
beforeEachDo: before |
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
196 |
afterEachDo: after |
432 | 197 |
resetResources: false "I'll reset it, see the ensure below" |
198 |
debug:doDebug |
|
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
199 |
] |
683 | 200 |
] ensure:[ |
280
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
201 |
resetResources ifTrue:[ |
f64ce19e2b41
added: #run:beforeEachDo:afterEachDo:resetResources:
Claus Gittinger <cg@exept.de>
parents:
271
diff
changeset
|
202 |
TestResource resetResources: self resources |
301
921572c655e1
TestResult refactoring - now it allow for more fine-grained customization
vrany
parents:
281
diff
changeset
|
203 |
]. |
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
204 |
]. |
480
b6a4cee3ac7e
changed: #run:beforeEachDo:afterEachDo:resetResources:debug:
Claus Gittinger <cg@exept.de>
parents:
459
diff
changeset
|
205 |
result endTime:(Timestamp now). |
202 | 206 |
|
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
207 |
^result |
222 | 208 |
|
301
921572c655e1
TestResult refactoring - now it allow for more fine-grained customization
vrany
parents:
281
diff
changeset
|
209 |
"Modified: / 03-08-2011 / 14:11:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
432 | 210 |
"Created: / 21-08-2011 / 17:56:00 / cg" |
683 | 211 |
"Modified: / 13-07-2017 / 14:03:29 / cg" |
122 | 212 |
! |
213 |
||
222 | 214 |
run:aResult beforeEachTestCaseDo:block1 afterEachTestCaseDo:block2 |
215 |
||
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
216 |
<resource: #obsolete> |
222 | 217 |
|
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
218 |
^self run: aResult beforeEachDo: block1 afterEachDo: block2 |
222 | 219 |
|
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
220 |
"Modified: / 29-07-2011 / 09:49:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
238 | 221 |
! |
222 |
||
602 | 223 |
run:aTestResult debug:debug |
224 |
||
225 |
^self run: aTestResult |
|
226 |
beforeEachDo: [:test :result|] |
|
227 |
afterEachDo: [:test :result|] |
|
228 |
debug:debug |
|
229 |
! |
|
230 |
||
281 | 231 |
runBeforeEachDo:block1 |
232 |
||
233 |
^self runBeforeEachDo:block1 afterEachDo:[] |
|
234 |
||
235 |
"Modified: / 29-07-2011 / 09:51:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
236 |
"Created: / 01-08-2011 / 09:42:29 / cg" |
|
237 |
! |
|
238 |
||
238 | 239 |
runBeforeEachDo:block1 afterEachDo: block2 |
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
240 |
|
459
d2862af59031
use TestResultForSTX in SUnit runner
Claus Gittinger <cg@exept.de>
parents:
450
diff
changeset
|
241 |
^self run: TestResult defaultResultClass new beforeEachDo: block1 afterEachDo: block2 |
238 | 242 |
|
243 |
"Created: / 05-07-2011 / 16:51:25 / cg" |
|
263
31c7107b5edd
TestSuite/TestCase run* method refactored (cleanup, possible bug fixes)
vrany
parents:
243
diff
changeset
|
244 |
"Modified: / 29-07-2011 / 09:51:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
0 | 245 |
! ! |
246 |
||
68 | 247 |
!TestSuite methodsFor:'testing'! |
49 | 248 |
|
249 |
areAllResourcesAvailable |
|
222 | 250 |
^self resources |
49 | 251 |
inject: true |
252 |
into: [:total :each | each isAvailable & total] |
|
103 | 253 |
! |
254 |
||
255 |
signalUnavailableResources |
|
256 |
||
222 | 257 |
self resources do:[:res | |
258 |
res isAvailable ifFalse:[ |
|
259 |
^ res signalInitializationError |
|
260 |
] |
|
103 | 261 |
]. |
49 | 262 |
! ! |
263 |
||
14 | 264 |
!TestSuite class methodsFor:'documentation'! |
265 |
||
243
cbce69b15370
changed: #run:beforeEachDo:afterEachDo:
Claus Gittinger <cg@exept.de>
parents:
238
diff
changeset
|
266 |
version_CVS |
683 | 267 |
^ '$Header$' |
222 | 268 |
! |
269 |
||
270 |
version_SVN |
|
683 | 271 |
^ '$Id$' |
14 | 272 |
! ! |
602 | 273 |