Merge pull request #218 from OpenSmock/dev-217

fix #217

Author: LabordePierre

src/Molecule-Tests/MolComponentFactoryTest.class.st

@@ -264,6 +264,18 @@ MolComponentFactoryTest >> testCollectComponentConnectionTraits [
 	self assert: (traits includes: MolUsedParameters).
 ]
 
+{ #category : #tests }
+MolComponentFactoryTest >> testCollectComponentConnectionTraitsOrder [
+	"This test check the order of the traits collect: events, services and parameters. This is necessary to control the order to not change generated code in existing components"
+	
+	| traits |
+	traits := MolComponentFactory default collectComponentConnectionTraits: MolCompleteComponentImpl.
+	self assert: traits size equals: 3.
+	self assert: (traits at: 1) equals: MolUsedEvents.
+	self assert: (traits at: 2) equals: MolUsedServices.
+	self assert: (traits at: 3) equals: MolUsedParameters
+]
+
 { #category : #tests }
 MolComponentFactoryTest >> testComponentChangedOnComponentCreationWithoutType [
 	"Create a class, edit this class from different ways and check if the factory define the component or not"
@@ -1338,90 +1350,78 @@ MolComponentFactoryTest >> testRebuildComponentAccessorsFor [
 MolComponentFactoryTest >> testRemoveOverloadedConsumedEvents [
 	"Testing issue #210 fix"
 
-	| exception |
-	exception := nil.
 	"Remove the method which overload the services contract: no error should appears"
-	[ MolCompleteComponentOverloadImpl class removeSelector: #consumedComponentEvents ]
+
+	[
+	MolCompleteComponentOverloadImpl class removeSelector:
+		#consumedComponentEvents ]
 		on: Exception
-		do: [ :e | exception := e ].
-		
-	exception ifNotNil: [ exception signal ].
-	self assert: exception isNil.
+		do: [ :e | e signal ]
 ]
 
 { #category : #'test - overload' }
 MolComponentFactoryTest >> testRemoveOverloadedProducedEvents [
 	"Testing issue #210 fix"
 
-	| exception |
-	exception := nil.
 	"Remove the method which overload the services contract: no error should appears"
-	[ MolCompleteComponentOverloadImpl class removeSelector: #producedComponentEvents ]
+
+	[
+	MolCompleteComponentOverloadImpl class removeSelector:
+		#producedComponentEvents ]
 		on: Exception
-		do: [ :e | exception := e ].
-		
-	exception ifNotNil: [ exception signal ].
-	self assert: exception isNil.
+		do: [ :e | e signal ]
 ]
 
 { #category : #'test - overload' }
 MolComponentFactoryTest >> testRemoveOverloadedProvidedParameters [
 	"Testing issue #210 fix"
 
-	| exception |
-	exception := nil.
 	"Remove the method which overload the services contract: no error should appears"
-	[ MolCompleteComponentOverloadImpl class removeSelector: #providedComponentParameters ]
-		on: Exception
-		do: [ :e | exception := e ].
 
-	exception ifNotNil: [ exception signal ].
-	self assert: exception isNil.
+	[
+	MolCompleteComponentOverloadImpl class removeSelector:
+		#providedComponentParameters ]
+		on: Exception
+		do: [ :e | e signal ]
 ]
 
 { #category : #'test - overload' }
 MolComponentFactoryTest >> testRemoveOverloadedProvidedServices [
 	"Testing issue #210 fix"
 
-	| exception |
-	exception := nil.
 	"Remove the method which overload the services contract: no error should appears"
-	[ MolCompleteComponentOverloadImpl class removeSelector: #providedComponentServices ]
-		on: Exception
-		do: [ :e | exception := e ].
 
-	exception ifNotNil: [ exception signal ].
-	self assert: exception isNil.
+	[
+	MolCompleteComponentOverloadImpl class removeSelector:
+		#providedComponentServices ]
+		on: Exception
+		do: [ :e | e signal ]
 ]
 
 { #category : #'test - overload' }
 MolComponentFactoryTest >> testRemoveOverloadedUsedParameters [
 	"Testing issue #210 fix"
 
-	| exception |
-	exception := nil.
 	"Remove the method which overload the services contract: no error should appears"
-	[ MolCompleteComponentOverloadImpl class removeSelector: #usedComponentParameters ]
-		on: Exception
-		do: [ :e | exception := e ].
 
-	exception ifNotNil: [ exception signal ].
-	self assert: exception isNil.
+	[
+	MolCompleteComponentOverloadImpl class removeSelector:
+		#usedComponentParameters ]
+		on: Exception
+		do: [ :e | e signal ]
 ]
 
 { #category : #'test - overload' }
 MolComponentFactoryTest >> testRemoveOverloadedUsedServices [
 	"Testing issue #210 fix"
 
-	| exception |
-	exception := nil.
 	"Remove the method which overload the services contract: no error should appears"
-	[ MolCompleteComponentOverloadImpl class removeSelector: #usedComponentServices ]
+
+	[
+	MolCompleteComponentOverloadImpl class removeSelector:
+		#usedComponentServices ]
 		on: Exception
-		do: [ :e | exception := e ].
-		
-	exception ifNotNil: [ exception signal ].
-	self assert: exception isNil
+		do: [ :e | e signal ]
 ]
 
 { #category : #'test - overload' }

src/Molecule/MolComponentFactory.class.st

@@ -426,17 +426,17 @@ MolComponentFactory >> activateDynamicContractUpdate: isInform [
 MolComponentFactory >> checkAndRebuildUsedTraitList: aTraitList inComponentClass: aComponentClass [
 	"Check if a Component Class uses a list of Trait Class and do uses"
 	| traitList toAddTraits toRemoveTraits |
-	
+
 	traitList := self collectComponentConnectionTraits: aComponentClass.
 
 	"added traits"
-	toAddTraits := aTraitList reject: [ :e | (traitList includes: e) or:[ e isObsolete ] ].
+	toAddTraits := self sortTraits: (aTraitList reject: [ :e | (traitList includes: e) or:[ e isObsolete ] ]).
 	toAddTraits ifNotEmpty:[
 		self rebuildComponent: aComponentClass traitsAdding: toAddTraits.
 	].
 
 	"removed traits"
-	toRemoveTraits := traitList reject: [ :e | aTraitList includes: e ].
+	toRemoveTraits := self sortTraits: (traitList reject: [ :e | aTraitList includes: e ]).
 	toRemoveTraits ifNotEmpty:[
 		self rebuildComponent: aComponentClass traitsRemoving: toRemoveTraits.
 	].
@@ -446,13 +446,12 @@ MolComponentFactory >> checkAndRebuildUsedTraitList: aTraitList inComponentClass
 MolComponentFactory >> collectComponentConnectionTraits: aComponentOrAComponentClass [
 	"Collect a Component Traits : Services, Events and Parameters"
 	| componentClass |
-	aComponentOrAComponentClass ifNil:[^OrderedCollection new].
+	aComponentOrAComponentClass ifNil:[ ^ OrderedCollection new ].
+	
 	componentClass := aComponentOrAComponentClass isClass ifTrue:[aComponentOrAComponentClass] ifFalse:[aComponentOrAComponentClass class].
-	componentClass isComponentClass ifFalse:[^OrderedCollection new].
+	componentClass isComponentClass ifFalse:[ ^ OrderedCollection new ].
 
-	^ componentClass traitComposition allTraits select: [ :e |
-		e isComponentServices or:[e isComponentEvents or:[e isComponentParameters]]	
-	]
+	^ self sortTraits: (componentClass traitComposition allTraits)
 ]
 
 { #category : #announcements }
@@ -1064,3 +1063,14 @@ MolComponentFactory >> removeOldUsedParametersAndServicesComponentAccessorsFor:
 
 	toBeRemoveProviderSelectors do: [ :s | aComponent removeSelector: s ]
 ]
+
+{ #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 ].
+	
+	^ (OrderedCollection withAll: events) addAll: services; addAll: parameters; removeDuplicates; yourself
+]