lacncements des 1ers cas-tests

diff --git a/doc/salome/examples/blocFissure_01_without_session.py b/doc/salome/examples/blocFissure_01_without_session.py
index 0be55d4c69f596f0fbe12aec6be41b82d2b4041c..224f917e58340a6ed5af6f17739e2f80de424a07 100644 (file)
--- a/doc/salome/examples/blocFissure_01_without_session.py
+++ b/doc/salome/examples/blocFissure_01_without_session.py
@@ -7,39 +7,32 @@ Gérald NICOLAS
 +33.1.78.19.43.52
 """
 
 +33.1.78.19.43.52
 """
 

-__revision__ = "V02.01"
+__revision__ = "V02.02"

 
 import os
 
 import os

-import tempfile

 import sys
 
 import sys
 

-# Fichier de diagnostic
-LOGFILE = os.path.join(tempfile.gettempdir(),"blocFissure.log")
-if os.path.isfile(LOGFILE):
-  os.remove(LOGFILE)
-

 # Lancement des cas-tests
 import salome
 salome.standalone()
 salome.salome_init()
 
 # Lancement des cas-tests
 import salome
 salome.standalone()
 salome.salome_init()
 

-from blocFissure.materielCasTests import genereMateriel
-
-from blocFissure.CasTests import execution_Cas
+from blocFissure.CasTests import blocFissureTest
+BLOCFISSURE_TEST = blocFissureTest(["cubeAngle", "cubeAngle2", "cubeCoin", "cubeMilieu", "cubeTransverse"])
+TEXTE = BLOCFISSURE_TEST.lancement()
+del BLOCFISSURE_TEST

 
 # Diagnostic
 ERREUR = 0
 
 # Diagnostic
 ERREUR = 0

-if os.path.isfile(LOGFILE):
-  with open(LOGFILE, 'r') as FICHIER:
-    LES_LIGNES = FICHIER.readlines()
-  for LIGNE in LES_LIGNES:
+if TEXTE:
+  for LIGNE in TEXTE:

     #print (LIGNE[:-1])
     if ( "NOOK" in LIGNE ):
     #print (LIGNE[:-1])
     if ( "NOOK" in LIGNE ):

-      MESSAGE_ERREUR = LIGNE
+      MESSAGE_ERREUR = TEXTE

       ERREUR = int(LIGNE.split()[-1])
       break
 else:
       ERREUR = int(LIGNE.split()[-1])
       break
 else:

-  MESSAGE_ERREUR = "Impossible de trouver le fichier de diagnostic {}".format(LOGFILE)
+  MESSAGE_ERREUR = "Impossible de trouver le diagnostic de la procédure de tests."

   ERREUR = -1
 
 if ERREUR:
   ERREUR = -1
 
 if ERREUR:

diff --git a/doc/salome/examples/tests.set b/doc/salome/examples/tests.set
index 99000efd5da74fcf70d5e214b0cdc72860330fee..531a85c515336684c17bb5180cddd9f7ec95e3cf 100644 (file)
--- a/doc/salome/examples/tests.set
+++ b/doc/salome/examples/tests.set
@@ -46,7 +46,7 @@ SET(BAD_TESTS
   test_smeshplugin_mg_tetra_parallele.py
   test_smeshplugins.py
   MGAdaptTests_without_session.py
   test_smeshplugin_mg_tetra_parallele.py
   test_smeshplugins.py
   MGAdaptTests_without_session.py

-  blocFissure_without_session.py
+  blocFissure_01_without_session.py

   )
 
 SET(GOOD_TESTS
   )
 
 SET(GOOD_TESTS

diff --git a/src/Tools/blocFissure/CasTests/blocFissureTest.py b/src/Tools/blocFissure/CasTests/blocFissureTest.py
index ef550f86851f8920eff9c7baae28e0d9f0847b26..a0ccc2121d379c5704491eb7e69c6a37fe08529f 100644 (file)
--- a/src/Tools/blocFissure/CasTests/blocFissureTest.py
+++ b/src/Tools/blocFissure/CasTests/blocFissureTest.py
@@ -17,7 +17,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #

-__revision__ = "V02.01"
+__revision__ = "V03.01"

 
 """Lancement des cas-tests de blocFissure"""
 
 
 """Lancement des cas-tests de blocFissure"""
 


@@ -533,24 +533,3 @@ if __name__ == "__main__" :
     sys.stdout.write(TEXTE)
 
   del BLOCFISSURE_TEST
     sys.stdout.write(TEXTE)
 
   del BLOCFISSURE_TEST

-
-  #sys.exit(0)
-
-
-#while True:
-
-  #import sys
-  #print ("arguments = '{}'".format(sys.argv[1:]))
-
-  #L_PROBLEMES, D_AUX = caract_l_problemes()
-
-  #if ( len(L_PROBLEMES) != len(TORUN) ):
-    #TEXTE  = "\nNombre de problèmes définis  : {}\n".format(len(L_PROBLEMES))
-    #TEXTE += "Longueur de la liste 'TORUN' : {}\n".format(len(TORUN))
-    #TEXTE += "\t==> Incohérence de programmation à corriger dans {}".format(__name__)
-    #print (TEXTE)
-    #break
-
-  #calcul_tout (L_PROBLEMES, D_AUX)
-
-  #break