Merge pull request moosetechnology#11 from Gabriel-Darbord/10-Typo-in…

…-Assignement Fix moosetechnology#10
badetitou · Apr 27, 2023 · 64664af · 64664af
2 parents c83aeb2 + ae2cfb3
commit 64664af
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 37 deletions.
diff --git a/src/Carrefour-FastAndBindingGenerator-Tests/CRFBindingBuildMyClassTest.class.st b/src/Carrefour-FastAndBindingGenerator-Tests/CRFBindingBuildMyClassTest.class.st
@@ -23,7 +23,7 @@ CRFBindingBuildMyClassTest >> testAStringIsCorrectlyBind [
 
 	self
 		assert:
-			(self fastModel allWithType: FASTJavaAssignementExpression) anyOne
+			(self fastModel allWithType: FASTJavaAssignmentExpression) anyOne
 				famixVariable
 		equals:
 			((self famixModel allWithType: FamixJavaAttribute) detect: [ :att | 

diff --git a/src/Carrefour-FastAndBindingGenerator-Tests/CRFBindingTestTest.class.st b/src/Carrefour-FastAndBindingGenerator-Tests/CRFBindingTestTest.class.st
@@ -89,7 +89,7 @@ CRFBindingTestTest >> testHelloUsages [
 ]
 
 { #category : #tests }
-CRFBindingTestTest >> testNewInnerAssignement [
+CRFBindingTestTest >> testNewInnerAssignment [
 	self
 		assert: (self famixModel allLocalVariables select: [ :localVariable | localVariable name = 'innertButton' ]) anyOne fastDeclaration anyOne
 		equals: ((self fastModel allWithType: FASTJavaVariableDeclarator) select: [:variableDeclarator | variableDeclarator variable name = 'innertButton' ]) anyOne. 
@@ -152,9 +152,9 @@ CRFBindingTestTest >> testTypeAccessTest [
 { #category : #tests }
 CRFBindingTestTest >> testVariableDeclarator [
 	self
-		assert: (self famixModel allAttributes select: [ :attribute | attribute name = 'hello' ]) first fastAssignement first
-		equals: (self fastModel allWithType: FASTJavaAssignementExpression) first.
+		assert: (self famixModel allAttributes select: [ :attribute | attribute name = 'hello' ]) first fastAssignment first
+		equals: (self fastModel allWithType: FASTJavaAssignmentExpression) first.
 	self
 		assert: (self famixModel allAttributes select: [ :attribute | attribute name = 'hello' ]) first
-		equals: (self fastModel allWithType: FASTJavaAssignementExpression) first famixVariable 
+		equals: (self fastModel allWithType: FASTJavaAssignmentExpression) first famixVariable 
 ]
diff --git a/src/Carrefour-FastAndBindingGenerator/CRFBinderVisitor.class.st b/src/Carrefour-FastAndBindingGenerator/CRFBinderVisitor.class.st
@@ -163,12 +163,12 @@ CRFBinderVisitor >> visitFASTEntity: aFASTEntity [
 ]
 
 { #category : #visitor }
-CRFBinderVisitor >> visitFASTJavaAssignementExpression: aFASTJavaAssignementExpression [
-	(self determineAttributeWithName: aFASTJavaAssignementExpression variable name from: aFASTJavaAssignementExpression)
+CRFBinderVisitor >> visitFASTJavaAssignmentExpression: aFASTJavaAssignmentExpression [
+	(self determineAttributeWithName: aFASTJavaAssignmentExpression variable name from: aFASTJavaAssignmentExpression)
 		ifNotNil:
-			[ :structuralEntity | structuralEntity fastAssignement add: aFASTJavaAssignementExpression ].
+			[ :structuralEntity | structuralEntity fastAssignment add: aFASTJavaAssignmentExpression ].
 
-	super visitFASTJavaAssignementExpression: aFASTJavaAssignementExpression.
+	super visitFASTJavaAssignmentExpression: aFASTJavaAssignmentExpression.
 ]
 
 { #category : #visitor }
@@ -213,7 +213,7 @@ CRFBinderVisitor >> visitFASTJavaFieldAccess: aFASTJavaFieldAccess [
 		ifNotNil:
 			[ :structuralEntity | structuralEntity fastAccesses add: aFASTJavaFieldAccess ].
 
-	super visitFASTJavaAssignementExpression: aFASTJavaFieldAccess.
+	super visitFASTJavaAssignmentExpression: aFASTJavaFieldAccess.
 ]
 
 { #category : #visitor }

diff --git a/src/Carrefour-Model-Generator/CRFMetamodelGenerator.class.st b/src/Carrefour-Model-Generator/CRFMetamodelGenerator.class.st
@@ -8,7 +8,6 @@ Class {
 		'famixMethod',
 		'fastJavaMethodEntity',
 		'famixStructuralEntity',
-		'fastJavaAssignementExpression',
 		'fastJavaVariableDeclarator',
 		'fastJavaClassProperty',
 		'famixType',
@@ -22,7 +21,8 @@ Class {
 		'fastEntity',
 		'fastJavaClassDeclaration',
 		'fastJavaInterfaceDeclaration',
-		'fastJavaTypeParameter'
+		'fastJavaTypeParameter',
+		'fastJavaAssignmentExpression'
 	],
 	#category : #'Carrefour-Model-Generator'
 }
@@ -56,7 +56,7 @@ CRFMetamodelGenerator >> defineClasses [
 	fastJavaMethodInvocation := self remoteEntity: #MethodInvocation withPrefix: #FASTJava.
 	fastJavaNew := self remoteEntity: #NewExpression withPrefix: #FASTJava.
 	famixStructuralEntity := self remoteTrait: #TStructuralEntity withPrefix: #'Famix'.
-	fastJavaAssignementExpression := self remoteEntity: #AssignementExpression withPrefix: #FASTJava.
+	fastJavaAssignmentExpression := self remoteEntity: #AssignmentExpression withPrefix: #FASTJava.
 	fastJavaVariableDeclarator := self remoteEntity: #VariableDeclarator withPrefix: #FASTJava.
 	fastJavaClassProperty := self remoteEntity: #ClassProperty withPrefix: #FASTJava.
 	fastJavaTypeParameter := self remoteEntity: #TypeParameterExpression withPrefix: #FASTJava.
@@ -83,7 +83,7 @@ CRFMetamodelGenerator >> defineRelations [
 	super defineRelations.
 	(famixInvocation property: #fast) - (fastExpression property: #famixInvocation).
 	(famixMethod property: #fast) - (fastEntity property: #famixMethod).
-	(famixStructuralEntity property: #fastAssignement) -* (fastJavaAssignementExpression property: #famixVariable).
+	(famixStructuralEntity property: #fastAssignment) -* (fastJavaAssignmentExpression property: #famixVariable).
 	(famixStructuralEntity property: #fastDeclaration) -* (fastJavaVariableDeclarator property: #famixVariable).
 
 	(famixStructuralEntity property: #fastAccesses) -* (fastExpression property: #famixVariable).

diff --git a/src/Carrefour-Model/CRFModel.class.st b/src/Carrefour-Model/CRFModel.class.st
@@ -16,9 +16,3 @@ CRFModel class >> annotation [
 	<package: #'Carrefour-Model'>
 	<generated>
 ]
-
-{ #category : #testing }
-CRFModel class >> canBeImportedFromFile [
-	<generated>
-	^true
-]
diff --git a/...ASTJavaAssignementExpression.extension.st → ...FASTJavaAssignmentExpression.extension.st b/...ASTJavaAssignementExpression.extension.st → ...FASTJavaAssignmentExpression.extension.st
@@ -1,18 +1,18 @@
-Extension { #name : #FASTJavaAssignementExpression }
+Extension { #name : #FASTJavaAssignmentExpression }
 
 { #category : #'*Carrefour-Model-accessing' }
-FASTJavaAssignementExpression >> famixVariable [
-	"Relation named: #famixVariable type: #FamixTStructuralEntity opposite: #fastAssignement"
+FASTJavaAssignmentExpression >> famixVariable [
+	"Relation named: #famixVariable type: #FamixTStructuralEntity opposite: #fastAssignment"
 
 	<generated>
-	<FMProperty: #famixVariable type: #FamixTStructuralEntity opposite: #fastAssignement>
+	<FMProperty: #famixVariable type: #FamixTStructuralEntity opposite: #fastAssignment>
 	<package: #'Carrefour-Model'>
 	^ self attributeAt: #famixVariable ifAbsent: [ nil ]
 ]
 
 { #category : #'*Carrefour-Model-accessing' }
-FASTJavaAssignementExpression >> famixVariable: anObject [
+FASTJavaAssignmentExpression >> famixVariable: anObject [
 
 	<generated>
-	self attributeAt: #famixVariable put: (FMMultivalueLink on: self update: #fastAssignement from: self famixVariable to: anObject).
+	self attributeAt: #famixVariable put: (FMMultivalueLink on: self update: #fastAssignment from: self famixVariable to: anObject).
 ]
diff --git a/src/Carrefour-Model/FamixTStructuralEntity.extension.st b/src/Carrefour-Model/FamixTStructuralEntity.extension.st
@@ -19,21 +19,21 @@ FamixTStructuralEntity >> fastAccesses: anObject [
 ]
 
 { #category : #'*Carrefour-Model-accessing' }
-FamixTStructuralEntity >> fastAssignement [
-	"Relation named: #fastAssignement type: #FASTJavaAssignementExpression opposite: #famixVariable"
+FamixTStructuralEntity >> fastAssignment [
+	"Relation named: #fastAssignment type: #FASTJavaAssignmentExpression opposite: #famixVariable"
 
 	<generated>
 	<derived>
-	<FMProperty: #fastAssignement type: #FASTJavaAssignementExpression opposite: #famixVariable>
+	<FMProperty: #fastAssignment type: #FASTJavaAssignmentExpression opposite: #famixVariable>
 	<package: #'Carrefour-Model'>
-	^ self attributeAt: #fastAssignement ifAbsentPut: [ FMMultivalueLink on: self opposite: #famixVariable: ]
+	^ self attributeAt: #fastAssignment ifAbsentPut: [ FMMultivalueLink on: self opposite: #famixVariable: ]
 ]
 
 { #category : #'*Carrefour-Model-accessing' }
-FamixTStructuralEntity >> fastAssignement: anObject [
+FamixTStructuralEntity >> fastAssignment: anObject [
 
 	<generated>
-	self fastAssignement value: anObject
+	self fastAssignment value: anObject
 ]
 
 { #category : #'*Carrefour-Model-accessing' }

diff --git a/src/Carrefour-RemoveBinding-Tests/CRFRemoveReferencesTestTest.class.st b/src/Carrefour-RemoveBinding-Tests/CRFRemoveReferencesTestTest.class.st
@@ -54,11 +54,11 @@ CRFRemoveReferencesTestTest >> testFromFASTRemoveStructuralEntityBinding [
 	"we check the value at the beginning to avoid breaking the tests"
 	self assert: (structuralEntities flatCollect: #fastDeclaration) size equals: 4.
 	self assert: (structuralEntities flatCollect: #fastAccesses) size equals: 16.
-	self assert: (structuralEntities flatCollect: #fastAssignement) size equals: 2.
+	self assert: (structuralEntities flatCollect: #fastAssignment) size equals: 2.
 	self fastTestMethod removeBinding.
 	self assert: (structuralEntities flatCollect: #fastAccesses) size equals: 0.
 	self assert: (structuralEntities flatCollect: #fastDeclaration) size equals: 0.
-	self assert: (structuralEntities flatCollect: #fastAssignement) size equals: 0.
+	self assert: (structuralEntities flatCollect: #fastAssignment) size equals: 0.
 ]
 
 { #category : #running }

diff --git a/src/Carrefour-RemoveBinding/CRFBindingCleaner.class.st b/src/Carrefour-RemoveBinding/CRFBindingCleaner.class.st
@@ -18,9 +18,9 @@ CRFBindingCleaner >> fullClean: anEntity [
 ]
 
 { #category : #generated }
-CRFBindingCleaner >> visitFASTJavaAssignementExpression: aFASTJavaAssignementExpression [
-	aFASTJavaAssignementExpression famixVariable: nil.
-	^ super visitFASTJavaAssignementExpression: aFASTJavaAssignementExpression
+CRFBindingCleaner >> visitFASTJavaAssignmentExpression: aFASTJavaAssignmentExpression [
+	aFASTJavaAssignmentExpression famixVariable: nil.
+	^ super visitFASTJavaAssignmentExpression: aFASTJavaAssignmentExpression
 ]
 
 { #category : #generated }