Add missing getVersion function

Fix indentation and ref name in doc
Update tests

diff --git a/doc/gui_create_case.rst b/doc/gui_create_case.rst
index 5758e8e9713aef9d86d4f1ebc030dc8d37943b5d..aaac4a777aebb3cafe84ee0996074e633efdcfd9 100644 (file)
--- a/doc/gui_create_case.rst
+++ b/doc/gui_create_case.rst
@@ -97,6 +97,7 @@ Par d
    - tétraèdres
    - hexaèdres
    - prismes
+
 Si le maillage initial comporte des pyramides, il y a arrêt en erreur. Toutefois, si on est certain que les raffinements ultérieurs ne toucheront aucune des arêtes des pyramides, on cochera la case "Pyramides autorisées". Les adaptations se dérouleront normalement et les pyramides seront restituées telles quelles dans le maillage final.
 
 L'arbre d'étude

diff --git a/doc/tui_create_boundary.rst b/doc/tui_create_boundary.rst
index ea7f004e338e3962b300d62218e62b36537540e8..73bf0cddcb71c45dd1199d8d6a588a814243e5c5 100644 (file)
--- a/doc/tui_create_boundary.rst
+++ b/doc/tui_create_boundary.rst
@@ -1,4 +1,4 @@
-.. _gui_create_hypothese:
+.. _tui_create_boundary:
 
 L'hypothèse
 ===========

diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx
index 63c6887da22f204bd71c3e6754c6443f848d2b45..da4aa8b42dec10fb2162b718d539f1a2ee82463f 100755 (executable)
--- a/src/HOMARD_I/HOMARD_Gen_i.cxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.cxx
@@ -27,6 +27,8 @@
 #include "HOMARD_DriverTools.hxx"
 #include "HomardMedCommun.h"
 
+#include "HOMARD_version.h"
+
 #include "utilities.h"
 #include "Utils_SINGLETON.hxx"
 #include "Utils_CorbaException.hxx"
@@ -2704,6 +2706,17 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
    return aStreamFile._retn();
 }
 
+
+// Version information
+char* HOMARD_Gen_i::getVersion()
+{
+#if HOMARD_DEVELOPMENT
+  return CORBA::string_dup(HOMARD_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(HOMARD_VERSION_STR);
+#endif
+}
+
 //=============================================================================
 extern "C"
 {

diff --git a/tests/test_1.py b/tests/test_1.py
index a769a9f473792e748528c4d8c5a67ba0b5d06dc7..74a1f6581d854ea3070ee14529080a7bfd0ada81 100644 (file)
--- a/tests/test_1.py
+++ b/tests/test_1.py
@@ -132,6 +132,8 @@ Copyright EDF-R&D 2010
 ######################################################################################
 
 homard = salome.lcc.FindOrLoadComponent('FactoryServer', 'HOMARD')
+assert homard is not None, "Impossible to load homard engine"
+
 #
 # Exec of HOMARD-SALOME
 #
@@ -139,8 +141,8 @@ try :
   error_main = homard_exec(salome.myStudy)
   if error_main :
     raise Exception('Pb in homard_exec at iteration %d' %error_main )
-except :
-  raise Exception('Pb in homard_exec')
+except Exception, e:
+  raise Exception('Pb in homard_exec: '+e.message)
 
 #
 # Test of the result

diff --git a/tests/test_2.py b/tests/test_2.py
index 5f86dd0992d0fd664e174b3291dfaca9fba70e93..afb705f23624dce3684d05b118cb83f50b5fd15a 100644 (file)
--- a/tests/test_2.py
+++ b/tests/test_2.py
@@ -121,6 +121,7 @@ Copyright EDF-R&D 2010
 ######################################################################################
 
 homard = salome.lcc.FindOrLoadComponent('FactoryServer', 'HOMARD')
+assert homard is not None, "Impossible to load homard engine"
 #
 # Exec of HOMARD-SALOME
 #
@@ -128,8 +129,8 @@ try :
   error_main = homard_exec(salome.myStudy)
   if error_main :
     raise Exception('Pb in homard_exec at iteration %d' %error_main )
-except :
-  raise Exception('Pb in homard_exec')
+except Exception, e:
+  raise Exception('Pb in homard_exec: '+e.message)
 
 #
 # Test of the result

diff --git a/tests/test_3.py b/tests/test_3.py
index 2aef04f50e030757af4134636111642f74de3354..98c4e6e3fbac9b5eeb6a51af37418b0601613588 100644 (file)
--- a/tests/test_3.py
+++ b/tests/test_3.py
@@ -120,6 +120,8 @@ Copyright EDF-R&D 2010
 ######################################################################################
 
 homard = salome.lcc.FindOrLoadComponent('FactoryServer', 'HOMARD')
+assert homard is not None, "Impossible to load homard engine"
+
 #
 # Exec of HOMARD-SALOME
 #
@@ -127,8 +129,8 @@ try :
   error_main = homard_exec(salome.myStudy)
   if error_main :
     raise Exception('Pb in homard_exec at iteration %d' %error_main )
-except :
-  raise Exception('Pb in homard_exec')
+except Exception, e:
+  raise Exception('Pb in homard_exec: '+e.message)
 
 #
 # Test of the result