- Améliorations lancements des tests

diff --git a/Tests/MappingAccasXsd/GNUmakefile b/Tests/MappingAccasXsd/GNUmakefile
index a3486056a94167af61eb2e513b3b87dfbbd79c54..54a174d8b0216a4bd96488488cd80e0ef9ef6d4f 100644 (file)
--- a/Tests/MappingAccasXsd/GNUmakefile
+++ b/Tests/MappingAccasXsd/GNUmakefile
@@ -42,7 +42,7 @@ $(eval $(call cata_dependencies,.xsd))
 
 # $(subst .py,.xsd,cata_dependencies)
 
-cata_files= cata_1.py cata_UserAssd.py
+cata_files= cata_1.py cata_UserAssd.py cata_ASSD.py
 
 xsd_files   = $(cata_files:%.py=%.xsd)
 driver_files= $(cata_files:%.py=%_driver.py)
@@ -87,7 +87,7 @@ testGen: $(confdir)/test_driver_subst.py
 
 #Lancement de chaque test ds l'environement minimal
 testAll: testGen exec.sh driverAll
-       for i in `ls *_test_driver*.py`  ; do ./exec.sh python $$i ; done
+       for i in `ls *_test_driver*.py`  ; do echo "------ Launching $$i ------" && ./exec.sh python $$i ; done
 
 #multiple target avec règle non possible.
 #Ecrire une génération avec un define

diff --git a/Tests/MappingAccasXsd/cata_ASSD_test_driver_0.comm b/Tests/MappingAccasXsd/cata_ASSD_test_driver_0.comm
new file mode 100644 (file)
index 0000000..31567b0
--- /dev/null
+++ b/Tests/MappingAccasXsd/cata_ASSD_test_driver_0.comm
@@ -0,0 +1,6 @@
+
+maillage1=Maillage(fichier='/home/eric/MED/med-4.1.0/tests/c/test1.med',);
+
+champ1=Champ(SurLeMaillage=maillage1,);
+#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE
+#CHECKSUM:4f3412e3098e0105441fa5b9d25276c9  -:FIN CHECKSUM
\ No newline at end of file

diff --git a/Tests/MappingAccasXsd/cata_UserAssd_test_driver_0.comm b/Tests/MappingAccasXsd/cata_UserAssd_test_driver_0.comm
index 000321901ec81ed5bfa36cca79d1e49f670fc41e..8c85b835ad0b5c32cb906a42e910ad5043c2be8e 100644 (file)
--- a/Tests/MappingAccasXsd/cata_UserAssd_test_driver_0.comm
+++ b/Tests/MappingAccasXsd/cata_UserAssd_test_driver_0.comm
@@ -1,21 +1,14 @@
-iFTP1=laClasseUser()
-iSO1=laClasseUser()
-iSP1=laClasseUser()
-iSL1=laClasseUser()
-iSL2=laClasseUser()
-iDefAndUse1=laClasseUser()
+V=laClasseUser()
 
-DefinitionDsFactDsProc(unFact=_F(creeUserAssd=iFTP1,),);
+DefinitionDsFactDsProc();
 
-OP1=DefinitionDsSimpDsOper(creeUserAssd=iSO1,);
+OO=DefinitionDsSimpDsOper();
 
-DefinitionDsSimpDsProc(creeUserAssd=iSP1,);
+DefinitionDsSimpDsProc();
 
-DefinitionDsSimpListe(creeUserAssd=(iSL1,iSL2,),);
+DefinitionDsSimpListe();
 
-UtiliseEtDefinitDsLeMemeProc(utiliseUserAssd=(iSL1,iSP1,iFTP1,iSL2,iSP1,iSO1,iDefAndUse1,),
-                             creeUserAssd=iDefAndUse1,);
+UtiliseEtDefinitDsLeMemeProc(utiliseUserAssd=(V,),);
+
+UtiliseUserAssD(utiliseListeUneListeUserAssd=(V,V,),);
 
-UtiliseUserAssD(utiliseListeUneListeUserAssd=(iDefAndUse1,iSP1,iSL1,),);
-#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE
-#CHECKSUM:4f3e1937244a23724135d9fcf109e87c  -:FIN CHECKSUM
\ No newline at end of file