Remove smalltalk refs in metacello

astares · Sep 21, 2019 · 6e244d0 · 6e244d0
1 parent 5d335e9
commit 6e244d0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/Metacello-TestsMC/MetacelloDictionaryRepositoryTest.class.st b/src/Metacello-TestsMC/MetacelloDictionaryRepositoryTest.class.st
@@ -124,9 +124,9 @@ MetacelloDictionaryRepositoryTest >> tearDown [
 	aGofer := Gofer new.
 	self tearDownPackages: aGofer.
 	aGofer references notEmpty ifTrue: [ aGofer metacelloUnload ].
-	Smalltalk globals removeKey: #Metacello_Gofer_Test_Repository ifAbsent: [  ].
-	Smalltalk globals removeKey: #Metacello_Configuration_Test_Repository ifAbsent: [  ].
-	Smalltalk globals removeKey: #Metacello_Configuration_Test_Alternate_Repository ifAbsent: [  ].
+	aTestEnvironment removeKey: #Metacello_Gofer_Test_Repository ifAbsent: [  ].
+	aTestEnvironment removeKey: #Metacello_Configuration_Test_Repository ifAbsent: [  ].
+	aTestEnvironment removeKey: #Metacello_Configuration_Test_Alternate_Repository ifAbsent: [  ].
 	self tempRepositories do: [ :repo | MCRepositoryGroup default removeIdenticalRepository: repo ].
 	MetacelloPlatform current reenableUndefinedSybolUpdates: undefinedSymbols.
 	finalWorkingCopyList := MCWorkingCopy allManagers collect: [ :each | each packageName ].

diff --git a/src/Metacello-TestsMC/MetacelloExternalScriptingTestCase.class.st b/src/Metacello-TestsMC/MetacelloExternalScriptingTestCase.class.st
@@ -16,6 +16,6 @@ MetacelloExternalScriptingTestCase >> tearDownRepositories [
   MCRepositoryGroup default
     removeIdenticalRepository:
       (Smalltalk at: #'Metacello_XXX_Test_Repository' ifAbsent: [  ]).
-  Smalltalk globals removeKey: #'Metacello_Config_Test_Repository' ifAbsent: [  ].
-  Smalltalk globals removeKey: #'Metacello_XXX_Test_Repository' ifAbsent: [  ]
+  aTestEnvironment removeKey: #'Metacello_Config_Test_Repository' ifAbsent: [  ].
+  aTestEnvironment removeKey: #'Metacello_XXX_Test_Repository' ifAbsent: [  ]
 ]
diff --git a/src/Metacello-TestsMC/MetacelloIssueTestCase.class.st b/src/Metacello-TestsMC/MetacelloIssueTestCase.class.st
@@ -97,12 +97,12 @@ MetacelloIssueTestCase >> tearDown [
     ifTrue: [ aGofer metacelloUnload ].
   MCRepositoryGroup default
     removeIdenticalRepository:
-        (Smalltalk globals at: #'Metacello_Gofer_Test_Repository' ifAbsent: [  ]);
+        (aTestEnvironment at: #'Metacello_Gofer_Test_Repository' ifAbsent: [  ]);
     removeIdenticalRepository:
-        (Smalltalk globals at: #'Metacello_Configuration_Test_Repository' ifAbsent: [  ]);
+        (aTestEnvironment at: #'Metacello_Configuration_Test_Repository' ifAbsent: [  ]);
     yourself.
-  Smalltalk globals removeKey: #'Metacello_Gofer_Test_Repository' ifAbsent: [  ].
-  Smalltalk globals removeKey: #'Metacello_Configuration_Test_Repository' ifAbsent: [  ].
+  aTestEnvironment removeKey: #'Metacello_Gofer_Test_Repository' ifAbsent: [  ].
+  aTestEnvironment removeKey: #'Metacello_Configuration_Test_Repository' ifAbsent: [  ].
   finalWorkingCopyList := MCWorkingCopy allManagers
     collect: [ :each | each packageName ].
   diff := finalWorkingCopyList difference: initialWorkingCopyList.

diff --git a/src/Metacello-TestsMC/MetacelloScriptingTestCase.class.st b/src/Metacello-TestsMC/MetacelloScriptingTestCase.class.st
@@ -93,9 +93,9 @@ MetacelloScriptingTestCase >> tearDownRepositories [
     ifTrue: [ MetacelloPlatform current recursiveDelete: externalDirectory ].
   sampleDirectory exists
     ifTrue: [ MetacelloPlatform current recursiveDelete: sampleDirectory ].
-  Smalltalk globals removeKey: #'Metacello_Configuration_Test_Repository' ifAbsent: [  ].
-  Smalltalk globals removeKey: #'Metacello_Gofer_Test_Repository' ifAbsent: [  ].
-  Smalltalk globals
+  aTestEnvironment removeKey: #'Metacello_Configuration_Test_Repository' ifAbsent: [  ].
+  aTestEnvironment removeKey: #'Metacello_Gofer_Test_Repository' ifAbsent: [  ].
+  aTestEnvironment
     removeKey: #'Metacello_MczConfiguration_Test_Repository'
     ifAbsent: [  ].
   MCRepositoryGroup default

diff --git a/src/Metacello-TestsPlatform/MetacelloRepositorySqueakCommonTestCase.class.st b/src/Metacello-TestsPlatform/MetacelloRepositorySqueakCommonTestCase.class.st
@@ -119,7 +119,7 @@ MetacelloRepositorySqueakCommonTestCase >> setUp [
 { #category : #running }
 MetacelloRepositorySqueakCommonTestCase >> tearDown [
 
-    Smalltalk globals removeKey: #'Metacello_Platform_Test_GlobalDictionary' ifAbsent: [  ].
+    aTestEnvironment removeKey: #'Metacello_Platform_Test_GlobalDictionary' ifAbsent: [  ].
 	super tearDown
 ]