Merge pull request #676 from moosetechnology/674-FamixMetamodel-docum…

…entor-do-not-print-Object-properties 674 famix metamodel documentor do not print object properties
moosetechnology · Jan 8, 2024 · 8daf1f3 · 8daf1f3
2 parents e019439 + 1004f10
commit 8daf1f3
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 10 deletions.
diff --git a/src/Famix-UMLDocumentor-Tests/FamixUMLDocumentorTest.class.st b/src/Famix-UMLDocumentor-Tests/FamixUMLDocumentorTest.class.st
@@ -141,7 +141,7 @@ FamixUMLDocumentorTest >> testGenerateEntireModel [
 { #category : #'tests - generation' }
 FamixUMLDocumentorTest >> testGeneratePropertyOf [
 
-	| fmClass umlEntity |
+	| fmClass umlClass umlProp |
 
 	documentor
 		model: FDModel ;
@@ -150,15 +150,19 @@ FamixUMLDocumentorTest >> testGeneratePropertyOf [
 	documentor generateClass: fmClass.
 
 	self assert: documentor umlEntities size equals: 1.
-	umlEntity := documentor umlEntities anyOne.
+	umlClass := documentor umlEntities anyOne.
+
+	documentor generateProperties: fmClass uml: umlClass.
 
-	documentor generateProperties: fmClass uml: umlEntity.
+	self assert: umlClass properties size equals: 2.
 
-	self assert: umlEntity properties size equals: 1.
+	umlProp := umlClass properties detect: [:p | p name = 'someProp' ] ifNone: [ nil ].
+	self assert: umlProp isNotNil.
+	self assert: umlProp type equals: 'String'.
 
-	umlEntity := umlEntity properties anyOne.
-	self assert: umlEntity name equals: 'someProp'.
-	self assert: umlEntity type equals: 'String'.
+	umlProp := umlClass properties detect: [:p | p name = 'otherProp' ] ifNone: [ nil ].
+	self assert: umlProp isNotNil.
+	self assert: umlProp type equals: 'Object'.
 
 ]
 

diff --git a/src/Famix-UMLDocumentor-Tests/FamixUMLTestGenerator.class.st b/src/Famix-UMLDocumentor-Tests/FamixUMLTestGenerator.class.st
@@ -55,7 +55,10 @@ FamixUMLTestGenerator >> defineProperties [
 	super defineProperties.
 
 	(t4 property: #someProp type: #String)
-		comment: 'A property in the trait'
+		comment: 'A property in the trait'.
+
+	(t4 property: #otherProp type: #Object)
+		comment: 'Another property in the trait'.
 ]
 
 { #category : #definition }

diff --git a/src/Famix-UMLDocumentor/FamixUMLDocumentor.class.st b/src/Famix-UMLDocumentor/FamixUMLDocumentor.class.st
@@ -180,9 +180,12 @@ FamixUMLDocumentor >> generateInheritance: fmClass uml: umlClass [
 
 { #category : #generating }
 FamixUMLDocumentor >> generateProperties: aFMClass uml: umlClass [
+	"accept FM3Object as a primitive type (#isRoot = true)"
 
-	aFMClass primitiveProperties do: [ :prop |
-		umlClass addProperty: (FamixUMLProperty from: prop) ].
+	aFMClass properties do: [ :prop |
+		(prop type isPrimitive or: [  prop type isRoot ])
+			ifTrue: [umlClass addProperty: (FamixUMLProperty from: prop) ]
+	]
 
 ]
 

diff --git a/src/Famix-UMLDocumentor/FamixUMLRoassalDescriptor.class.st b/src/Famix-UMLDocumentor/FamixUMLRoassalDescriptor.class.st
@@ -1,3 +1,6 @@
+"
+The Roassal part of the Roassal backend exporter
+"
 Class {
 	#name : #FamixUMLRoassalDescriptor,
 	#superclass : #RSUMLClassDescriptor,

diff --git a/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st b/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st
@@ -2,6 +2,7 @@ Trait {
 	#name : #FDTrait4,
 	#instVars : [
 		'#class1 => FMMany type: #FDClass1 opposite: #myTrait',
+		'#otherProp => FMProperty',
 		'#someProp => FMProperty'
 	],
 	#traits : 'FDTrait2',
@@ -40,6 +41,21 @@ FDTrait4 >> class1: anObject [
 	class1 value: anObject
 ]
 
+{ #category : #accessing }
+FDTrait4 >> otherProp [
+
+	<FMProperty: #otherProp type: #Object>
+	<generated>
+	<FMComment: 'Another property in the trait'>
+	^ otherProp
+]
+
+{ #category : #accessing }
+FDTrait4 >> otherProp: anObject [
+	<generated>
+	otherProp := anObject
+]
+
 { #category : #accessing }
 FDTrait4 >> someProp [