Merge pull request #221 from OpenSmock/dev-220

Fix #220

Author: LabordePierre

src/Molecule-Tests/MolCompleteComponentOverloadImpl.class.st

@@ -4,8 +4,8 @@ I am a component impl overloading my contract for impl purpose
 Class {
 	#name : #MolCompleteComponentOverloadImpl,
 	#superclass : #MolAbstractComponentImpl,
-	#traits : 'MolCompleteComponent + MolUsedEvents + MolUsedEvents2 + MolUsedServices2 + MolUsedServices + MolUsedParameters + MolUsedParameters2',
-	#classTraits : 'MolCompleteComponent classTrait + MolUsedEvents classTrait + MolUsedEvents2 classTrait + MolUsedServices2 classTrait + MolUsedServices classTrait + MolUsedParameters classTrait + MolUsedParameters2 classTrait',
+	#traits : 'MolCompleteComponent + MolUsedEvents + MolUsedEvents2 + MolUsedServices + MolUsedServices2 + MolUsedParameters + MolUsedParameters2',
+	#classTraits : 'MolCompleteComponent classTrait + MolUsedEvents classTrait + MolUsedEvents2 classTrait + MolUsedServices classTrait + MolUsedServices2 classTrait + MolUsedParameters classTrait + MolUsedParameters2 classTrait',
 	#category : #'Molecule-Tests-Resources - Components'
 }
 

src/Molecule-Tests/MolComponentFactoryTest.class.st

@@ -271,9 +271,18 @@ MolComponentFactoryTest >> testCollectComponentConnectionTraitsOrder [
 	| traits |
 	traits := MolComponentFactory default collectComponentConnectionTraits: MolCompleteComponentImpl.
 	self assert: traits size equals: 3.
-	self assert: (traits at: 1) equals: MolUsedEvents.
+	self assert: (traits first) equals: MolUsedEvents.
 	self assert: (traits at: 2) equals: MolUsedServices.
-	self assert: (traits at: 3) equals: MolUsedParameters
+	self assert: (traits at: 3) equals: MolUsedParameters.
+	
+	traits := MolComponentFactory default collectComponentConnectionTraits: MolCompleteComponentOverloadImpl.
+	self assert: traits size equals: 6.
+	self assert: (traits first) equals: MolUsedEvents.
+	self assert: (traits at: 2) equals: MolUsedEvents2.
+	self assert: (traits at: 3) equals: MolUsedServices.
+	self assert: (traits at: 4) equals: MolUsedServices2.
+	self assert: (traits at: 5) equals: MolUsedParameters.
+	self assert: (traits at: 6) equals: MolUsedParameters2.
 ]
 
 { #category : #tests }

src/Molecule/MolComponentFactory.class.st

@@ -1067,10 +1067,17 @@ MolComponentFactory >> removeOldUsedParametersAndServicesComponentAccessorsFor:
 { #category : #private }
 MolComponentFactory >> sortTraits: aTraitsList [
 
-	| events services parameters |
-	events := aTraitsList select: [ :e | e isComponentEvents ].
-	services := aTraitsList select: [ :e | e isComponentServices ].
-	parameters := aTraitsList select: [ :e | e isComponentParameters ].
+	| events services parameters sortedBlock |
+	
+	aTraitsList ifEmpty:[ ^ #( ) ].
+	
+	"Sort traits by name"
+	sortedBlock := [ :a :b | a name < b name ].
+	
+	"Collect events, then services, then parameters"
+	events := (aTraitsList select: [ :e | e isComponentEvents ]) asSortedCollection: sortedBlock.
+	services := (aTraitsList select: [ :e | e isComponentServices ]) asSortedCollection: sortedBlock.
+	parameters := (aTraitsList select: [ :e | e isComponentParameters ]) asSortedCollection: sortedBlock.
 
 	^ (OrderedCollection withAll: events) addAll: services; addAll: parameters; removeDuplicates; yourself
 ]