--- a/Tools__TestRunner2.st Fri Jan 27 22:18:53 2012 +0100
+++ b/Tools__TestRunner2.st Sun Jan 29 12:53:39 2012 +0000
@@ -32,8 +32,7 @@
packageList classList classListOutGeneratorHolder
classListInGeneratorHolder modeHolder detailsHolder
failureListHolder failureSelectionHolder errorListHolder
- errorSelectionHolder lastPass resultHolder lastBrowser
- selectedResultHolder'
+ errorSelectionHolder lastPass resultHolder lastBrowser'
classVariableNames:'History'
poolDictionaries:''
category:'SUnit-UI'
@@ -47,8 +46,7 @@
!
ApplicationModel subclass:#ResultList
- instanceVariableNames:'results resultsHolder selectiomHolder listHolder timestampFormat
- selectionHolder'
+ instanceVariableNames:'results resultsHolder selectiomHolder listHolder timestampFormat'
classVariableNames:''
poolDictionaries:''
privateIn:TestRunner2
@@ -125,7 +123,6 @@
"/ action := (MessageSend receiver:(Smalltalk at:self name) selector:#open).
action := [ (Smalltalk at:self name) open ].
-
"Install in Tools menu"
menuItem := (MenuItem label:'SUnit Test Runner (enhanced)')
nameKey:#TestRunner2;
@@ -158,35 +155,6 @@
"Modified: / 26-11-2008 / 09:38:20 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 09-01-2010 / 20:48:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 18-08-2011 / 11:34:24 / cg"
-
-! !
-
-!TestRunner2 class methodsFor:'help specs'!
-
-helpSpec
- "This resource specification was automatically generated
- by the UIHelpTool of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the UIHelpTool may not be able to read the specification."
-
- "
- UIHelpTool openOnClass:Tools::TestRunner2
- "
-
- <resource: #help>
-
- ^ super helpSpec addPairsFrom:#(
-
-#runCoverage
-'Run tests with coverage measurements enabled. (requires that the testcase class defines #coveredClasses)'
-
-#runDebugged
-'Run tests with debugger enabled.'
-
-)
-
- "Modified: / 21-08-2011 / 17:41:36 / cg"
! !
!TestRunner2 class methodsFor:'image specs'!
@@ -245,7 +213,7 @@
model: runSelectedAction
enableChannel: hasTestCasesAspect
disabledLogo: 'Run Selected'
- extent: (Point 82 44)
+ extent: (Point 98 44)
)
(ActionButtonSpec
label: 'Profiled'
@@ -254,26 +222,16 @@
tabable: true
model: runProfiledAction
initiallyDisabled: true
- extent: (Point 82 44)
+ extent: (Point 98 44)
)
(ActionButtonSpec
label: 'Coverage'
name: 'RunCoverage'
- activeHelpKey: runCoverage
translateLabel: true
tabable: true
model: runCoverageAction
initiallyDisabled: true
- extent: (Point 82 44)
- )
- (ActionButtonSpec
- label: 'Debug'
- name: 'Button1'
- activeHelpKey: runDebugged
- translateLabel: true
- tabable: true
- model: runDebuggedAction
- extent: (Point 82 44)
+ extent: (Point 99 44)
)
(ActionButtonSpec
label: 'Run Failures'
@@ -284,7 +242,7 @@
initiallyDisabled: true
enableChannel: hasFailuresAspect
disabledLogo: 'Run Failures'
- extent: (Point 82 44)
+ extent: (Point 98 44)
)
(ActionButtonSpec
label: 'Run Errors'
@@ -295,7 +253,7 @@
initiallyDisabled: true
enableChannel: hasErrorsAspect
disabledLogo: 'Run Errors'
- extent: (Point 82 44)
+ extent: (Point 99 44)
)
)
@@ -305,6 +263,8 @@
)
)
+
+ "Modified: / 04-07-2011 / 22:39:20 / cg"
!
classCategoryListSpec
@@ -570,10 +530,6 @@
(SubChannelInfoSpec
subAspect: resultsHolder
aspect: resultHolder
- )
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selectedResultHolder
)
)
createNewApplication: true
@@ -583,6 +539,8 @@
)
)
+
+ "Modified: / 19-03-2010 / 08:32:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
windowSpec
@@ -950,22 +908,22 @@
#(Menu
(
(MenuItem
- label: 'Select Prerequisites'
+ label: 'Select prerequisites'
itemValue: packageListMenuSelectPrerequisites
translateLabel: true
)
(MenuItem
- label: 'Select Prerequisites (recursive)'
+ label: 'Select prerequisites (recursive)'
itemValue: packageListMenuSelectPrerequisitesAll
translateLabel: true
)
(MenuItem
- label: 'Select Dependents'
+ label: 'Select dependents'
itemValue: packageListMenuSelectDependents
translateLabel: true
)
(MenuItem
- label: 'Select Dependents (recursively)'
+ label: 'Select dependents (recursively)'
itemValue: packageListMenuSelectDependentsAll
translateLabel: true
)
@@ -975,36 +933,6 @@
)
"Modified: / 06-06-2008 / 20:04:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 23-09-2011 / 18:51:37 / cg"
-!
-
-resultListMenu
- "This resource specification was automatically generated
- by the MenuEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the MenuEditor may not be able to read the specification."
-
-
- "
- MenuEditor new openOnClass:Tools::TestRunner2 andSelector:#resultListMenu
- (Menu new fromLiteralArrayEncoding:(Tools::TestRunner2 resultListMenu)) startUp
- "
-
- <resource: #menu>
-
- ^
- #(Menu
- (
- (MenuItem
- label: 'Browse'
- itemValue: resultListMenuBrowse
- translateLabel: true
- )
- )
- nil
- nil
- )
! !
!TestRunner2 class methodsFor:'resources'!
@@ -1056,16 +984,15 @@
!
failureTestSuite
+
| testSuite |
-
testSuite := TestSuite new.
- failureListHolder value do:[:test|
- testSuite addTest: test
- ].
+ failureListHolder value do:
+ [:test|
+ testSuite addTest: 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
@@ -1214,17 +1141,10 @@
!TestRunner2 methodsFor:'accessing - menus'!
packageListMenu
- ^ self class packageListMenu
+
+ ^self class packageListMenu
"Created: / 06-06-2008 / 19:16:28 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 23-09-2011 / 18:55:05 / cg"
-!
-
-resultListMenu
- ^ self class resultListMenu
-
- "Created: / 06-06-2008 / 19:16:28 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Created: / 23-09-2011 / 18:53:46 / cg"
! !
!TestRunner2 methodsFor:'actions'!
@@ -1296,9 +1216,7 @@
].
self withWaitCursorDo:[
- InstrumentationContext run:[
- result := self runSuite: self selectedTestSuite.
- ].
+ result := self runSuite: self selectedTestSuite.
History add: result.
].
@@ -1308,12 +1226,6 @@
"Created: / 04-07-2011 / 23:04:22 / cg"
!
-runDebuggedAction
- self runSuite: self selectedTestSuite keepFailures: false keepErrors: false debug: true
-
- "Created: / 21-08-2011 / 17:49:49 / cg"
-!
-
runErrorsAction
"akce na tlacitku Run Errors"
@@ -1360,20 +1272,6 @@
!
runSuite: aTestSuite keepFailures: keepFailures keepErrors: keepErrors
- ^ self
- runSuite: aTestSuite
- keepFailures: keepFailures
- keepErrors: keepErrors
- debug: false
-
- "Modified: / 18-01-2008 / 18:38:08 / janfrog"
- "Created: / 06-06-2008 / 09:11:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 06-06-2008 / 19:40:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 20-08-2011 / 13:58:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 21-08-2011 / 17:52:28 / cg"
-!
-
-runSuite: aTestSuite keepFailures: keepFailures keepErrors: keepErrors debug:doDebug
| testResult testCases |
self withWaitCursorDo:[
@@ -1386,9 +1284,15 @@
]
afterEachDo:[:test :result|
testCases add: test class name
+ ].
+
+ testCases do: [:clsName|
+ | cls |
+
+ (cls := Smalltalk classNamed:clsName) notNil ifTrue:[
+ cls rememberFailedTestRunWithResult:testResult
]
- debug:doDebug.
-
+ ].
self displayResult: testResult keepFailures: keepFailures keepErrors: keepErrors.
].
^testResult
@@ -1396,9 +1300,8 @@
"Modified: / 18-01-2008 / 18:38:08 / janfrog"
"Created: / 06-06-2008 / 09:11:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 06-06-2008 / 19:40:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 19-03-2010 / 08:44:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 04-07-2011 / 23:06:23 / cg"
- "Modified: / 20-08-2011 / 13:58:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 21-08-2011 / 17:51:42 / cg"
! !
!TestRunner2 methodsFor:'actions - menu'!
@@ -1464,13 +1367,6 @@
(prjDef allPreRequisites copy add: prjDef package; yourself)
"Created: / 06-06-2008 / 20:11:22 / Jan Vrany <vranyj1@fel.cvut.cz>"
-!
-
-resultListMenuBrowse
- UserPreferences current systemBrowserClass
- openInClass: (self selectedTestSuite tests first class) selector:(self selectedResultHolder value test selector).
-
- "Created: / 23-09-2011 / 18:55:50 / cg"
! !
!TestRunner2 methodsFor:'aspects'!
@@ -1645,15 +1541,6 @@
resultHolder := ValueHolder new.
].
^ resultHolder
-!
-
-selectedResultHolder
- selectedResultHolder isNil ifTrue:[
- selectedResultHolder := ValueHolder new.
- ].
- ^ selectedResultHolder
-
- "Created: / 23-09-2011 / 19:14:51 / cg"
! !
!TestRunner2 methodsFor:'displaying'!
@@ -1782,9 +1669,9 @@
!
formatTime: aTime
- aTime hours > 0 ifTrue: [^aTime hours printString , 'h'].
- aTime minutes > 0 ifTrue: [^aTime minutes printString , 'min'].
- ^aTime seconds printString , ' sec'
+ aTime hours > 0 ifTrue: [^aTime hours printString , 'h'].
+ aTime minutes > 0 ifTrue: [^aTime minutes printString , 'min'].
+ ^aTime seconds printString , ' sec'
"Created: / 18-01-2008 / 18:57:08 / janfrog"
!
@@ -1805,8 +1692,8 @@
!
timeSinceLastPassAsString
- lastPass isNil ifTrue: [^''].
- ^', ' , (self formatTime: (Time now subtractTime: lastPass getSeconds)) , ' since last Pass'
+ lastPass isNil ifTrue: [^''].
+ ^', ' , (self formatTime: (Time now subtractTime: lastPass getSeconds)) , ' since last Pass'
"Modified: / 03-04-2000 / 19:17:11 / Sames"
"Created: / 18-01-2008 / 18:51:21 / janfrog"
@@ -1815,7 +1702,7 @@
!TestRunner2::ClassList class methodsFor:'documentation'!
version
- ^'$Id: Tools__TestRunner2.st,v 1.28 2011-09-23 17:18:27 cg Exp $'
+ ^'$Id: Tools__TestRunner2.st,v 1.22 2011/08/18 10:18:26 cg Exp $'
! !
!TestRunner2::ClassList methodsFor:'private'!
@@ -1868,7 +1755,6 @@
name: 'List'
layout: (LayoutFrame 0 0 0 0 0 1 0 1)
model: selectionHolder
- menu: resultListMenu
hasHorizontalScrollBar: true
hasVerticalScrollBar: true
listModel: listHolder
@@ -1882,6 +1768,8 @@
)
)
+
+ "Modified: / 08-02-2010 / 10:08:09 / Jan Vrany <jan,vrany@fit.cvut.cz>"
! !
!TestRunner2::ResultList class methodsFor:'plugIn spec'!
@@ -1902,6 +1790,7 @@
#selectionHolder
).
+ "Modified: / 19-03-2010 / 08:32:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TestRunner2::ResultList methodsFor:'actions'!
@@ -1975,19 +1864,19 @@
"Created: / 19-03-2010 / 08:32:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-selectionHolder
- selectionHolder isNil ifTrue:[
- selectionHolder := ValueHolder new.
+selectiomHolder
+ "return/create the 'selectiomHolder' value holder (automatically generated)"
+
+ selectiomHolder isNil ifTrue:[
+ selectiomHolder := ValueHolder new.
].
- ^ selectionHolder
-
- "Created: / 23-09-2011 / 19:01:57 / cg"
+ ^ selectiomHolder
!
-selectionHolder:something
- selectionHolder := something.
+selectiomHolder:something
+ "set the 'selectiomHolder' value holder (automatically generated)"
- "Created: / 23-09-2011 / 19:02:06 / cg"
+ selectiomHolder := something.
! !
!TestRunner2::ResultList methodsFor:'change & update'!
@@ -2312,15 +2201,15 @@
!TestRunner2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.28 2011-09-23 17:18:27 cg Exp $'
+ ^ '$Id: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.22 2011/08/18 10:18:26 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.28 2011-09-23 17:18:27 cg Exp $'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.22 2011/08/18 10:18:26 cg Exp §'
!
version_SVN
- ^ '§Id: Tools__TestRunner2.st 7486 2009-10-26 22:06:24Z vranyj1 §'
+ ^ '$Id: Tools__TestRunner2.st 7486 2009-10-26 22:06:24Z vranyj1 $'
! !
-TestRunner2 initialize!
+TestRunner2 initialize!
\ No newline at end of file