--- a/Tools__TestRunnerMini.st	Sat Feb 28 04:16:09 2015 +0100
+++ b/Tools__TestRunnerMini.st	Sat Feb 28 21:31:47 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
  Copyright (c) 2009-2010 eXept Software AG
@@ -516,7 +518,7 @@
 debug
     | suiteAndResult suite result | 
 
-    suiteAndResult := self resultHolder value.
+    suiteAndResult := resultHolder value.
     suite := suiteAndResult suiteForRun.
     "/ suite tests size ~= 1 ifTrue:[^self breakPoint: #jv].
     "/ test := suiteAndResult suite tests anyOne.
@@ -534,7 +536,7 @@
                 test debug. 
             ] ifCurtailed:[
                 result failureOutcomes add: test.
-                self resultHolder value:suiteAndResult; changed.    
+                resultHolder value:suiteAndResult; changed.    
             ].
 
             (test class testSelectorPassed:test selector) ifTrue:[
@@ -542,14 +544,14 @@
                 "/ result passed add: test.
                 "/ suiteAndResult := SuiteAndResult suite: suite result: result.
                 result passedOutcomes add: test.
-                self resultHolder value:suiteAndResult; changed.    
+                resultHolder value:suiteAndResult; changed.    
             ] ifFalse:[
                 (test class testSelectorFailed:test selector) ifTrue:[
                     "/ result := TestResult defaultResultClass new.
                     "/ result failures add: test.
                     "/ suiteAndResult := SuiteAndResult suite: suite result: result.       
                     result failureOutcomes add: test.
-                    self resultHolder value:suiteAndResult; changed.    
+                    resultHolder value:suiteAndResult; changed.    
                 ]
             ]
         ].
@@ -567,7 +569,7 @@
     | runner screen |
 
     runner := TestRunnerMini new.
-    runner resultHolder value: self resultHolder value copy.
+    runner resultHolder value: resultHolder value copy.
 
     runner allButOpen.
 
@@ -654,7 +656,7 @@
                 suiteAndResult := SuiteAndResult suite:suite result:result.
             ] ensure:[
                 self progressIndicatorShownHolder value:false.
-                self resultHolder setValue:nil; value:suiteAndResult; changed.
+                resultHolder setValue:nil; value:suiteAndResult; changed.
                 self runningHolder value:false.
             ]
         ].
@@ -729,7 +731,7 @@
 
     | suiteAndResult suite|
 
-    suiteAndResult := self resultHolder value.
+    suiteAndResult := resultHolder value.
     suiteAndResult isNil ifTrue:[
         suite := self suiteForRun.
     ] ifFalse:[
@@ -768,7 +770,7 @@
             and:[ model testCount == 1 
             and:[ model hasFailuresOrErrors ]]
         ]
-        argument:self resultHolder
+        argument:resultHolder
 
     "Created: / 15-03-2010 / 15:40:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-08-2011 / 18:19:14 / cg"
@@ -816,7 +818,7 @@
                         ]
                     ].
                 ]
-                argument:self resultHolder
+                argument:resultHolder
                 argument:self runningHolder.
         resultBackgroundColorHolder 
             onChangeEvaluate:[
@@ -844,7 +846,7 @@
 resultInfoAspect
     ^ BlockValue 
         with:[:model | model isNil ifTrue:[ '' ] ifFalse:[ model info ] ]
-        argument:self resultHolder
+        argument:resultHolder
 
     "Created: / 15-03-2010 / 20:22:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-08-2011 / 18:20:26 / cg"
@@ -853,7 +855,7 @@
 resultNameAspect
     ^ BlockValue 
         with:[:model | model isNil ifTrue:[ 'Run the tests!!' ] ifFalse:[ model name ] ]
-        argument:self resultHolder
+        argument:resultHolder
 
     "Created: / 15-03-2010 / 14:57:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 15-03-2010 / 20:17:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -891,7 +893,7 @@
             and:[ result notNil 
             and:[ result testCount > 0 ]]
         ]
-        argument: self resultHolder
+        argument: resultHolder
         argument: self runningHolder
 
     "Created: / 07-09-2010 / 09:15:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -958,7 +960,7 @@
 !TestRunnerMini methodsFor:'change & update'!
 
 invalidateSuiteAndResult
-    self resultHolder value:nil.
+    resultHolder value:nil.
 !
 
 update:aspect with:param from:sender
@@ -985,10 +987,11 @@
     self runningHolder value ifTrue:[^self].
     self allTestCases isEmptyOrNil ifTrue:[^self].
 
+    suite := self suiteForRun.
     suiteAndResult := SuiteAndResult
-                        suite:  (suite := self suiteForRun)
+                        suite:  suite
                         result: (self resultForSuite: suite).
-    self resultHolder value: suiteAndResult.
+    resultHolder value: suiteAndResult.
 
     "Created: / 15-03-2010 / 19:41:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 15-03-2010 / 20:55:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1002,14 +1005,14 @@
 !
 
 updateTestSuiteAndResult
+    | suite suiteAndResult |
 
-    | suite suiteAndResult |
     self runningHolder value ifTrue:[^self].
     allTestCases isEmptyOrNil ifTrue:[^self].
     suiteAndResult := SuiteAndResult
                         suite:  (suite := self suiteForRun)
                         result: (self resultForSuite: suite).
-    self resultHolder value: suiteAndResult.
+    resultHolder value: suiteAndResult.
 
     "Created: / 15-03-2010 / 19:41:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 15-03-2010 / 20:55:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1057,6 +1060,13 @@
     "Created: / 17-11-2011 / 21:03:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!TestRunnerMini methodsFor:'initialization'!
+
+initialize
+    super initialize.
+    resultHolder := ValueHolder new.
+! !
+
 !TestRunnerMini methodsFor:'private'!
 
 isTestCaseLike:cls 
@@ -1113,9 +1123,11 @@
 !
 
 suiteForRun
-    self resultHolder value isNil ifTrue:[^ nil].
+    |result|
 
-    ^ self resultHolder value suiteForRun
+    (result := resultHolder value) isNil ifTrue:[^ nil].
+
+    ^ result suiteForRun
 
     "Modified: / 23-09-2014 / 12:07:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -1295,14 +1307,14 @@
 !TestRunnerMini class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerMini.st,v 1.15 2015-02-27 00:04:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerMini.st,v 1.16 2015-02-28 20:31:47 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerMini.st,v 1.15 2015-02-27 00:04:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerMini.st,v 1.16 2015-02-28 20:31:47 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__TestRunnerMini.st,v 1.15 2015-02-27 00:04:17 cg Exp $'
+    ^ '$Id: Tools__TestRunnerMini.st,v 1.16 2015-02-28 20:31:47 cg Exp $'
 ! !