From e299ca3b35775eea458e9f2c67d27e700ed2dc2e Mon Sep 17 00:00:00 2001
From: Pavel Krivanek <pavel.krivanek@gmail.com>
Date: Mon, 23 Apr 2018 13:01:32 +0200
Subject: [PATCH 1/2] clean additional method dictionaries

---
 src/TraitsV2/TraitedMetaclass.class.st | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/TraitsV2/TraitedMetaclass.class.st b/src/TraitsV2/TraitedMetaclass.class.st
index 498cdaca627..30a42c4951d 100644
--- a/src/TraitsV2/TraitedMetaclass.class.st
+++ b/src/TraitsV2/TraitedMetaclass.class.st
@@ -258,6 +258,18 @@ TraitedMetaclass >> localSelectors [
 	^ localMethods keys
 ]
 
+{ #category : #'initialize-release' }
+TraitedMetaclass >> obsolete [
+
+	super obsolete.
+	self canZapMethodDictionary
+		ifTrue: [
+			localMethods := self emptyMethodDictionary.
+			baseLocalMethods := self emptyMethodDictionary].
+	
+
+]
+
 { #category : #initialization }
 TraitedMetaclass >> rebuildMethodDictionary [
 	| selectors removedSelectors modified |

From 5083e319f7c70758270b01f59d9aa3bcfe5af9ac Mon Sep 17 00:00:00 2001
From: Pablo Tesone <tesonep@gmail.com>
Date: Tue, 24 Apr 2018 10:35:44 +0200
Subject: [PATCH 2/2] Adding Tests to making obsolete a class.$

---
 .../T2ObsoleteClassTest.class.st              | 127 ++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 src/TraitsV2-Tests/T2ObsoleteClassTest.class.st

diff --git a/src/TraitsV2-Tests/T2ObsoleteClassTest.class.st b/src/TraitsV2-Tests/T2ObsoleteClassTest.class.st
new file mode 100644
index 00000000000..bba1f69c1fe
--- /dev/null
+++ b/src/TraitsV2-Tests/T2ObsoleteClassTest.class.st
@@ -0,0 +1,127 @@
+Class {
+	#name : #T2ObsoleteClassTest,
+	#superclass : #T2AbstractTest,
+	#category : #'TraitsV2-Tests'
+}
+
+{ #category : #tests }
+T2ObsoleteClassTest >> testObsoleteClassIsRemovedFromUsers [
+	| t1 t2 c1 |
+	t1 := self newTrait: #T1 with: #() uses: {}.
+	t2 := self newTrait: #T2 with: #() uses: {}.
+
+	c1 := self newClass: #C1 with: #()  uses:  t1 + t2.
+		
+	self assert: (t1 users includes: c1).
+	self assert: (t2 users includes: c1).	
+	
+	c1 removeFromSystem.
+	createdClasses remove: c1.
+	
+	self deny: (t1 users includes: c1).
+	self deny: (t2 users includes: c1).	
+
+]
+
+{ #category : #tests }
+T2ObsoleteClassTest >> testObsoleteClassIsRemovedFromUsersClassSide [
+	| t1 t2 c1 |
+	t1 := self newTrait: #T1 with: #() uses: {}.
+	t2 := self newTrait: #T2 with: #() uses: {}.
+
+	c1 := self newClass: #C1 with: #()  uses: {}.
+	c1 class setTraitComposition: t1 + t2. 
+		
+	self assert: (t1 users includes: c1 class).
+	self assert: (t2 users includes: c1 class).	
+	
+	c1 removeFromSystem.
+	createdClasses remove: c1.
+	
+	self deny: (t1 users includes: c1 class).
+	self deny: (t2 users includes: c1 class).	
+
+]
+
+{ #category : #tests }
+T2ObsoleteClassTest >> testObsoleteClassRemovesMethods [
+	| t1 t2 c1 |
+	t1 := self newTrait: #T1 with: #() uses: {}.
+	t1 compile: 'm1 ^ 1'.
+
+	t2 := self newTrait: #T2 with: #() uses: {}.
+	t2 compile: 'm2 ^ 1'.
+
+	c1 := self newClass: #C1 with: #()  uses:  t1 + t2.
+
+	c1 compile: 'localM1 ^ 1'.
+
+	self assert: (c1 methodDict includesKey: #m1).
+	self assert: (c1 methodDict includesKey: #m2).
+	self deny: (c1 localMethodDict includesKey: #m1).
+	self deny: (c1 localMethodDict includesKey: #m2).
+	self assert: (c1 localMethodDict includesKey: #localM1).
+	
+	c1 removeFromSystem.
+	createdClasses remove: c1.
+	
+	self deny: (c1 methodDict includesKey: #m1).
+	self deny: (c1 methodDict includesKey: #m2).
+	
+	"Accessing directly because there is no more accesor method"
+	self assert: (c1 class instVarNamed: #baseLocalMethods) isEmpty.
+	self deny: ((c1 class instVarNamed: #baseLocalMethods) includesKey: #m1).
+	self deny: ((c1 class instVarNamed: #baseLocalMethods) includesKey: #m2).
+	self deny: ((c1 class instVarNamed: #baseLocalMethods) includesKey: #localM1).
+
+]
+
+{ #category : #tests }
+T2ObsoleteClassTest >> testObsoleteClassRemovesMethodsClassSide [
+	| t1 t2 c1 |
+	t1 := self newTrait: #T1 with: #() uses: {}.
+	t1 compile: 'm1 ^ 1'.
+
+	t2 := self newTrait: #T2 with: #() uses: {}.
+	t2 compile: 'm2 ^ 1'.
+
+	c1 := self newClass: #C1 with: #()  uses: {}.
+	c1 class setTraitComposition: t1 + t2. 
+
+	c1 class compile: 'localM1 ^ 1'.
+
+	self assert: (c1 class methodDict includesKey: #m1).
+	self assert: (c1 class methodDict includesKey: #m2).
+	self deny: (c1 class localMethodDict includesKey: #m1).
+	self deny: (c1 class localMethodDict includesKey: #m2).
+	self assert: (c1 class localMethodDict includesKey: #localM1).
+	
+	c1 removeFromSystem.
+	createdClasses remove: c1.
+	
+	self deny: (c1 class methodDict includesKey: #m1).
+	self deny: (c1 class methodDict includesKey: #m2).
+	self deny: (c1 class localMethodDict includesKey: #m1).
+	self deny: (c1 class localMethodDict includesKey: #m2).
+	self deny: (c1 class localMethodDict includesKey: #localM1).
+
+]
+
+{ #category : #tests }
+T2ObsoleteClassTest >> testObsoleteTraitIsRemovedFromUsers [
+	| t1 t2 t3 |
+	t1 := self newTrait: #T1 with: #() uses: {}.
+	t2 := self newTrait: #T2 with: #() uses: {}.
+
+	t3 := self newTrait: #T3 with: #()  uses:  t1 + t2.
+		
+	self assert: (t1 users includes: t3).
+	self assert: (t2 users includes: t3).	
+	
+	t3 removeFromSystem.
+	createdClasses remove: t3.
+	
+	self deny: (t1 users includes: t3).
+	self deny: (t2 users includes: t3).	
+
+]