Skip to content

Commit

Permalink
Once went through all tests we touched and cleaned them up
Browse files Browse the repository at this point in the history
- Add `assert: aBlock opensNewWindow: name` and similar helpers and use them wherever possible. Open question: Some forms of the helpers added may not be used, should we then remove them?
- Add similar helpers for `SystemDialog`s and use them
- Replace `className` variable in `ALGTestClassReload` which never changed with a constant method
- Remove some unnecessary (now already handled by the ALGTest base class) manual setup and teardown functionalities implemented by some tests
- Many small thingies I stumbled upon, like trailing dots
  • Loading branch information
Benedikt Weber committed Aug 5, 2021
1 parent 9630913 commit 1668a38
Show file tree
Hide file tree
Showing 82 changed files with 277 additions and 323 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
testing
assert: aBlock opensNewDialog: windowName

| browsers newBrowsers |

browsers := self findDialogWindowsByLabel: windowName.

aBlock value.

newBrowsers := self findNewDialogWindowsByLabel: windowName old: browsers.
self assert: 1 equals: newBrowsers size.
^ newBrowsers first
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
testing
assert: aBlock opensNewWindow: windowName

| browsers newBrowsers |

browsers := self findSystemWindowsByLabel: windowName.

aBlock value.

newBrowsers := self findNewSystemWindowsByLabel: windowName old: browsers.
self assert: 1 equals: newBrowsers size.
^ newBrowsers first
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
testing
assertQuery: query opensNewWindow: windowName

| browsers newBrowsers |

browsers := self findSystemWindowsByLabel: windowName.

self runQuery: query.
self activateCurrentItemAction.

World doOneCycle.

newBrowsers := self findNewSystemWindowsByLabel: windowName old: browsers.
self assert: 1 equals: newBrowsers size
^ self assert:
[ self runQuery: query.
self activateCurrentItemAction.
World doOneCycle ]
opensNewWindow: windowName
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
testing
assertQuery: query withCursorAt: aCategory opensNewWindow: windowName

^ self assert:
[ self runQuery: query withCursorAt: aCategory.
self activateCurrentItemAction.
World doOneCycle ]
opensNewWindow: windowName
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
helpers
currentDialogWindows
^ DialogWindow allInstances
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
testing
deny: aBlock opensNewWindow: windowName

| browsers newBrowsers |

browsers := self findSystemWindowsByLabel: windowName.

aBlock value.

newBrowsers := self findNewSystemWindowsByLabel: windowName old: browsers.
self assert: 0 equals: newBrowsers size
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
testing
denyQuery: query opensNewWindow: windowName

self deny:
[ self runQuery: query.
self activateCurrentItemAction.
World doOneCycle ]
opensNewWindow: windowName
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
testing
denyQuery: query withCursorAt: aCategory opensNewWindow: windowName

self deny:
[ self runQuery: query withCursorAt: aCategory.
self activateCurrentItemAction.
World doOneCycle ]
opensNewWindow: windowName
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
helpers
findDialogWindowsByLabel: aString
^ self currentDialogWindows select: [:each | each title asString asLowercase includesSubstring: aString asLowercase ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
helpers
findNewDialogWindowsByLabel: aString old: oldWindows
^ ((self findDialogWindowsByLabel: aString)
select: [:each | (oldWindows includes: each) not])
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,26 @@
"activateCurrentItemAction" : "rk 8/3/2020 16:52",
"algInstance" : "jRo 7/5/2020 22:18",
"algInstance:" : "jRo 7/5/2020 22:15",
"assertQuery:opensNewWindow:" : "b 6/25/2021 17:32",
"assert:opensNewDialog:" : "b 8/5/2021 16:41",
"assert:opensNewWindow:" : "b 8/5/2021 16:41",
"assertQuery:opensNewWindow:" : "b 8/5/2021 16:41",
"assertQuery:withCursorAt:opensNewWindow:" : "b 8/5/2021 16:41",
"categoryResultItems" : "jRo 8/1/2020 11:52",
"currentDialogWindows" : "b 8/5/2021 16:32",
"currentQuery" : "jRo 7/5/2020 22:15",
"currentSystemWindows" : "jRo 7/2/2020 18:26",
"defaultTimeout" : "pw 7/12/2020 21:15",
"deleteNewSystemWindowsByLabel:old:" : "rk 8/3/2020 16:52",
"deny:opensNewWindow:" : "b 8/5/2021 16:41",
"denyQuery:opensNewWindow:" : "b 8/5/2021 14:44",
"denyQuery:withCursorAt:opensNewWindow:" : "b 8/5/2021 15:30",
"dispatchMouseEvent:atPosition:" : "jRo 8/1/2020 22:15",
"dispatchMouseMoveEvent:atPosition:" : "jRo 8/1/2020 22:43",
"doActionForItem:" : "Jro 5/26/2020 12:12",
"doActionForItem:withName:" : "jRo 5/27/2020 16:10",
"ensureMorphic" : "rk 8/4/2020 20:39",
"findDialogWindowsByLabel:" : "b 8/5/2021 16:48",
"findNewDialogWindowsByLabel:old:" : "b 8/5/2021 16:36",
"findNewSystemWindowsByLabel:old:" : "jRo 5/27/2020 17:44",
"findSystemWindowsByLabel:" : "jRo 6/4/2020 15:08",
"getResultItemForType:" : "jRo 8/5/2020 16:37",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
running
className

^ #ALGDummyClass
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
helpers
createClass
Object subclass: className
Object subclass: self className
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: self categoryNameForTemporaryClasses.
#('foo' 'bar self foo' 'baz self bar') do:
[:s| (Smalltalk at: className) compileSilently: s]
[:s | (Smalltalk at: self className) compileSilently: s]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
helpers
deleteCategory
(Smalltalk organization listAtCategoryNamed: self categoryNameForTemporaryClasses) isEmpty
ifTrue: [Smalltalk organization removeCategory: self categoryNameForTemporaryClasses]
(Smalltalk organization listAtCategoryNamed: self categoryNameForTemporaryClasses)
ifEmpty: [Smalltalk organization removeCategory: self categoryNameForTemporaryClasses]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
helpers
deleteClass
| cl |
cl := Smalltalk at: className ifAbsent: [^self].
cl := Smalltalk at: self className ifAbsent: [^self].
cl removeFromChanges; removeFromSystemUnlogged
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ existsInResults: aClassName

classItems := self itemMorphs copy.
names := classItems collect: [ :entries | entries item name ].
^(names anySatisfy: [ :each | each = aClassName asString])
^ names anySatisfy: [ :each | each = aClassName asString ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ running
setUp

super setUp.
className := #ALGDummyClass.
self deleteClass
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
testing
testCreateAndDeleteClass

self deny: (self existsInResults: className).
self deny: (self existsInResults: self className).
self createClass.
self assert: (self existsInResults: className).
self assert: (self existsInResults: self className).
self deleteClass.
self deny: (self existsInResults: className)
self deny: (self existsInResults: self className)
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
},
"instance" : {
"categoryNameForTemporaryClasses" : "lm 6/6/2021 16:06",
"createClass" : "lm 6/6/2021 16:10",
"deleteCategory" : "OH 6/9/2021 10:22",
"deleteClass" : "lm 6/6/2021 16:06",
"existsInResults:" : "lm 6/6/2021 16:23",
"setUp" : "lm 6/6/2021 16:13",
"className" : "b 8/5/2021 15:10",
"createClass" : "b 8/5/2021 15:10",
"deleteCategory" : "b 8/5/2021 15:05",
"deleteClass" : "b 8/5/2021 15:10",
"existsInResults:" : "b 8/5/2021 15:06",
"setUp" : "b 8/5/2021 15:09",
"tearDown" : "OH 6/9/2021 10:22",
"testCreateAndDeleteClass" : "OH 6/9/2021 10:23" } }
"testCreateAndDeleteClass" : "b 8/5/2021 15:10" } }
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
],
"commentStamp" : "lm 6/6/2021 16:04",
"instvars" : [
"className" ],
],
"name" : "ALGTestClassReload",
"pools" : [
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
testing interaction with tools
testClassAction
| oldBrowsers newBrowser |
self runQuery: 'ALGCore' withCursorAt: 'Class'.
oldBrowsers := self findSystemWindowsByLabel: 'System Browser'.
self activateCurrentItemAction.
newBrowser := (self findNewSystemWindowsByLabel: 'System Browser' old: oldBrowsers) first.
self assert: (newBrowser label includesSubstring: 'ALGCore')
self assertQuery: 'ALGCore' withCursorAt: 'Class' opensNewWindow: 'System Browser: ALGCore'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
testing interaction with tools
testMethodAction
| oldWindows |
self runQuery: 'testMethodAction' withCursorAt: 'Method'.
oldWindows := (self findSystemWindowsByLabel: 'Implementors of testMethodAction').
self activateCurrentItemAction.
self assert: (self findNewSystemWindowsByLabel: 'Implementors of testMethodAction' old: oldWindows) size equals: 1.
self assertQuery: 'testMethodAction' withCursorAt: 'Method' opensNewWindow: 'Implementors of testMethodAction'
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
testing interaction with tools
testSettingsAction
| oldSettings oldSettingsNumber |
self runQuery: 'Algernon' withCursorAt: 'Setting'.
oldSettings := self findSystemWindowsByLabel: 'Preference Browser'.
oldSettingsNumber := PreferenceBrowser allInstances size.
self activateCurrentItemAction.
self assert: PreferenceBrowser allInstances size equals: oldSettingsNumber + 1.
self deleteNewSystemWindowsByLabel: 'Preference Browser' old: oldSettings
self assertQuery: 'Algernon' withCursorAt: 'Setting' opensNewWindow: 'Preference Browser'
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
testing interaction with tools
testStaticDockingBarTypeAction
| oldProcessBrowsers oldProcessBrowserNumber |
self runQuery: 'Process Browser' withCursorAt: 'Docking Bar Item'.
oldProcessBrowsers := self findSystemWindowsByLabel: 'Process Browser'.
oldProcessBrowserNumber := ProcessBrowser allInstances size.
self activateCurrentItemAction.
self assert: ProcessBrowser allInstances size equals: oldProcessBrowserNumber + 1.
self deleteNewSystemWindowsByLabel: 'Process Browser' old: oldProcessBrowsers
self assertQuery: 'Process Browser' withCursorAt: 'Docking Bar Item' opensNewWindow: 'Process Browser'
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ testTestAction
oldTestRunners := self findSystemWindowsByLabel: 'Test Runner'.
ALGFakeTest wasRun: false.
self activateCurrentItemAction.
self assert: ALGFakeTest wasRun.
self deleteNewSystemWindowsByLabel: 'Test Runner' old: oldTestRunners
self assert: ALGFakeTest wasRun
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
"instance" : {
"testAdvancedChildNavigation" : "rk 8/5/2020 17:25",
"testBreadcrumbsListSize" : "rk 8/5/2020 16:44",
"testClassAction" : "rk 8/5/2020 17:24",
"testClassAction" : "b 8/5/2021 15:30",
"testCloseWithEscape" : "b 6/2/2021 14:35",
"testDynamicItemsOnlyOnDefaultSearchLevel" : "b 7/31/2021 12:41",
"testKeyBindingsValid" : "jRo 8/1/2020 11:19",
"testListContents" : "jRo 7/5/2020 22:15",
"testMethodAction" : "rk 8/5/2020 17:26",
"testSettingsAction" : "rk 8/5/2020 17:24",
"testMethodAction" : "b 8/5/2021 15:36",
"testSettingsAction" : "b 8/5/2021 15:41",
"testShowParentList" : "pw 8/1/2020 17:05",
"testStaticDockingBarTypeAction" : "b 7/31/2021 12:51",
"testTestAction" : "rk 8/5/2020 17:25",
"testStaticDockingBarTypeAction" : "b 8/5/2021 15:44",
"testTestAction" : "b 8/5/2021 15:45",
"testWorkspaceIsInOrder" : "jRo 8/1/2020 12:50" } }
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
testing
testSelectedListItemWhenTitleSelected
| item selectedItem |
self algInstance activate.
item := ALGResultItemMorph newWithContents: 'Test Title' in: self algInstance itemList.
self algInstance itemList selectedItem: item.
"A title item is not selectable, so selectedItemList should be NullItem"
selectedItem := self algInstance itemList selectedListItem.
self assert: selectedItem class equals: ALGNullItem.
self assert: selectedItem class equals: ALGNullItem
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
testing
testTabDoesNotExecuteMultiActionResult

| browserCount browsers |

ALGCore executeOnTab: true.

browserCount := (self findSystemWindowsByLabel: 'System Browser') size.

self
runQuery: 'ALGIconFactory';
keyTab.

browsers := self findSystemWindowsByLabel: 'System Browser'.
self assert: browsers size = browserCount
deny: [self runQuery: 'ALGIconFactory'; keyTab]
opensNewWindow: 'System Browser'
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
testing
testTabExecutesSingleActionResult

| browserCount browsers |

ALGCore executeOnTab: true.

browserCount := (self findSystemWindowsByLabel: 'Preference Browser') size.

self
runQuery: 'Preferences';
keyTab.

browsers := self findSystemWindowsByLabel: 'Preference Browser'.
self assert: browsers size > browserCount
assert: [self runQuery: 'Preferences'; keyTab]
opensNewWindow: 'Preference Browser'
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
testing
testTabExecutesSingleActionResultCanBeDisabled

| browserCount browsers |

ALGCore executeOnTab: false.

browserCount := (self findSystemWindowsByLabel: 'Preference Browser') size.

self
runQuery: 'Preferences';
keyTab.

browsers := self findSystemWindowsByLabel: 'Preference Browser'.
self assert: browsers size = browserCount
deny: [self runQuery: 'Preferences'; keyTab]
opensNewWindow: 'Preference Browser'

0 comments on commit 1668a38

Please sign in to comment.