Move naming responsibility from exporter to importer

moosetechnology · Mar 9, 2024 · bc22fdc · bc22fdc
1 parent 825b7ae
commit bc22fdc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/src/Famix-UnitTest-Exporter/FamixUTAbstractExporter.class.st b/src/Famix-UnitTest-Exporter/FamixUTAbstractExporter.class.st
@@ -4,8 +4,7 @@ Class {
 	#instVars : [
 		'valueExporter',
 		'model',
-		'statementBlock',
-		'nameDict'
+		'statementBlock'
 	],
 	#category : #'Famix-UnitTest-Exporter'
 }
@@ -98,12 +97,6 @@ FamixUTAbstractExporter >> exportSuite: aFamixUTSuite [
 	self subclassResponsibility
 ]
 
-{ #category : #initialization }
-FamixUTAbstractExporter >> initialize [
-
-	nameDict := Dictionary new
-]
-
 { #category : #ast }
 FamixUTAbstractExporter >> makeActComment [
 
@@ -139,7 +132,7 @@ FamixUTAbstractExporter >> makeTestCaseComment [
 { #category : #ast }
 FamixUTAbstractExporter >> makeTestMethod: aFamixUTMethod [
 
-	^ self model newMethodEntity name: (self nameFor: aFamixUTMethod)
+	^ self model newMethodEntity name: aFamixUTMethod name
 ]
 
 { #category : #accessing }
@@ -154,21 +147,6 @@ FamixUTAbstractExporter >> model: aFASTModel [
 	self valueExporter model: (model := aFASTModel)
 ]
 
-{ #category : #initialization }
-FamixUTAbstractExporter >> nameFor: anEntity [
-	"Answer a unique name for an entity."
-
-	| name nameID |
-	name := anEntity name.
-	nameID := nameDict
-		          at: name
-		          ifPresent: [ :id | nameDict at: name put: id + 1 ]
-		          ifAbsentPut: [ 1 ].
-	^ nameID == 1
-		  ifTrue: [ name ]
-		  ifFalse: [ name , nameID asString ]
-]
-
 { #category : #'instance creation' }
 FamixUTAbstractExporter >> newValueExporter [
 

diff --git a/src/Famix-UnitTest-Importer/FamixUTImporter.class.st b/src/Famix-UnitTest-Importer/FamixUTImporter.class.st
@@ -2,7 +2,8 @@ Class {
 	#name : #FamixUTImporter,
 	#superclass : #Object,
 	#instVars : [
-		'model'
+		'model',
+		'nameDict'
 	],
 	#category : #'Famix-UnitTest-Importer'
 }
@@ -23,6 +24,12 @@ FamixUTImporter >> fromOpenTelemetrySpans: spans [
 	^ model
 ]
 
+{ #category : #initialization }
+FamixUTImporter >> initialize [
+
+	nameDict := Dictionary new
+]
+
 { #category : #'instance creation' }
 FamixUTImporter >> model [
 
@@ -42,7 +49,7 @@ FamixUTImporter >> testMethod: aFamixTMethod arguments: arguments expected: expe
 	| method |
 	method := self model newMethod
 		          testedMethod: aFamixTMethod;
-		          name: 'test' , aFamixTMethod name capitalized.
+		          name: (self testMethodNameFor: aFamixTMethod).
 	expected ifNotNil: [
 		model newSetUp
 			method: method;
@@ -55,3 +62,18 @@ FamixUTImporter >> testMethod: aFamixTMethod arguments: arguments expected: expe
 		arguments: arguments.
 	^ method
 ]
+
+{ #category : #tests }
+FamixUTImporter >> testMethodNameFor: aFamixTMethod [
+	"Give a unique name for a new test method."
+
+	| name nameID |
+	name := 'test' , aFamixTMethod name capitalized.
+	nameID := nameDict
+		          at: name
+		          ifPresent: [ :id | nameDict at: name put: id + 1 ]
+		          ifAbsentPut: [ 1 ].
+	^ nameID == 1
+		  ifTrue: [ name ]
+		  ifFalse: [ name , nameID asString ]
+]