Merge pull request #93 from SokaDance/test-framework

[gen][ts] add test framework property to initliaze correctly tests im…

Author: SokaDance

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'/] 

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'

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)/]	
 

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]