Fix granularity of fromImportModule + improve test generation + manage future import

Author: jecisc

src/FAST-Python-Model-Generator/FASTPythonMetamodelGenerator.class.st

@@ -402,7 +402,7 @@ FASTPythonMetamodelGenerator >> defineRelations [
 	<>-* ((importedEntity property: #import) comment: 'Import declaring me as imported entity.').
 
 	((importFromStatement property: #fromImportModule) comment: 'Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..')
-	<>-* ((fromImportModule property: #import) comment: 'Import declaring me as from import module.').
+	<>- ((fromImportModule property: #import) comment: 'Import declaring me as from import module.').
 
 	((tUnaryOperator property: #argument) comment: 'Expression influanced by the unary operator..')
 	<>- ((tExpression property: #parentUnaryOperator) comment: 'Parent unary operator in which I am.')

src/FAST-Python-Model/FASTPyFromImportModule.class.st

@@ -50,6 +50,7 @@ FASTPyFromImportModule >> import [
 	<generated>
 	<FMComment: 'Import declaring me as from import module.'>
 	<container>
+	<derived>
 	^ import
 ]
 

src/FAST-Python-Model/FASTPyImportFromStatement.class.st

@@ -14,7 +14,7 @@ Class {
 	#name : 'FASTPyImportFromStatement',
 	#superclass : 'FASTPyImport',
 	#instVars : [
-		'#fromImportModule => FMMany type: #FASTPyFromImportModule opposite: #import'
+		'#fromImportModule => FMOne type: #FASTPyFromImportModule opposite: #import'
 	],
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
@@ -30,32 +30,25 @@ FASTPyImportFromStatement class >> annotation [
 	^ self
 ]
 
-{ #category : 'adding' }
-FASTPyImportFromStatement >> addFromImportModule: anObject [
-	<generated>
-	^ self fromImportModule add: anObject
-]
-
 { #category : 'accessing' }
 FASTPyImportFromStatement >> fromImportModule [
 	"Relation named: #fromImportModule type: #FASTPyFromImportModule opposite: #import"
 
 	<generated>
 	<FMComment: 'Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..'>
-	<derived>
 	^ fromImportModule
 ]
 
 { #category : 'accessing' }
 FASTPyImportFromStatement >> fromImportModule: anObject [
 
 	<generated>
-	fromImportModule value: anObject
+	fromImportModule := anObject
 ]
 
 { #category : 'navigation' }
 FASTPyImportFromStatement >> fromImportModuleGroup [
 	<generated>
 	<navigation: 'FromImportModule'>
-	^ MooseSpecializedGroup withAll: self fromImportModule asSet
+	^ MooseSpecializedGroup with: self fromImportModule
 ]