FIx tests.

jecisc · Oct 27, 2019 · a036e60 · a036e60
1 parent f2522bb
commit a036e60
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/Gofer-Core/RPackageSet.extension.st b/src/Gofer-Core/RPackageSet.extension.st
@@ -2,17 +2,12 @@ Extension { #name : #RPackageSet }
 
 { #category : #'*Gofer-Core' }
 RPackageSet >> classesAndMetaClasses [
-	^ self
-		collectFromAllPackages: [ :p | 
-			OrderedCollection new
-				addAll: p definedClasses;
-				addAll: (p definedClasses collect: [ :each | each classSide ]);
-				yourself ]
+	^ self packages
+		flatCollect: [ :p | p definedClasses , (p definedClasses collect: [ :each | each classSide ]) ]
 ]
 
 { #category : #'*Gofer-Core' }
 RPackageSet >> coreCategoriesForClass: aClass [
-	^ self
-		collectFromAllPackages: [ :p | p organization categories reject: [ :cat | p isForeignClassExtension: cat ] ]
-		with: aClass
+	^ self packages
+		flatCollect: [ :p | aClass organization categories reject: [ :cat | p isForeignClassExtension: cat ] ]
 ]