diff -r eeb5359c60d3 -r 37d514cde1d5 Tools__AbstractTestRunner.st --- a/Tools__AbstractTestRunner.st Tue May 21 22:21:03 2013 +0200 +++ b/Tools__AbstractTestRunner.st Tue May 21 22:21:26 2013 +0200 @@ -133,16 +133,17 @@ !AbstractTestRunner methodsFor:'utilities'! suiteNameFromClasses: classes + |numClasses| - classes size = 1 ifTrue: + (numClasses := classes size) == 1 ifTrue: [^classes anyOne nameWithoutPrefix]. - classes size = 2 ifTrue: + numClasses == 2 ifTrue: [^String streamContents: [:s|classes do:[:cls|s nextPutAll: cls nameWithoutPrefix] separatedBy:[s nextPutAll:' & ']]]. - ^classes size printString , ' test cases'. + ^numClasses printString , ' test cases'. "Created: / 15-03-2010 / 13:23:33 / Jan Vrany " ! @@ -150,7 +151,8 @@ suiteNameFromMethods: methods |numMethods| - (numMethods := methods size == 1) ifTrue:[^ methods anyOne selector]. + (numMethods := methods size) == 1 ifTrue:[^ methods anyOne selector]. + ^numMethods printString , ' tests from ' , (self suiteNameFromClasses: (methods @@ -161,18 +163,19 @@ ! suiteNameFromProtocols: protocols + |numProtocols| - protocols size == 0 ifTrue:[ + (numProtocols := protocols size) == 0 ifTrue:[ ^'tests' ]. - protocols size == 1 ifTrue:[ + numProtocols == 1 ifTrue:[ protocols anyOne notNil ifTrue:[ - ^'tests categorized "', protocols anyOne , '"' + ^'category "', protocols anyOne , '"' ] ifFalse:[ ^'tests' ] ]. - ^'tests in ', protocols size printString , ' categories' + ^numProtocols printString , ' categories' "Created: / 15-03-2010 / 13:22:37 / Jan Vrany " "Modified: / 18-10-2011 / 22:59:21 / Jan Vrany " @@ -181,15 +184,16 @@ !AbstractTestRunner class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Tools__AbstractTestRunner.st,v 1.11 2012-10-17 18:12:41 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__AbstractTestRunner.st,v 1.12 2013-05-21 20:21:26 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/Tools__AbstractTestRunner.st,v 1.11 2012-10-17 18:12:41 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__AbstractTestRunner.st,v 1.12 2013-05-21 20:21:26 cg Exp $' ! version_SVN - ^ '§Id: Tools__AbstractTestRunner.st 7681 2011-03-04 11:30:02Z vranyj1 §' + ^ '$Id: Tools__AbstractTestRunner.st,v 1.12 2013-05-21 20:21:26 cg Exp $' ! ! + AbstractTestRunner initialize!