make thisContext test work for Squeak

Johan Brichau · Johan Brichau · commit 1d8daee7641b · 2022-04-09T15:24:54.000+02:00
diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/version.st b/repository/Grease-Core.package/GRPlatform.class/instance/version.st
@@ -2,5 +2,5 @@ version info
 version
 	"Answer the Grease version"
 
-	^ (GRVersion major: 1 minor: 8 revision: 2)
+	^ (GRVersion major: 1 minor: 9 revision: 0)
 		yourself
diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testThisContext.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testThisContext.st
@@ -1,18 +1,27 @@
 tests
 testThisContext
-	| methodContext block |
+	| methodContext block ctx |
+	"This is just a basic test to see if thisContext works"
 	methodContext := self platform thisContext.
 	block := [ | blockContext |
-	blockContext := self platform thisContext.
-	self assert: blockContext sender = methodContext.
-	"The following is a difference between Gemstone and Pharo... "
-	(Smalltalk includesKey: #GRGemStonePlatform)
-		ifTrue: [ self assert: blockContext receiver = block ]
-		ifFalse: [ 
-			self assert: blockContext receiver = self.
-			self assert: (blockContext tempNamed: 'blockContext') == blockContext ].
-	self assert: (blockContext tempNamed: 'methodContext') == methodContext ].
+		blockContext := self platform thisContext.
+		self assert: blockContext sender = methodContext.
+		"The following is a difference between Gemstone and Pharo... "
+		(Smalltalk includesKey: #GRGemStonePlatform)
+			ifTrue: [ self assert: blockContext receiver = block ]
+			ifFalse: [ 
+				self assert: blockContext receiver = self.
+				(blockContext respondsTo: #tempNamed:)
+					ifTrue:[ self assert: (blockContext tempNamed: 'blockContext') == blockContext ]
+					ifFalse:[ self assert:  (blockContext namedTempAt: (blockContext tempNames indexOf: #blockContext)) == blockContext ] ].
+		(blockContext respondsTo: #tempNamed:)
+			ifTrue:[ self assert: (blockContext tempNamed: 'methodContext') == methodContext ]
+			ifFalse: [ self assert: (blockContext namedTempAt: (blockContext tempNames indexOf: #methodContext)) == methodContext ] ].
+		
 	block value.
 	self assert: self returnSender = methodContext.
 	self assert: methodContext receiver = self.
-	self assert: (self platform thisContext tempNamed: 'block') == block
+	ctx := self platform thisContext.
+	(ctx respondsTo: #tempNamed:)
+		ifTrue:[	self assert: (ctx tempNamed: 'block') == block ]
+		ifFalse: [ self assert: (ctx namedTempAt: (ctx tempNames indexOf: #block)) == block ]
