hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:a4b9d283ca40
+:9f2e3136aa4d
 "
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
 Copyright (c) 2009-2010 eXept Software AG
+Copyright (c) 2021 LabWare
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
 files (the 'Software'), to deal in the Software without
 restriction, including without limitation the rights to use,
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:TestRunner2
 !
-ApplicationModel subclass:#ResultList
+AbstractTestRunner subclass:#ResultList
 	instanceVariableNames:'results resultsHolder selectiomHolder listHolder timestampFormat
-		selectionHolder'
+		selectionHolder passedText failedText errorText'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:TestRunner2
 !
 HierarchicalItem subclass:#ListEntry
 	instanceVariableNames:'label realLabel test result'
-	classVariableNames:'PassedText FailedText ErrorText'
+	classVariableNames:''
 	poolDictionaries:''
 	privateIn:TestRunner2::ResultList
 !
 !TestRunner2 class methodsFor:'documentation'!
 copyright
 "
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
 Copyright (c) 2009-2010 eXept Software AG
+Copyright (c) 2021 LabWare
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
 files (the 'Software'), to deal in the Software without
 restriction, including without limitation the rights to use,
 "Created: / 06-07-2011 / 14:10:00 / cg"
 ! !
 !TestRunner2 methodsFor:'accessing'!
-errorColor
-^ self class
-errorColor
-"Modified: / 08-02-2010 / 13:57:26 / Jan Vrany <jan,vrany@fit.cvut.cz>"
-!
 errorTestSuite
 | testSuite |
 testSuite := TestSuite new.
 errorListHolder value do:
 ^testSuite
 "Created: / 06-06-2008 / 09:08:40 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
-failedColor
-^ self class failedColor
-!
 failureTestSuite
 | testSuite |
 testSuite := TestSuite new.
 failureListHolder value do:[:test|
 ].
 ^testSuite
 "Created: / 06-06-2008 / 09:03:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified (format): / 23-09-2011 / 18:56:52 / cg"
-!
-passedColor
-^ self class passedColor
 !
 selectedPackages: packages
 self packageList selectedProjects value: packages.
 "Modified: / 02-04-2000 / 14:21:42 / Sames"
 "Created: / 18-01-2008 / 20:33:51 / janfrog"
 !
 displayFail:result
-self displayColor:self errorColor.
+self displayColor:self errorBackgroundColor.
 self displayMode:'Fail'.
 self displayDetails:result printString.
 "Created: / 06-06-2008 / 08:49:25 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 07-02-2010 / 14:43:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 17-09-2021 / 22:23:42 / Jan Vrany <jan.vrany@labware.com>"
 !
 displayMode: mode
 self modeHolder value: mode
 "Modified: / 02-04-2000 / 14:21:42 / Sames"
 "Created: / 18-01-2008 / 20:33:35 / janfrog"
 !
 displayPass:result
-self displayColor:self passedColor.
+self displayColor:self passedBackgroundColor.
 self displayMode:'Pass '.
 self
 displayDetails:result printString , ' ' , (self timeSinceLastPassAsString)
+"Modified: / 17-09-2021 / 22:23:51 / Jan Vrany <jan.vrany@labware.com>"
 !
 displayResult: aTestResult
 self displayResult: aTestResult keepFailures: false keepErrors: false.
 "Modified: / 19-03-2010 / 08:33:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 displayRunning: result test: test total: total
-self displayColor: (result hasPassed ifTrue:[self class currentlyRunningColor] ifFalse:[Color orange]).
+self displayColor: self runningBackgroundColor.
 self displayMode: 'Running ' , test printString.
 self displayDetails: total printString , ' total, ' , result printString
 "Modified: / 21-06-2000 / 12:14:52 / Sames"
 "Created: / 06-06-2008 / 19:38:48 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 05-07-2011 / 14:14:42 / cg"
+"Modified: / 17-09-2021 / 22:24:33 / Jan Vrany <jan.vrany@labware.com>"
 ! !
 !TestRunner2 methodsFor:'hooks'!
 commonPostOpen
 #selectionHolder
 ).
 ! !
+!TestRunner2::ResultList methodsFor:'accessing'!
+errorText
+^ errorText
+!
+failedText
+^ failedText
+!
+passedText
+^ passedText
+! !
 !TestRunner2::ResultList methodsFor:'actions'!
 debugTest:entryIndex
 |entry test caughtEx|
 updateList
 | list |
 list := HierarchicalList new.
+list application: self.
 list root: self makeRootEntry.
 list showRoot: false.
 self listHolder value: list.
 "Created: / 07-02-2010 / 11:03:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 07-02-2010 / 13:41:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 17-09-2021 / 22:50:17 / Jan Vrany <jan.vrany@labware.com>"
 !
 updateTimestampFormat
 (results isEmptyOrNil or:[results size = 1])
 ifFalse:[timestampFormat := ' (%(month)-%(day) %h:%m)']
 "Created: / 19-03-2010 / 08:50:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 12-09-2010 / 09:50:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 04-08-2011 / 19:05:57 / cg"
+! !
+!TestRunner2::ResultList methodsFor:'initialization'!
+initialize
+"Invoked when a new instance is created."
+super initialize.
+passedText := (' [', (self resources string:'passed') , ']') withColor: self passedBackgroundColor.
+failedText := (' [', (self resources string:'failed') allBold , ']') withColor: self failedBackgroundColor.
+errorText :=  (' [', (self resources string:'error') allBold , ']') withColor: self errorBackgroundColor.
+"/ super initialize.   -- commented since inherited method does nothing
 ! !
 !TestRunner2::ResultList methodsFor:'private'!
 invalidate
 ^entry
 "Created: / 19-03-2010 / 08:41:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
-!TestRunner2::ResultList::ListEntry class methodsFor:'initialization'!
-errorText
-ErrorText isNil ifTrue:[
-ErrorText := ' [','error' allBold,']' withColor: Tools::TestRunner2 errorColor "darker".
-].
-^ ErrorText
-"Created: / 06-06-2016 / 14:41:59 / cg"
-!
-failedText
-FailedText isNil ifTrue:[
-FailedText := ' [','failed' allBold,']' withColor: Tools::TestRunner2 failedColor "darker".
-].
-^ FailedText
-"Created: / 06-06-2016 / 14:41:40 / cg"
-!
-passedText
-PassedText isNil ifTrue:[
-PassedText := ' [passed]' withColor: Tools::TestRunner2 passedColor darker.
-].
-^ PassedText
-"Created: / 06-06-2016 / 14:41:16 / cg"
-! !
 !TestRunner2::ResultList::ListEntry class methodsFor:'instance creation'!
 labeled: aStringOrText
 ^self new label: aStringOrText
 "Created: / 07-02-2010 / 18:34:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 label
-| result |
+self result. "/ to ensure result is computed
-result := self result.
 realLabel ifNil:[
 realLabel := label.
 test ifNotNil:[
-result == #passed ifTrue:[realLabel := realLabel , self class passedText].
+result == #passed ifTrue:[realLabel := realLabel , self application passedText].
-result == #error ifTrue:[realLabel := realLabel , self class errorText].
+result == #error ifTrue:[realLabel := realLabel , self application errorText].
-result == #failed ifTrue:[realLabel := realLabel , self class failedText].
+result == #failed ifTrue:[realLabel := realLabel , self application failedText].
 ] ifNil: [
 realLabel := realLabel , self summary.
 ]
 ].
 ^ realLabel
 "Modified: / 07-02-2010 / 18:28:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 08-02-2010 / 10:15:35 / Jan Vrany <jan,vrany@fit.cvut.cz>"
 "Modified (format): / 06-06-2016 / 14:43:01 / cg"
+"Modified: / 17-09-2021 / 22:59:45 / Jan Vrany <jan.vrany@labware.com>"
 !
 label:aText
 label := aText.
 realLabel := nil.
 version_CVS
 ^ '$Header$'
 !
+version_HG
+^ '$Changeset: <not expanded> $'
+!
 version_SVN
 ^ '$Id$'
 ! !

branch	jv
changeset 19612	9f2e3136aa4d
parent 17137	2c2f7c9fc909
child 19638	f0275261f2ca