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

Jump to bottom

Fix #2853. When removing a class, also log its contained methods #4832

Merged
merged 1 commit into from
Oct 11, 2019
Merged

Fix #2853. When removing a class, also log its contained methods #4832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions src/Epicea-Tests/EpCodeChangeIntegrationTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,22 @@ EpCodeChangeIntegrationTest >> testClassRemoval [

]

{ #category : #tests }
EpCodeChangeIntegrationTest >> testClassRemovalWithMethods [

| events category |
aClass := classFactory newClass.
category := aClass category.
1 to: 7 do: [:index |
aClass compile: 'inst', index asString.
aClass classSide compile: 'class', index asString ].
aClass removeFromSystem.

events := self allLogEventsWith: EpMethodRemoval.
self assert: events size equals: 14.
self assert: (events allSatisfy: [ :each | each affectedPackageName = category ])
]

{ #category : #tests }
EpCodeChangeIntegrationTest >> testInstanceVariableAddition [

Expand Down
23 changes: 23 additions & 0 deletions src/Epicea/EpMonitor.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,34 @@ EpMonitor >> behaviorRemoved: aClassRemovedAnnouncement [
classRemoved category: aClassRemovedAnnouncement categoryName.
classRemoved package: aClassRemovedAnnouncement packageAffected name.

(aClassRemovedAnnouncement classRemoved methods, aClassRemovedAnnouncement classRemoved classSide methods)
do: [:each | self behaviorRemovedImpliesMethodRemoved: each defaultPackageName: classRemoved package ].

aClassRemovedAnnouncement classAffected isTrait
ifTrue: [ self traitRemoved: classRemoved ]
ifFalse: [ self classRemoved: classRemoved ] ]
]

{ #category : #'announcement handling' }
EpMonitor >> behaviorRemovedImpliesMethodRemoved: aMethodInAnObsoleteBehavior defaultPackageName: aSymbol [
| packageName |
packageName := (RPackageOrganizer default
packageForProtocol: aMethodInAnObsoleteBehavior protocol
inClass: aMethodInAnObsoleteBehavior methodClass) name.

"If the method is local, (belongs to the class being removed) then the package was wrong, and we fix it"
packageName = RPackage defaultPackageName
ifTrue: [ packageName := aSymbol ].

self addEvent:
(EpMethodRemoval method:
(aMethodInAnObsoleteBehavior asEpiceaRingDefinition
parentName: aMethodInAnObsoleteBehavior methodClass originalName;
protocol: aMethodInAnObsoleteBehavior protocol;
package: packageName;
yourself))
]

{ #category : #'announcement handling' }
EpMonitor >> categoryAdded: aCategoryAdded [

Expand Down