- Tools::TestRunnerEmbedded jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 03 Dec 2012 16:22:00 +0000
branchjv
changeset 12310 bdd2106c15f5
parent 12309 1dceb2eb9139
child 12311 5791eff52dd4
- Tools::TestRunnerEmbedded class: Tools::TestRunnerEmbedded added: #run:debug: changed: #debug #run: #runWithDebug
Tools__TestRunnerEmbedded.st
--- a/Tools__TestRunnerEmbedded.st	Sat Dec 01 00:04:32 2012 +0000
+++ b/Tools__TestRunnerEmbedded.st	Mon Dec 03 16:22:00 2012 +0000
@@ -437,7 +437,9 @@
         self runningHolder value:true.
 
         suite tests do:[:test |
-            test debug. 
+            [
+                test debug. 
+            ] on: AbortAllOperationRequest do:[:ex|].
             (test class testSelectorPassed:test selector) ifTrue:[
                 result := TestResult defaultResultClass new.
                 result passed add: test.
@@ -451,8 +453,8 @@
 
     "Created: / 15-03-2010 / 15:43:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 07-07-2011 / 11:33:48 / Jan Vrany <jan.vrant@fit.cvut,cz>"
-    "Modified: / 22-08-2011 / 09:59:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 04-06-2012 / 19:46:38 / cg"
+    "Modified: / 03-12-2012 / 14:02:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 run
@@ -471,6 +473,14 @@
 !
 
 run:suite 
+    ^self run: suite debug: false
+
+    "Created: / 11-03-2010 / 10:22:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-06-2012 / 20:23:58 / cg"
+    "Modified: / 03-12-2012 / 13:59:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+run:suite debug: debug 
     |suiteAndResult numTests|
 
     numTests := suite tests size.
@@ -483,6 +493,7 @@
     testProcess := [
                 |result incr run|
 
+                result := debug ifFalse:[TestResult new] ifTrue:[TestResultForRunWithDebug].
                 [
                     self runningHolder value:true.
                     self progressIndicatorShownHolder value:(numTests > 1).
@@ -490,7 +501,8 @@
                     incr := 100 / numTests.
                     run := 0.
                     result := suite 
-                                runBeforeEachDo:[:test :result |
+                                run: result
+                                beforeEachDo:[:test :result |
                                     infoHolder notNil ifTrue:[
                                         infoHolder value:('Running "%1-%2"...' 
                                                         bindWith:test name
@@ -503,7 +515,8 @@
                                     infoHolder notNil ifTrue:[
                                         infoHolder value:('Done.')
                                     ]
-                                ].
+                                ]
+                                debug: debug.
                     suiteAndResult := SuiteAndResult suite:suite result:result.
                 ] ensure:[
                     self progressIndicatorShownHolder value:false.
@@ -515,9 +528,7 @@
     testProcess priority:(Processor userBackgroundPriority).
     testProcess resume.
 
-    "Created: / 11-03-2010 / 10:22:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 06-09-2010 / 21:48:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 09-06-2012 / 20:23:58 / cg"
+    "Created: / 03-12-2012 / 13:59:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 runAll
@@ -548,7 +559,7 @@
         suite := suiteAndResult suiteForRun.
     ].
 
-    suite run: TestResultForRunWithDebug new
+    self run: suite debug: true
 
 
 
@@ -556,8 +567,8 @@
     "/ [suiteAndResult suite tests anyOne debug] fork
 
     "Created: / 05-07-2011 / 18:45:43 / cg"
-    "Modified: / 22-08-2011 / 09:59:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 09-10-2011 / 10:55:46 / cg"
+    "Modified: / 03-12-2012 / 13:59:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 stop
@@ -1244,7 +1255,7 @@
 !TestRunnerEmbedded class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__TestRunnerEmbedded.st 8075 2012-12-01 00:04:32Z vranyj1 $'
+    ^ '$Id: Tools__TestRunnerEmbedded.st 8076 2012-12-03 16:22:00Z vranyj1 $'
 !
 
 version_CVS
@@ -1252,5 +1263,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__TestRunnerEmbedded.st 8075 2012-12-01 00:04:32Z vranyj1 $'
+    ^ '$Id: Tools__TestRunnerEmbedded.st 8076 2012-12-03 16:22:00Z vranyj1 $'
 ! !