Change implementation by trap bytecode methods with patched literals

src/BaselineOfMethodProxies/BaselineOfMethodProxies.class.st

@@ -9,13 +9,15 @@ BaselineOfMethodProxies >> baseline: spec [
 
 	<baseline>
 	spec for: #common do: [
-			spec package: #MethodProxies;
+		spec
+			package: #MethodProxies;
 			package: #'MethodProxies-Tests'
-			with: [ spec requires: #( #MethodProxies ) ];
+			with: [ spec requires: #( #MethodProxies #MethodProxiesExamples ) ];
 			package: #MethodProxiesExamples
 			with: [ spec requires: #( #MethodProxies ) ];
 			package: #'MethodProxiesExamples-Tests'
-			with: [ spec requires: #( #MethodProxiesExamples ) ].
+			with: [
+				spec requires: #( #'MethodProxies-Tests' ) ].
 
 		spec
 			group: 'Core' with: #( #MethodProxies );

src/MethodProxies-Tests/MpAbstractMethodProxyTest.class.st

@@ -0,0 +1,55 @@
+Class {
+	#name : #MpAbstractMethodProxyTest,
+	#superclass : #TestCase,
+	#instVars : [
+		'trackedWrappers'
+	],
+	#category : #'MethodProxies-Tests'
+}
+
+{ #category : #testing }
+MpAbstractMethodProxyTest class >> isAbstract [
+
+	^ self == MpAbstractMethodProxyTest
+]
+
+{ #category : #'tests - dead representation' }
+MpAbstractMethodProxyTest >> installMethodProxy: aMethodProxy [
+
+	trackedWrappers add: aMethodProxy.
+	aMethodProxy install.
+
+]
+
+{ #category : #initialization }
+MpAbstractMethodProxyTest >> setUp [
+
+	super setUp.
+	trackedWrappers := OrderedCollection new
+]
+
+{ #category : #initialization }
+MpAbstractMethodProxyTest >> tearDown [
+
+	| stillInstalled |
+
+	"Uninstall proxies using a fixed point approach.
+	This is to cover a problem of proxies wrapping proxies for now"
+	[
+	stillInstalled := trackedWrappers select: [ :e | e isInstalled ].
+	stillInstalled isEmpty ] whileFalse: [
+		stillInstalled do: [ :each |
+			[
+			each uninstall.
+			trackedWrappers remove: each ]
+				on: Error
+				do: [ :e | "continue" ] ] ].
+
+	"Give me the guarantee that we did not leave proxies installed in the system"
+	(MpMethodProxy allInstances anySatisfy: [ :e | e isInstalled ])
+		ifTrue: [
+			self error:
+				'Proxies still installed after test: ' , testSelector asString ].
+
+	super tearDown
+]

src/MethodProxies-Tests/MpAfterResultHandler.class.st

@@ -0,0 +1,26 @@
+Class {
+	#name : #MpAfterResultHandler,
+	#superclass : #MpHandler,
+	#instVars : [
+		'count'
+	],
+	#category : #'MethodProxies-Tests'
+}
+
+{ #category : #evaluating }
+MpAfterResultHandler >> afterExecutionWithReceiver: anObject arguments: anArrayOfObjects returnValue: aReturnValue [
+
+	^ 'trapped [', aReturnValue asString, ']'
+]
+
+{ #category : #accessing }
+MpAfterResultHandler >> count [
+	^ count
+]
+
+{ #category : #evaluating }
+MpAfterResultHandler >> initialize [
+
+	super initialize.
+	count := 0
+]

src/MethodProxies-Tests/MpClassA.class.st

@@ -32,8 +32,8 @@ MpClassA >> methodLastingOneSecond [
 
 { #category : #debugging }
 MpClassA >> methodOne [
+
 	^ 101
-
 ]
 
 { #category : #debugging }