fix: #listAtCategoryNamed: has been deprecated in Pharo 12

pharo/run.sh

@@ -15,10 +15,10 @@ pharo::get_image_url() {
   local smalltalk_name=$1
 
   case "${smalltalk_name}" in
-    "Pharo64-alpha")
+    "Pharo64-alpha"|"Pharo-alpha")
       echo "get.pharo.org/64/alpha"
       ;;
-    "Pharo64-stable")
+    "Pharo64-stable"|"Pharo-stable")
       echo "get.pharo.org/64/stable"
       ;;
     "Pharo64-12")
@@ -45,12 +45,15 @@ pharo::get_image_url() {
     "Pharo64-6.0")
       echo "get.pharo.org/64/60"
       ;;
-    "Pharo32-alpha"|"Pharo-alpha")
+    "Pharo32-alpha")
       echo "get.pharo.org/alpha"
       ;;
-    "Pharo32-stable"|"Pharo-stable")
+    "Pharo32-stable")
       echo "get.pharo.org/stable"
       ;;
+    "Pharo32-12")
+        echo "get.pharo.org/32/120"
+        ;;
     "Pharo32-11")
         echo "get.pharo.org/32/110"
         ;;
@@ -142,14 +145,16 @@ moose::get_image_url() {
 ################################################################################
 pharo::get_vm_url() {
   local smalltalk_name=$1
+  local stable_version=11
+  local alpha_version=12
 
   case "${smalltalk_name}" in
     # NOTE: vmLatestXX should be updated every time new Pharo is released
-    "Pharo64-alpha")
-      echo "get.pharo.org/64/vmLatest110"
+    "Pharo64-alpha"|"Pharo-alpha")
+      echo "get.pharo.org/64/vmLatest${alpha_version}0"
       ;;
-    "Pharo64-stable")
-      echo "get.pharo.org/64/vm100"
+    "Pharo64-stable"|"Pharo-stable")
+      echo "get.pharo.org/64/vm${stable_version}0"
       ;;
     "Pharo64-12")
       echo "get.pharo.org/64/vm120"
@@ -175,11 +180,14 @@ pharo::get_vm_url() {
     "Pharo64-6.0")
       echo "get.pharo.org/64/vm60"
       ;;
-    "Pharo32-alpha"|"Pharo-alpha")
-      echo "get.pharo.org/vmLatest110"
+    "Pharo32-alpha")
+      echo "get.pharo.org/vmLatest${alpha_version}0"
       ;;
-    "Pharo-stable"|"Pharo32-stable")
-      echo "get.pharo.org/vm100"
+    "Pharo32-stable")
+      echo "get.pharo.org/vm${stable_version}0"
+      ;;
+    "Pharo32-12")
+      echo "get.pharo.org/vm120"
       ;;
     "Pharo32-11")
       echo "get.pharo.org/vm110"

repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/addLoadedClassesFrom..st

@@ -3,5 +3,5 @@ addLoadedClassesFrom: aDefinitionsCollection
 	| mcOrganization classes |
 	mcOrganization := aDefinitionsCollection detect: [ :def | def isOrganizationDefinition ].
 	mcOrganization ifNil: [ self error: 'Could not find MCOrganizationDefinition' ].
-	classes := SmalltalkCI classesWithCategoryNames: mcOrganization categories.
-	self loadedClasses addAll: classes
+	classes := SmalltalkCI platformClass classesWithCategoryNames: mcOrganization categories.
+	self loadedClasses addAll: classes

repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/instance/testAddLoadedClassesFrom.st → repository/SmalltalkCI-GemStone-Tests.package/SCIGemStoneMonticelloLoadSpecTest.class/instance/testAddLoadedClassesFrom.st

@@ -2,9 +2,10 @@ testing
 testAddLoadedClassesFrom
 	| mcOrganization |
 	self assert: true equals: (self spec loadedClasses isEmpty).
-	
+
 	mcOrganization := MCOrganizationDefinition categories: #('SmalltalkCI-Core' 'SmalltalkCI-Tests').
+
 	self spec addLoadedClassesFrom: {mcOrganization}.
 	self deny: (self spec loadedClasses isEmpty).
 	self assert: (self spec loadedClasses includes: SmalltalkCI).
-	self assert: (self spec loadedClasses includes: SmalltalkCITest).
+	self assert: (self spec loadedClasses includes: SmalltalkCITest)

repository/SmalltalkCI-GemStone-Tests.package/SCIGemStoneMonticelloLoadSpecTest.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "SCIMonticelloLoadSpecTest",
+	"category" : "SmalltalkCI-GemStone-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIGemStoneMonticelloLoadSpecTest",
+	"type" : "normal"
+}

repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/classesInCategory..st

@@ -0,0 +1,6 @@
+class organization
+classesInCategory: aCategory
+	^ (Smalltalk organization tagForCategory: aCategory)
+		ifNotNil: [ :tag |
+			tag classNames collect: [ :className | Smalltalk at: className ] ]
+		ifNil: [ #() ]

repository/SmalltalkCI-Pharo-Tests.package/SCIPharoMonticelloLoadSpecTest.class/instance/testAddLoadedClassesFrom.st

@@ -0,0 +1,17 @@
+testing
+testAddLoadedClassesFrom
+	| mcOrganization |
+	self assert: true equals: (self spec loadedClasses isEmpty).
+
+	mcOrganization := (MCOrganizationDefinition canUnderstand: #categories:)
+		ifTrue: [
+			"Squeak, Pharo < 12"
+			MCOrganizationDefinition categories: #('SmalltalkCI-Core' 'SmalltalkCI-Tests') ]
+		ifFalse: [
+			MCOrganizationDefinition
+				packageName: 'SmalltalkCI'
+				tagNames: #(Core Tests) ].
+
+	self spec addLoadedClassesFrom: {mcOrganization}.
+	self deny: (self spec loadedClasses isEmpty).
+	self assert: (self spec loadedClasses includes: SmalltalkCI)

repository/SmalltalkCI-Pharo-Tests.package/SCIPharoMonticelloLoadSpecTest.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "SCIMonticelloLoadSpecTest",
+	"category" : "SmalltalkCI-Pharo-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoMonticelloLoadSpecTest",
+	"type" : "normal"
+}

repository/SmalltalkCI-Squeak-Tests.package/SCISqueakMonticelloLoadSpecTest.class/instance/testAddLoadedClassesFrom.st

@@ -0,0 +1,11 @@
+testing
+testAddLoadedClassesFrom
+	| mcOrganization |
+	self assert: true equals: (self spec loadedClasses isEmpty).
+
+	mcOrganization := MCOrganizationDefinition categories: #('SmalltalkCI-Core' 'SmalltalkCI-Tests').
+
+	self spec addLoadedClassesFrom: {mcOrganization}.
+	self deny: (self spec loadedClasses isEmpty).
+	self assert: (self spec loadedClasses includes: SmalltalkCI).
+	self assert: (self spec loadedClasses includes: SmalltalkCITest)

repository/SmalltalkCI-Squeak-Tests.package/SCISqueakMonticelloLoadSpecTest.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "SCIMonticelloLoadSpecTest",
+	"category" : "SmalltalkCI-Squeak-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCISqueakMonticelloLoadSpecTest",
+	"type" : "normal"
+}

repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/methodProperties.json

@@ -3,7 +3,6 @@
 		 },
 	"instance" : {
 		"setUp" : "fn 6/9/2016 09:53",
-		"testAddLoadedClassesFrom" : "fn 6/22/2016 10:50",
 		"testIsComplete" : "fn 6/9/2016 10:00",
 		"testRepository" : "fn 6/9/2016 15:23",
 		"testSimple" : "ct 5/15/2021 18:17" } }

tests/pharo_tests.sh

@@ -13,6 +13,15 @@ test_get_image_url() {
   image_url="$(pharo::get_image_url "Pharo32-stable")"
   assertEquals "get.pharo.org/stable" "${image_url}"
 
+  image_url="$(pharo::get_image_url "Pharo64-alpha")"
+  assertEquals "get.pharo.org/64/alpha" "${image_url}"
+
+  image_url="$(pharo::get_image_url "Pharo64-stable")"
+  assertEquals "get.pharo.org/64/stable" "${image_url}"
+
+  image_url="$(pharo::get_image_url "Pharo64-12")"
+  assertEquals "get.pharo.org/64/120" "${image_url}"
+
   image_url="$(pharo::get_image_url "Pharo64-11")"
   assertEquals "get.pharo.org/64/110" "${image_url}"
 
@@ -54,16 +63,19 @@ test_get_vm_url() {
   local vm_url
 
   vm_url="$(pharo::get_vm_url "Pharo32-alpha")"
-  assertEquals "get.pharo.org/vmLatest110" "${vm_url}"
+  assertEquals "get.pharo.org/vmLatest120" "${vm_url}"
 
   vm_url="$(pharo::get_vm_url "Pharo64-alpha")"
-  assertEquals "get.pharo.org/64/vmLatest110" "${vm_url}"
+  assertEquals "get.pharo.org/64/vmLatest120" "${vm_url}"
 
   vm_url="$(pharo::get_vm_url "Pharo32-stable")"
-  assertEquals "get.pharo.org/vm100" "${vm_url}"
+  assertEquals "get.pharo.org/vm110" "${vm_url}"
 
   vm_url="$(pharo::get_vm_url "Pharo64-stable")"
-  assertEquals "get.pharo.org/64/vm100" "${vm_url}"
+  assertEquals "get.pharo.org/64/vm110" "${vm_url}"
+
+  vm_url="$(pharo::get_vm_url "Pharo32-12")"
+  assertEquals "get.pharo.org/vm120" "${vm_url}"
 
   vm_url="$(pharo::get_vm_url "Pharo32-11")"
   assertEquals "get.pharo.org/vm110" "${vm_url}"