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.

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

Try to push auto refactoring #196

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 40 additions & 20 deletions src/Molecule-Tests/MolComponentAnnouncementTest.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -26,105 +26,125 @@ MolComponentAnnouncementTest >> testAnnounceActivated [

| announcement component component2 |
announcement := nil.
SystemAnnouncer uniqueInstance when: MolComponentActivated do:[ :a | announcement := a ].
SystemAnnouncer uniqueInstance
when: MolComponentActivated
do: [ :a | announcement := a ]
for: self.

"test by standard instanciation"
MolMyUserComponentImpl deploy.
component := MolMyUserComponentImpl instantiate.
self assert: announcement isNil.

MolMyUserComponentImpl activate.
self assert: announcement notNil.
self assert: announcement component equals: component.
self assert: announcement componentName equals: MolUtils defaultComponentName.
self
assert: announcement componentName
equals: MolUtils defaultComponentName.
announcement := nil.

"test by named instanciation"
component2 := MolMyUserComponentImpl instantiate: #myComponent.
MolMyUserComponentImpl activate: #myComponent.
self assert: announcement notNil.
self assert: announcement component equals: component2.
self assert: announcement componentName equals: #myComponent.
self assert: announcement componentName equals: #myComponent
]

{ #category : #tests }
MolComponentAnnouncementTest >> testAnnounceInstanciated [

| announcement component component2 |
announcement := nil.
SystemAnnouncer uniqueInstance when: MolComponentInstantiated do:[ :a | announcement := a ].
SystemAnnouncer uniqueInstance
when: MolComponentInstantiated
do: [ :a | announcement := a ]
for: self.

"test by standard instanciation"
MolMyUserComponentImpl deploy.
component := MolMyUserComponentImpl instantiate.
self assert: announcement notNil.
self assert: announcement component equals: component.
self assert: announcement componentName equals: MolUtils defaultComponentName.
self
assert: announcement componentName
equals: MolUtils defaultComponentName.
announcement := nil.

"test by named instanciation"
component2 := MolMyUserComponentImpl instantiate: #myComponent.
self assert: announcement notNil.
self assert: announcement component equals: component2.
self assert: announcement componentName equals: #myComponent.
self assert: announcement componentName equals: #myComponent
]

{ #category : #tests }
MolComponentAnnouncementTest >> testAnnouncePassivated [

| announcement component component2 |
announcement := nil.
SystemAnnouncer uniqueInstance when: MolComponentPassivated do:[ :a | announcement := a ].
SystemAnnouncer uniqueInstance
when: MolComponentPassivated
do: [ :a | announcement := a ]
for: self.

"test by standard instanciation"
MolMyUserComponentImpl deploy.
component := MolMyUserComponentImpl instantiate.
MolMyUserComponentImpl activate.
self assert: announcement isNil.

MolMyUserComponentImpl passivate.
self assert: announcement notNil.
self assert: announcement component equals: component.
self assert: announcement componentName equals: MolUtils defaultComponentName.
self
assert: announcement componentName
equals: MolUtils defaultComponentName.
announcement := nil.

"test by named instanciation"
component2 := MolMyUserComponentImpl instantiate: #myComponent.
MolMyUserComponentImpl activate: #myComponent.
MolMyUserComponentImpl passivate: #myComponent.
self assert: announcement notNil.
self assert: announcement component equals: component2.
self assert: announcement componentName equals: #myComponent.
self assert: announcement componentName equals: #myComponent
]

{ #category : #tests }
MolComponentAnnouncementTest >> testAnnounceRemoved [

| announcement component component2 |
announcement := nil.
SystemAnnouncer uniqueInstance when: MolComponentRemoved do:[ :a | announcement := a ].
SystemAnnouncer uniqueInstance
when: MolComponentRemoved
do: [ :a | announcement := a ]
for: self.

"test by standard instanciation"
MolMyUserComponentImpl deploy.
component := MolMyUserComponentImpl instantiate.
MolMyUserComponentImpl activate.
MolMyUserComponentImpl passivate.
self assert: announcement isNil.

MolMyUserComponentImpl remove.
self assert: announcement notNil.
self assert: announcement component equals: component.
self assert: announcement componentName equals: MolUtils defaultComponentName.
self
assert: announcement componentName
equals: MolUtils defaultComponentName.
announcement := nil.

"test by named instanciation"
component2 := MolMyUserComponentImpl instantiate: #myComponent.
MolMyUserComponentImpl activate: #myComponent.
MolMyUserComponentImpl passivate: #myComponent.
self assert: announcement isNil.

MolMyUserComponentImpl remove: #myComponent.
self assert: announcement notNil.
self assert: announcement component equals: component2.
self assert: announcement componentName equals: #myComponent.
self assert: announcement componentName equals: #myComponent
]
31 changes: 21 additions & 10 deletions src/Molecule-Tests/MolComponentManagerTest.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,29 @@ MolComponentManagerTest >> testCleanUp [

{ #category : #tests }
MolComponentManagerTest >> testCleanUpAnnouncements [
| announcement list selection |
announcement := nil.
SystemAnnouncer uniqueInstance when: MolComponentInstantiated do:[ :a | announcement := a ].
SystemAnnouncer uniqueInstance when: MolComponentPassivated do:[ :a | announcement := a ].
SystemAnnouncer uniqueInstance when: MolComponentInstantiated do:[ :a | announcement := a ].

| announcement list selection |
announcement := nil.
SystemAnnouncer uniqueInstance
when: MolComponentInstantiated
do: [ :a | announcement := a ]
for: self.
SystemAnnouncer uniqueInstance
when: MolComponentPassivated
do: [ :a | announcement := a ].
SystemAnnouncer uniqueInstance
when: MolComponentInstantiated
do: [ :a | announcement := a ].
list := MolAnnouncement withAllSubclasses.
selection := SystemAnnouncer uniqueInstance subscriptions subscriptions select: [ :e | list includes: e announcementClass] .
self assert: (selection size > 0).
selection := SystemAnnouncer uniqueInstance subscriptions
subscriptions select: [ :e |
list includes: e announcementClass ].
self assert: selection size > 0.
MolComponentManager cleanupMolAnnouncements.
selection := SystemAnnouncer uniqueInstance subscriptions subscriptions select: [ :e | list includes: e announcementClass] .
self assert: (selection size = 0).

selection := SystemAnnouncer uniqueInstance subscriptions
subscriptions select: [ :e |
list includes: e announcementClass ].
self assert: selection size = 0
]

{ #category : #'tests - general' }
Expand Down
Loading