JUnit Exporter: better handling of annotation imports

moosetechnology · Jan 15, 2024 · 62b59b6 · 62b59b6
1 parent c02dd92
commit 62b59b6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/src/Famix-UnitTest-Exporter/FamixUTJUnit4Exporter.class.st b/src/Famix-UnitTest-Exporter/FamixUTJUnit4Exporter.class.st
@@ -10,6 +10,12 @@ FamixUTJUnit4Exporter >> nameOfAssertionsClass [
 	^ 'Assert'
 ]
 
+{ #category : #'as yet unclassified' }
+FamixUTJUnit4Exporter >> nameOfBeforeEachAnnotation [
+
+	^ 'Before'
+]
+
 { #category : #naming }
 FamixUTJUnit4Exporter >> nameOfJUnitPackage [
 

diff --git a/src/Famix-UnitTest-Exporter/FamixUTJUnit5Exporter.class.st b/src/Famix-UnitTest-Exporter/FamixUTJUnit5Exporter.class.st
@@ -10,6 +10,12 @@ FamixUTJUnit5Exporter >> nameOfAssertionsClass [
 	^ 'Assertions'
 ]
 
+{ #category : #'as yet unclassified' }
+FamixUTJUnit5Exporter >> nameOfBeforeEachAnnotation [
+
+	^ 'BeforeEach'
+]
+
 { #category : #naming }
 FamixUTJUnit5Exporter >> nameOfJUnitPackage [
 

diff --git a/src/Famix-UnitTest-Exporter/FamixUTJUnitExporter.class.st b/src/Famix-UnitTest-Exporter/FamixUTJUnitExporter.class.st
@@ -83,7 +83,8 @@ FamixUTJUnitExporter >> exportCaseFile: aFamixUTCase [
 FamixUTJUnitExporter >> exportCaseImports: aFamixUTCase [
 
 	| imports |
-	imports := (aFamixUTCase allTypes select: #needsJavaImport)
+	imports := (aFamixUTCase allTypes select: [ :type |
+		            type needsJavaImport ])
 		           collect: [ :type | self makeImportDeclaration: type ]
 		           as: OrderedCollection.
 	imports add: (self makeImportDeclaration: aFamixUTCase testedClass).
@@ -216,11 +217,14 @@ FamixUTJUnitExporter >> makeJUnitImports [
 	^ {
 		  (self model newImportDeclaration qualifiedName:
 			   (model newQualifiedName name: package , '.Test')).
-		  (self model newImportDeclaration
+		  (model newImportDeclaration
 			   qualifiedName: (model newQualifiedName name:
 						    package , '.' , self nameOfAssertionsClass);
 			   isStatic: true;
-			   isOnDemand: true) }
+			   isOnDemand: true).
+		  (model newImportDeclaration qualifiedName:
+			   (model newQualifiedName name:
+				    package , '.' , self nameOfBeforeEachAnnotation)) }
 ]
 
 { #category : #ast }
@@ -275,6 +279,12 @@ FamixUTJUnitExporter >> nameOfAssertionsClass [
 	self subclassResponsibility
 ]
 
+{ #category : #'as yet unclassified' }
+FamixUTJUnitExporter >> nameOfBeforeEachAnnotation [
+
+	self subclassResponsibility
+]
+
 { #category : #naming }
 FamixUTJUnitExporter >> nameOfJUnitPackage [