25 " |
25 " |
26 "{ Package: 'stx:libtool' }" |
26 "{ Package: 'stx:libtool' }" |
27 |
27 |
28 "{ NameSpace: Tools }" |
28 "{ NameSpace: Tools }" |
29 |
29 |
30 Tools::AbstractTestRunner subclass:#TestRunnerEmbedded |
30 AbstractTestRunner subclass:#TestRunnerEmbedded |
31 instanceVariableNames:'runnerPanel selectedClassesHolder selectedProtocolsHolder |
31 instanceVariableNames:'runnerPanel selectedClassesHolder selectedProtocolsHolder |
32 selectedMethodsHolder methodGeneratorHolder resultHolder |
32 selectedMethodsHolder methodGeneratorHolder resultHolder |
33 resultInfoHolder resultBackgroundColorHolder runningHolder |
33 resultInfoHolder resultBackgroundColorHolder runningHolder |
34 progressHolder progressIndicatorShownHolder infoHolder |
34 progressHolder progressIndicatorShownHolder infoHolder |
35 testProcess allTestCases' |
35 testProcess allTestCases' |
317 |
317 |
318 invalidateAllTestCases |
318 invalidateAllTestCases |
319 allTestCases := nil |
319 allTestCases := nil |
320 ! |
320 ! |
321 |
321 |
322 |
322 selectedTestMethods |
323 |
323 |
324 |
324 | selectedClass | |
|
325 selectedClass := self theSingleTestCase. |
|
326 |
|
327 ^ (self selectedMethodsHolder value ? #()) select: |
|
328 [:mthd | | cls | |
|
329 (cls := selectedClass) isNil ifTrue:[cls := mthd mclass]. |
|
330 (self isTestCaseLike:selectedClass) |
|
331 and:[ selectedClass isTestSelector:mthd selector ] ] |
|
332 |
|
333 "Created: / 15-03-2010 / 13:21:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
334 "Modified: / 22-07-2011 / 15:46:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
335 "Modified: / 02-08-2011 / 17:46:38 / cg" |
|
336 ! |
|
337 |
|
338 selectedTestMethodsFromProtocols:protocols |
|
339 |
|
340 |methods generator selectedClass| |
|
341 |
|
342 methods := Set new. |
|
343 generator := self methodGeneratorHolder value. |
|
344 selectedClass := self theSingleTestCase. |
|
345 |
|
346 generator notNil ifTrue:[ |
|
347 generator do: [:cls :cat :sel :mthd | |
|
348 (mthd notNil |
|
349 and:[ (self isTestCaseLike:(selectedClass ? cls)) |
|
350 and:[ (selectedClass ? cls) isTestSelector:sel ] ]) |
|
351 ifTrue:[ methods add:mthd ] |
|
352 ] |
|
353 ] ifFalse:[ |
|
354 allTestCases do: [:cls | |
|
355 cls methodsDo: [:mthd | |
|
356 ((protocols includes:mthd category) and:[ cls isTestSelector:mthd selector ]) |
|
357 ifTrue:[ |
|
358 methods add:mthd |
|
359 ] |
|
360 ] |
|
361 ] |
|
362 ]. |
|
363 ^ methods |
|
364 |
|
365 "Created: / 15-03-2010 / 19:50:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
366 "Modified: / 22-07-2011 / 15:53:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
367 "Modified (format): / 04-06-2012 / 19:05:32 / cg" |
|
368 ! |
325 |
369 |
326 selectedTestMethodsFromProtocols:protocols inClass:aTestClass |
370 selectedTestMethodsFromProtocols:protocols inClass:aTestClass |
327 |
371 |
328 |methods generator| |
372 |methods generator| |
329 |
373 |
881 "Created: / 11-03-2010 / 10:31:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
925 "Created: / 11-03-2010 / 10:31:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
882 "Modified: / 24-01-2012 / 22:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
926 "Modified: / 24-01-2012 / 22:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
883 "Modified: / 04-06-2012 / 19:02:52 / cg" |
927 "Modified: / 04-06-2012 / 19:02:52 / cg" |
884 ! |
928 ! |
885 |
929 |
886 |
930 updateTestSuiteAndResult |
|
931 |
|
932 | suite suiteAndResult | |
|
933 self runningHolder value ifTrue:[^self]. |
|
934 allTestCases isEmptyOrNil ifTrue:[^self]. |
|
935 suiteAndResult := SuiteAndResult |
|
936 suite: (suite := self suiteForRun) |
|
937 result: (self resultForSuite: suite). |
|
938 self resultHolder value: suiteAndResult. |
|
939 |
|
940 "Created: / 15-03-2010 / 19:41:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
941 "Modified: / 15-03-2010 / 20:55:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
942 "Modified: / 04-06-2012 / 19:03:15 / cg" |
|
943 ! |
887 |
944 |
888 updateVisibility |
945 updateVisibility |
889 |
946 |
890 self hasTestCaseSelected |
947 self hasTestCaseSelected |
891 ifTrue:[self show] |
948 ifTrue:[self show] |
1185 ! ! |
1242 ! ! |
1186 |
1243 |
1187 !TestRunnerEmbedded class methodsFor:'documentation'! |
1244 !TestRunnerEmbedded class methodsFor:'documentation'! |
1188 |
1245 |
1189 version |
1246 version |
1190 ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerEmbedded.st,v 1.32 2012/11/08 00:05:16 cg Exp $' |
1247 ^ '$Id: Tools__TestRunnerEmbedded.st 8075 2012-12-01 00:04:32Z vranyj1 $' |
1191 ! |
1248 ! |
1192 |
1249 |
1193 version_CVS |
1250 version_CVS |
1194 ^ '§Header: /cvs/stx/stx/libtool/Tools__TestRunnerEmbedded.st,v 1.32 2012/11/08 00:05:16 cg Exp §' |
1251 ^ '§Header: /cvs/stx/stx/libtool/Tools__TestRunnerEmbedded.st,v 1.32 2012/11/08 00:05:16 cg Exp §' |
1195 ! |
1252 ! |
1196 |
1253 |
1197 version_SVN |
1254 version_SVN |
1198 ^ '$Id: Tools__TestRunnerEmbedded.st 8074 2012-11-30 17:23:39Z vranyj1 $' |
1255 ^ '$Id: Tools__TestRunnerEmbedded.st 8075 2012-12-01 00:04:32Z vranyj1 $' |
1199 ! ! |
1256 ! ! |