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