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