Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Defer tests to the morphic ui thread #1496

Merged
merged 2 commits into from
Dec 22, 2023
Merged

Defer tests to the morphic ui thread #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01aff01
Defer tests to the morphic ui thread
guillep Dec 22, 2023
dcc9920
useMorphic is not available in SpApplication
guillep Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Spec2-Code-Tests/SpCodeInteractionModelTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Class {
#name : 'SpCodeInteractionModelTest',
#superclass : 'TestCase',
#superclass : 'SpBaseTest',
#instVars : [
'interactionModel'
],
Expand Down
2 changes: 1 addition & 1 deletion src/Spec2-Code-Tests/SpCodePopoverPrintPresenterTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Class {
#name : 'SpCodePopoverPrintPresenterTest',
#superclass : 'TestCase',
#superclass : 'SpBaseTest',
#instVars : [
'presenter'
],
Expand Down
161 changes: 161 additions & 0 deletions src/Spec2-Tests/SpBasePresenterTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
Class {
#name : 'SpBasePresenterTest',
#superclass : 'SpBaseTest',
#instVars : [
'presenter',
'window'
],
#category : 'Spec2-Tests-Utils',
#package : 'Spec2-Tests',
#tag : 'Utils'
}

{ #category : 'testing' }
SpBasePresenterTest class >> isAbstract [

^ self = SpBasePresenterTest
]

{ #category : 'accessing' }
SpBasePresenterTest >> adapter [

^ self subclassResponsibility
]

{ #category : 'assertions' }
SpBasePresenterTest >> assertEvent: anEventName isRaisedInPresenter: aPresenter whenDoing: aBlock [

self
assertWith: [ :times | times > 0 ]
timesRaisedEvent: anEventName
inPresenter: aPresenter
whenDoing: aBlock
]

{ #category : 'assertions' }
SpBasePresenterTest >> assertWith: assertionBlock timesRaisedEvent: anEventName inPresenter: aPresenter whenDoing: actionBlock [

| timesCalled |
timesCalled := 0.
aPresenter perform: anEventName with: [ timesCalled := timesCalled + 1 ].
actionBlock value.
assertionBlock value: timesCalled
]

{ #category : 'accessing' }
SpBasePresenterTest >> classToTest [
self subclassResponsibility
]

{ #category : 'assertions' }
SpBasePresenterTest >> denyEvent: anEventName isRaisedInPresenter: aPresenter whenDoing: aBlock [

self
assertWith: [ :times | times = 0 ]
timesRaisedEvent: anEventName
inPresenter: aPresenter
whenDoing: aBlock
]

{ #category : 'initialization' }
SpBasePresenterTest >> initializeTestedInstance [
]

{ #category : 'utilities' }
SpBasePresenterTest >> openInstance [

window ifNil: [ window := presenter open ]
]

{ #category : 'accessing' }
SpBasePresenterTest >> presenter [
^ presenter
]

{ #category : 'running' }
SpBasePresenterTest >> setUp [
super setUp.
presenter := self classToTest newApplication: self application.
self initializeTestedInstance
]

{ #category : 'running' }
SpBasePresenterTest >> tearDown [
window ifNotNil: [ window delete ].
super tearDown
]

{ #category : 'tests' }
SpBasePresenterTest >> testNewPresenterIsNotBuilt [
self deny: presenter isBuilt
]

{ #category : 'tests' }
SpBasePresenterTest >> testNewPresenterIsNotDisplayed [
self deny: presenter isDisplayed
]

{ #category : 'tests' }
SpBasePresenterTest >> testNonOpenPresenterDoesNotRaiseBuiltEvent [
| built |
built := false.
presenter whenBuiltDo: [ built := true ].
self deny: built
]

{ #category : 'tests' }
SpBasePresenterTest >> testNonOpenPresenterDoesNotRaiseDisplayedEvent [
| displayed |
displayed := false.
presenter whenDisplayDo: [ displayed := true ].
self deny: displayed
]

{ #category : 'tests' }
SpBasePresenterTest >> testOpenPresenterIsBuilt [
self openInstance.
self assert: presenter isBuilt
]

{ #category : 'tests' }
SpBasePresenterTest >> testOpenPresenterIsDisplayed [
self openInstance.
self assert: presenter isDisplayed
]

{ #category : 'tests' }
SpBasePresenterTest >> testOpenPresenterRaisesBuiltEvent [
| built |
built := false.
presenter whenBuiltDo: [ built := true ].
self openInstance.
self assert: built
]

{ #category : 'tests' }
SpBasePresenterTest >> testOpenPresenterRaisesDisplayEvent [
| displayed |
displayed := false.
presenter whenDisplayDo: [ displayed := true ].
self openInstance.
self assert: displayed
]

{ #category : 'tests' }
SpBasePresenterTest >> testRebuildPresenterDoNotLetReferencesInAnnouncer [

| oldSize newSize |
presenter build.
oldSize := presenter announcer subscriptions subscriptions size.
"rebuild"
presenter build.
newSize := presenter announcer subscriptions subscriptions size.

self assert: oldSize equals: newSize
]

{ #category : 'accessing' }
SpBasePresenterTest >> widget [

^ self adapter widget
]
177 changes: 29 additions & 148 deletions src/Spec2-Tests/SpBaseTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,167 +1,48 @@
"
I am an abstract test class that makes all my subclass' test run on the UI thread to avoid concurrency issues.
"
Class {
#name : 'SpBaseTest',
#superclass : 'TestCase',
#instVars : [
'presenter',
'window'
],
#category : 'Spec2-Tests-Utils',
#package : 'Spec2-Tests',
#tag : 'Utils'
}

{ #category : 'testing' }
SpBaseTest class >> isAbstract [

^ self = SpBaseTest
]

{ #category : 'accessing' }
SpBaseTest >> adapter [

^ self subclassResponsibility
]

{ #category : 'running' }
SpBaseTest >> application [

^ SpApplication new
]

{ #category : 'assertions' }
SpBaseTest >> assertEvent: anEventName isRaisedInPresenter: aPresenter whenDoing: aBlock [

self
assertWith: [ :times | times > 0 ]
timesRaisedEvent: anEventName
inPresenter: aPresenter
whenDoing: aBlock
]

{ #category : 'assertions' }
SpBaseTest >> assertWith: assertionBlock timesRaisedEvent: anEventName inPresenter: aPresenter whenDoing: actionBlock [

| timesCalled |
timesCalled := 0.
aPresenter perform: anEventName with: [ timesCalled := timesCalled + 1 ].
actionBlock value.
assertionBlock value: timesCalled
]

{ #category : 'accessing' }
SpBaseTest >> classToTest [
self subclassResponsibility
]

{ #category : 'assertions' }
SpBaseTest >> denyEvent: anEventName isRaisedInPresenter: aPresenter whenDoing: aBlock [

self
assertWith: [ :times | times = 0 ]
timesRaisedEvent: anEventName
inPresenter: aPresenter
whenDoing: aBlock
]

{ #category : 'initialization' }
SpBaseTest >> initializeTestedInstance [
]

{ #category : 'utilities' }
SpBaseTest >> openInstance [

window ifNil: [ window := presenter open ]
]

{ #category : 'accessing' }
SpBaseTest >> presenter [
^ presenter
]

{ #category : 'running' }
SpBaseTest >> setUp [
super setUp.
presenter := self classToTest newApplication: self application.
self initializeTestedInstance
^ SpApplication new
useBackend: #Morphic with: StPharoMorphicConfiguration new;
yourself
]

{ #category : 'running' }
SpBaseTest >> tearDown [
window ifNotNil: [ window delete ].
super tearDown
]

{ #category : 'tests' }
SpBaseTest >> testNewPresenterIsNotBuilt [
self deny: presenter isBuilt
]

{ #category : 'tests' }
SpBaseTest >> testNewPresenterIsNotDisplayed [
self deny: presenter isDisplayed
]

{ #category : 'tests' }
SpBaseTest >> testNonOpenPresenterDoesNotRaiseBuiltEvent [
| built |
built := false.
presenter whenBuiltDo: [ built := true ].
self deny: built
]

{ #category : 'tests' }
SpBaseTest >> testNonOpenPresenterDoesNotRaiseDisplayedEvent [
| displayed |
displayed := false.
presenter whenDisplayDo: [ displayed := true ].
self deny: displayed
]

{ #category : 'tests' }
SpBaseTest >> testOpenPresenterIsBuilt [
self openInstance.
self assert: presenter isBuilt
]
SpBaseTest >> run [

{ #category : 'tests' }
SpBaseTest >> testOpenPresenterIsDisplayed [
self openInstance.
self assert: presenter isDisplayed
]

{ #category : 'tests' }
SpBaseTest >> testOpenPresenterRaisesBuiltEvent [
| built |
built := false.
presenter whenBuiltDo: [ built := true ].
self openInstance.
self assert: built
]
| finished result |
UIManager default uiProcess == Processor activeProcess ifTrue: [
^ super run ].

{ #category : 'tests' }
SpBaseTest >> testOpenPresenterRaisesDisplayEvent [
| displayed |
displayed := false.
presenter whenDisplayDo: [ displayed := true ].
self openInstance.
self assert: displayed
finished := Semaphore new.
self application defer: [
result := super run.
finished signal ].
finished wait.
^ result
]

{ #category : 'tests' }
SpBaseTest >> testRebuildPresenterDoNotLetReferencesInAnnouncer [

| oldSize newSize |
presenter build.
oldSize := presenter announcer subscriptions subscriptions size.
"rebuild"
presenter build.
newSize := presenter announcer subscriptions subscriptions size.

self assert: oldSize equals: newSize
]

{ #category : 'accessing' }
SpBaseTest >> widget [

^ self adapter widget
{ #category : 'running' }
SpBaseTest >> run: aResult [

| finished result |
UIManager default uiProcess == Processor activeProcess ifTrue: [
^ super run: aResult ].

finished := Semaphore new.
self application backend defer: [
result := super run: aResult.
finished signal ].
finished wait.
^ result
]
2 changes: 1 addition & 1 deletion src/Spec2-Tests/SpSpecTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Class {
#name : 'SpSpecTest',
#superclass : 'SpBaseTest',
#superclass : 'SpBasePresenterTest',
#category : 'Spec2-Tests-Utils',
#package : 'Spec2-Tests',
#tag : 'Utils'
Expand Down
Loading