Merge pull request #713 from moosetechnology/712-MooseGroup-allTypes-does-not-return-any-FamixTParametricEntity

Fix MooseGroup `allUsing`

Author: jecisc

src/Famix-Test3-Entities/FamixTest3ParametricClass.class.st

@@ -0,0 +1,39 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `concretisations` | `FamixTParametricEntity` | `genericEntity` | `FamixTConcretisation` | concretisations relationships, i.e. known concreteEntities of this type.|
+
+### Incoming dependencies
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `genericEntity` | `FamixTParametricEntity` | `concreteEntity` | `FamixTConcretisation` | genericEntity relationships, i.e. known genericEntity of this type.|
+
+### Other
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `concreteParameters` | `FamixTParametricEntity` | `concreteEntities` | `FamixTConcreteParameterType` | list of concreteParameters|
+| `genericParameters` | `FamixTParametricEntity` | `genericEntities` | `FamixTGenericParameterType` | list of genericParameters|
+
+
+
+"
+Class {
+	#name : #FamixTest3ParametricClass,
+	#superclass : #FamixTest3Class,
+	#traits : 'FamixTParametricEntity',
+	#classTraits : 'FamixTParametricEntity classTrait',
+	#category : #'Famix-Test3-Entities-Entities'
+}
+
+{ #category : #meta }
+FamixTest3ParametricClass class >> annotation [
+
+	<FMClass: #ParametricClass super: #FamixTest3Class>
+	<package: #'Famix-Test3-Entities'>
+	<generated>
+	^ self
+]

src/Famix-Test3-Entities/FamixTest3TEntityCreator.trait.st

@@ -95,6 +95,13 @@ FamixTest3TEntityCreator >> newPackageNamed: aName [
 	^ self add: (FamixTest3Package named: aName)
 ]
 
+{ #category : #'entity creation' }
+FamixTest3TEntityCreator >> newParametricClass [
+
+	<generated>
+	^ self add: FamixTest3ParametricClass new
+]
+
 { #category : #'entity creation' }
 FamixTest3TEntityCreator >> newPrimitiveType [
 

src/Famix-Test3-Tests/FamixTest3MooseQueryTest.class.st

@@ -118,7 +118,7 @@ FamixTest3MooseQueryTest >> testNumberOfInternalProviders [
 
 { #category : #tests }
 FamixTest3MooseQueryTest >> testParentTypes [
-	self assertCollection: self m1 parentTypes hasSameElements: {FamixTWithMethods . FamixTest3Class}
+	self assertCollection: self m1 parentTypes hasSameElements: {FamixTWithMethods . FamixTest3Class . FamixTest3ParametricClass}
 ]
 
 { #category : #tests }

src/Famix-TestGenerators/FamixTest3Generator.class.st

@@ -12,7 +12,8 @@ Class {
 		'typeGroup',
 		'attribute',
 		'access',
-		'package'
+		'package',
+		'parametricClass'
 	],
 	#category : #'Famix-TestGenerators'
 }
@@ -45,8 +46,7 @@ FamixTest3Generator >> defineClasses [
 	primitiveType := builder newClassNamed: #PrimitiveType.
 	reference := builder newClassNamed: #Reference.
 	invocation := builder newClassNamed: #Invocation.
-
-
+	parametricClass := builder newClassNamed: #ParametricClass.
 ]
 
 { #category : #definition }
@@ -57,27 +57,30 @@ FamixTest3Generator >> defineHierarchy [
 	access --|> #TAccess.
 
 	attribute --|> #TAttribute.
-	
+
 	type --|> namedEntity.
 	type --|> #TType.
 
 	classEntity --|> type.
 	classEntity --|> #TClass.
 	classEntity --|> #TPackageable.
 
+	parametricClass --|> classEntity.
+	parametricClass --|> #TParametricEntity.
+
 	method --|> namedEntity.
 	method --|> #TMethod.
-	
+
 	package --|> #TPackage.
-	
+
 	primitiveType --|> type.
 	primitiveType --|> #TWithTypes.
 	primitiveType --|> #TReferenceable.
 
 	reference --|> #TReference.
-	
+
 	invocation --|> #TInvocation.
-	
+
 	"groups"
-	classEntitygroup --|> typeGroup.
+	classEntitygroup --|> typeGroup
 ]

src/Moose-Core-Tests/MooseAbstractGroupTest.class.st

@@ -74,10 +74,10 @@ MooseAbstractGroupTest >> testAllSatisfy [
 
 { #category : #tests }
 MooseAbstractGroupTest >> testAllUsing [
-	group addAll: {FamixTest3Class new . FamixTest3Type new}.
+	group addAll: {FamixTest3Class new . FamixTest3Type new . FamixTest3ParametricClass new}.
 	self should: [ group allUsing: FamixTest3Type ] raise: MooseAllUsingOnClass.
-	self assert: (group allUsing: FamixTClass) size equals: 1.
-	self assert: (group allUsing: FamixTType) size equals: 2
+	self assert: (group allUsing: FamixTClass) size equals: 2.
+	self assert: (group allUsing: FamixTType) size equals: 3.
 ]
 
 { #category : #tests }

src/Moose-Core/MooseAbstractGroup.class.st

@@ -597,8 +597,15 @@ MooseAbstractGroup >> printOn: aStream [
 MooseAbstractGroup >> rawAllUsing: aTrait [
 	"This is an optimization of #allUsing: when we do not need to manipulate a MooseGroup as result."
 
+	| seen |
 	aTrait isTrait ifFalse: [ MooseAllUsingOnClass signal ].
-	^ self entityStorage select: [ :entity | entity class traitComposition includesTrait: aTrait ]
+	seen := IdentitySet new.
+	^ Array streamContents: [ :stream |
+		  aTrait allUsers flattened do: [ :directUser |
+			  directUser withAllSubclasses do: [ :user |
+				  (seen includes: user) ifFalse: [
+					  seen add: user.
+					  stream nextPutAll: (self entityStorage selectAllWithType: user) ] ] ] ]
 ]
 
 { #category : #'adding/removing' }