make class package work across all Pharo versions for generating test classes

Johan Brichau · Johan Brichau · commit 203d08e83154 · 2024-02-04T16:14:52.000+01:00
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf..st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf..st
@@ -1,20 +1,4 @@
 accessing-code
 defineSubClassOf: aSuperSymbol
 
-	| class |
-	class := SystemVersion current major >= 12
-		         ifTrue: [
-			         factory make: [ :aBuilder |
-				         aBuilder
-					         superclass: (Smalltalk at: aSuperSymbol);
-					         package: self category ] ]
-		         ifFalse: [
-			         factory
-				         newSubclassOf: (Smalltalk at: aSuperSymbol)
-				         instanceVariableNames: ''
-				         classVariableNames: 'classVarsString'
-				         category: self category ].
-	environment
-		addClass: class;
-		addClass: class classSide.
-	^ class
+	^ self defineSubClassOf: aSuperSymbol inPackage: self category
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf.inPackage..st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf.inPackage..st
@@ -0,0 +1,20 @@
+accessing-code
+defineSubClassOf: aSuperSymbol inPackage: packageName
+
+	| class |
+	class := SystemVersion current major >= 12
+		         ifTrue: [
+			         factory make: [ :aBuilder |
+				         aBuilder
+					         superclass: (Smalltalk at: aSuperSymbol);
+					         package: packageName ] ]
+		         ifFalse: [
+			         factory
+				         newSubclassOf: (Smalltalk at: aSuperSymbol)
+				         instanceVariableNames: ''
+				         classVariableNames: 'classVarsString'
+				         category: packageName ].
+	environment
+		addClass: class;
+		addClass: class classSide.
+	^ class
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st
@@ -2,8 +2,7 @@ tests-block
 testReferencesNotPortableClass
 
 	| class |
-	class := self defineSubClassOf: #GRObject.
-	class package: 'SomeCategory' tag: ''.
+	class := self defineSubClassOf: #GRObject inPackage: 'SomeCategory'.
 	self compile: 'invalid ^ Semaphore new' in: class.
 	self compile: 'valid ^ GRObject new' in: class.
 	self 
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st
@@ -2,8 +2,7 @@ tests-block
 testSubclassesNotPortableClass
 
 	| class |
-	class := self defineSubClassOf: #Mutex.
-	class package: 'SomeCategory' tag: ''.
+	class := self defineSubClassOf: #Mutex inPackage: 'SomeCategory'.
 	self 
 		assertRule: GRSubclassesNotPortableClassRule
 		matches: { class }
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st
@@ -2,8 +2,7 @@ tests-block
 testUsesNotPortableClass
 
 	| class |
-	class := self defineSubClassOf: #GRObject.
-	class package: 'SomeCategory' tag: ''.
+	class := self defineSubClassOf: #GRObject inPackage: 'SomeCategory'.
 	self compile: 'invalid ^ Semaphore new' in: class.
 	self compile: 'valid ^ GRObject new' in: class.
 	self 
