yamm adaptation and lot 6

[modules/hydrosolver.git] / tests / boundaryConditionsTest.py

diff --git a/tests/boundaryConditionsTest.py b/tests/boundaryConditionsTest.py
index 1ea91eb60c09b5b97fbf1afc8c47756ced552cf7..bcdba0741bf0f2286f353082c910e03f7a945754 100644 (file)
--- a/tests/boundaryConditionsTest.py
+++ b/tests/boundaryConditionsTest.py
@@ -8,52 +8,52 @@ import unittest
 cur_dir = os.path.dirname(os.path.realpath(__file__))
 data_dir = os.path.join(cur_dir, "data")
 
-hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome')
-sys.path.append(hydro_solver_root)
+#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome')
+#sys.path.append(hydro_solver_root)
 import boundaryConditions
 
- 
+
 class TestBoundaryConditions(unittest.TestCase):
     def testReadPresets(self):
         file_path = os.path.join(data_dir, "bnd_conditions_presets.txt")
         reader = boundaryConditions.PresetReader(file_path)
         presets = reader.read()
         self.assertEqual(3, len(presets))
-        
+
         self.assertEqual(True, presets.has_key("Closed boundaries/walls"))
         self.assertEqual((2,2,2,2), presets["Closed boundaries/walls"])
-        
+
         self.assertEqual(True, presets.has_key("Incident waves"))
         self.assertEqual((1,1,1,None), presets["Incident waves"])
-        
+
         self.assertEqual(True, presets.has_key("Free T"))
         self.assertEqual((None,None,None,4), presets["Free T"])
-        
+
     def testRead(self):
         file_path = os.path.join(data_dir, "bnd_conditions1.cli")
         reader = boundaryConditions.BoundaryConditionReader(file_path)
         conditions = reader.read()
         self.assertEqual(7, len(conditions))
         self.assertEqual(0, len(reader.errors))
-        
+
     def testWrite(self):
         file_path = os.path.join(tempfile.gettempdir(), "bnd_conditions_w.cli")
         writer = boundaryConditions.BoundaryConditionWriter(file_path)
-        
+
         cnd1 = boundaryConditions.BoundaryCondition(5, 4, 4, 4, "group1")
         cnd2 = boundaryConditions.BoundaryCondition(4, 5, 5, 5, "group2")
-        
+
         writer.write([cnd1, cnd2])
         self.assertEqual(True, os.path.exists(file_path))
         self.assertEqual(0, len(writer.errors))
-        
+
         os.remove(file_path)
-        
+
     def testReadWrite(self):
         input_file_path = os.path.join(data_dir, "bnd_conditions1.cli")
         reader = boundaryConditions.BoundaryConditionReader(input_file_path)
         conditions = reader.read()
-        
+
         output_file_path = os.path.join(tempfile.gettempdir(), "bnd_conditions1_w.cli")
         writer = boundaryConditions.BoundaryConditionWriter(output_file_path)
         writer.write(conditions)
@@ -62,5 +62,5 @@ class TestBoundaryConditions(unittest.TestCase):
             self.assertEqual(True, filecmp.cmp(input_file_path, output_file_path))
         finally:
             os.remove(output_file_path)
-        
+
 unittest.main()
\ No newline at end of file