From d6ea1dfabad23f9c88fffefe10fdbc2d498573ab Mon Sep 17 00:00:00 2001
From: Jocelyn DUMAY <jocelyn@barry-dumay.com>
Date: Mon, 15 Jul 2024 12:06:41 +0200
Subject: [PATCH] [gen][ts] add test framework property to initliaze correctly
 tests imports

---
 .../src/soft/generator/common/generateCommon.mtl      |  6 ------
 .../src/soft/generator/ts/generateCommon.mtl          | 11 +++++++++++
 .../soft/generator/ts/tests/generateFactoryTests.mtl  |  3 +++
 .../ts/tests/generateImplementationTests.mtl          |  3 +++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/soft.generators/soft.generator.common/src/soft/generator/common/generateCommon.mtl b/soft.generators/soft.generator.common/src/soft/generator/common/generateCommon.mtl
index 6d56475..6136843 100644
--- a/soft.generators/soft.generator.common/src/soft/generator/common/generateCommon.mtl
+++ b/soft.generators/soft.generator.common/src/soft/generator/common/generateCommon.mtl
@@ -342,10 +342,4 @@ and (not aClass.getEStructuralFeature('value').oclIsUndefined())/]
     endif 
 /]
 
-[query public isTemplateGenerated( any : OclAny , aTemplateName : String ) : Boolean =
-	let templatesProperty : String =  getProperty('templates') in
-	let templates : Sequence(String) = templatesProperty.tokenize(',') in
-	templates->includes(aTemplateName)
-/]
-
 [query public isDebug(any : OclAny) : Boolean = getProperty('debug') = 'true'/] 
diff --git a/soft.generators/soft.generator.ts/src/soft/generator/ts/generateCommon.mtl b/soft.generators/soft.generator.ts/src/soft/generator/ts/generateCommon.mtl
index ed4df59..3aec894 100644
--- a/soft.generators/soft.generator.ts/src/soft/generator/ts/generateCommon.mtl
+++ b/soft.generators/soft.generator.ts/src/soft/generator/ts/generateCommon.mtl
@@ -53,6 +53,17 @@
 	endif
 /]
 
+[query public getTestFramework(anPackage : EPackage) : String =
+ 	if anPackage.hasPackageProperty('testFramework')
+	then anPackage.getPackageProperty('testFramework').toLower()
+	else 'jest'
+	endif
+/]
+
+[query public isVitest(anPackage : EPackage) : Boolean =
+	anPackage.getTestFramework() = 'vitest' 
+/]
+
 [query public isExplicitFileExtension(anPackage : EPackage) : Boolean =
 	let moduleResolution : String = anPackage.getModuleResolution() in
 	moduleResolution = 'nodenext' or moduleResolution = 'node16'
diff --git a/soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateFactoryTests.mtl b/soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateFactoryTests.mtl
index 21d2b74..0422f4f 100644
--- a/soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateFactoryTests.mtl
+++ b/soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateFactoryTests.mtl
@@ -44,6 +44,9 @@
 [file (aPackage.getPackageDirectory() + '/' + aPackage.getFactoryTestFileName(aPackage.name), false, 'UTF-8')]
 [fileComment()/]
 
+[if aPackage.isVitest()]
+import { describe, expect, test } from "vitest"
+[/if]
 import { anything , capture, instance, mock, reset, verify, when } from "ts-mockito";
 [aPackage.generateImports('factory-tests', types, modules)/]	
 
diff --git a/soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateImplementationTests.mtl b/soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateImplementationTests.mtl
index ccec4d4..ffd4359 100644
--- a/soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateImplementationTests.mtl
+++ b/soft.generators/soft.generator.ts/src/soft/generator/ts/tests/generateImplementationTests.mtl
@@ -52,6 +52,9 @@
 [fileComment()/]
 
 [comment imports/]
+[if aPackage.isVitest()]
+import { describe, expect, test } from "vitest"
+[/if]
 [if aClass.requiresList()]
 import deepEqual from "deep-equal"
 [/if]