Smalltalk removal in refactoring

tesonep · Sep 21, 2019 · 0c61fbb · 0c61fbb
1 parent 3acbdee
commit 0c61fbb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/Refactoring-Tests-Changes/RBRefactoringChangeTest.class.st b/src/Refactoring-Tests-Changes/RBRefactoringChangeTest.class.st
@@ -16,7 +16,7 @@ RBRefactoringChangeTest class >> packageNamesUnderTest [
 
 { #category : #mocking }
 RBRefactoringChangeTest >> changeMock [
-	^ Smalltalk globals at: #RBRefactoringChangeMock
+	^ aTestEnvironment at: #RBRefactoringChangeMock
 ]
 
 { #category : #mocking }
@@ -73,7 +73,7 @@ RBRefactoringChangeTest >> perform: aChange do: aBlock [
 
 { #category : #mocking }
 RBRefactoringChangeTest >> removeMockClass [
-	Smalltalk globals removeClassNamed: #RBRefactoringChangeMock.
+	aTestEnvironment removeClassNamed: #RBRefactoringChangeMock.
 ]
 
 { #category : #mocking }

diff --git a/src/Refactoring-Tests-Core/RBPullUpMethodTest.class.st b/src/Refactoring-Tests-Core/RBPullUpMethodTest.class.st
@@ -97,7 +97,7 @@ RBPullUpMethodTest >> testPullUpWhenSuperClassDoesNotDirectlyImplement [
 	classes := #(#ClassA #ClassB #ClassC)
 		inject: OrderedCollection new
 		into: [ :sum :each | 
-			Smalltalk globals
+			aTestEnvironment
 				at: each
 				ifPresent: [ :class | 
 					sum

diff --git a/src/Refactoring-Tests-Core/RBRefactoringTest.class.st b/src/Refactoring-Tests-Core/RBRefactoringTest.class.st
@@ -14,7 +14,7 @@ RBRefactoringTest >> abstractVariableTestData [
 	classes := #(#Bar #Foo) 
 		inject: OrderedCollection new 
 		into: [ :sum :each | 
-			Smalltalk globals at: each ifPresent: [ :class | 
+			aTestEnvironment at: each ifPresent: [ :class | 
 				sum add: class; add: class class ].
 			sum ].
 	classEnvironment := RBClassEnvironment classes: classes.

diff --git a/src/Refactoring-Tests-Environment/RBBrowserEnvironmentTest.class.st b/src/Refactoring-Tests-Environment/RBBrowserEnvironmentTest.class.st
@@ -80,7 +80,7 @@ RBBrowserEnvironmentTest >> keysFor: aBrowserEnvironment [
 	| allKeys |
 	allKeys := IdentitySet withAll: aBrowserEnvironment keys.
 	allKeys addAll: aBrowserEnvironment not keys.
-	allKeys removeAll: Smalltalk globals keys.
+	allKeys removeAll: aTestEnvironment keys.
 	self assertEmpty: allKeys
 ]
 

diff --git a/src/Refactoring2-Transformations-Tests/RBTransformationTest.class.st b/src/Refactoring2-Transformations-Tests/RBTransformationTest.class.st
@@ -15,7 +15,7 @@ RBTransformationTest >> abstractVariableTestData [
 	classes := #(#Bar #Foo) 
 		inject: OrderedCollection new 
 		into: [ :sum :each | 
-			Smalltalk globals at: each ifPresent: [ :class | 
+			aTestEnvironment at: each ifPresent: [ :class | 
 				sum add: class; add: class class ].
 			sum ].
 	classEnvironment := RBClassEnvironment classes: classes.
@@ -79,7 +79,7 @@ RBTransformationTest >> abstractVariableTestData [
 { #category : #mocking }
 RBTransformationTest >> changeMock [
 
-	^ Smalltalk globals at: #RBRefactoringChangeMock
+	^ aTestEnvironment at: #RBRefactoringChangeMock
 ]
 
 { #category : #mocking }
@@ -134,7 +134,7 @@ RBTransformationTest >> proceedThroughWarning: aBlock [
 { #category : #mocking }
 RBTransformationTest >> removeMockClass [
 
-	Smalltalk globals removeClassNamed: #RBRefactoringChangeMock.
+	aTestEnvironment removeClassNamed: #RBRefactoringChangeMock.
 ]
 
 { #category : #running }