6th step : Remove the additional MEDLoader level from MEDLoader.

[tools/medcoupling.git] / src / MEDLoader / Swig / SauvLoaderTest.py

diff --git a/src/MEDLoader/Swig/SauvLoaderTest.py b/src/MEDLoader/Swig/SauvLoaderTest.py
index b60a4fd3d63959d9b065fdb21b6f857eb0535895..259af09a129147c15bea79b2a6c157e1ff4bf1e7 100644 (file)
--- a/src/MEDLoader/Swig/SauvLoaderTest.py
+++ b/src/MEDLoader/Swig/SauvLoaderTest.py
@@ -26,12 +26,16 @@ from MEDLoaderDataForTest import MEDLoaderDataForTest
 class SauvLoaderTest(unittest.TestCase):
 
     def __getResourcesDirectory(self):
-        med_root_dir=os.getenv("MEDTOOL_ROOT_DIR")
+        med_root_dir = os.getenv("MEDCOUPLING_ROOT_DIR")
         if med_root_dir:
-            return os.path.join( os.getenv("MEDTOOL_ROOT_DIR"), "share","resources","med")
-        else:
-            current_dir = os.path.dirname(os.path.realpath(__file__))
-            return os.path.join(current_dir, "..", "..", "..", "resources")
+            pth = os.path.join( os.getenv("MEDCOUPLING_ROOT_DIR"), "share","resources","med")
+            if os.path.exists(pth):
+              return pth
+        current_dir = os.path.dirname(os.path.realpath(__file__))
+        pth = os.path.join(current_dir, "..", "..", "..", "resources")
+        if not os.path.exists(pth):
+          raise Exception("SauvLoaderTest: Unable to get resource directory")
+        return pth
         pass
 
     def testSauv2Med(self):
@@ -121,13 +125,13 @@ class SauvLoaderTest(unittest.TestCase):
         self.assertTrue( "groupe5" in groups )
         self.assertTrue( "maa1" in groups )
         self.assertEqual(16,m.getSizeAtLevel(0))
-        um0 = m.getGenMeshAtLevel(0)
+        um0 = m.getMeshAtLevel(0)
         self.assertEqual(12, um0.getNumberOfCellsWithType( NORM_TETRA4 ))
         self.assertEqual(2, um0.getNumberOfCellsWithType( NORM_PYRA5 ))
         self.assertEqual(2, um0.getNumberOfCellsWithType( NORM_HEXA8 ))
-        um1 = m.getGenMeshAtLevel(-1)
+        um1 = m.getMeshAtLevel(-1)
         self.assertEqual(2, um1.getNumberOfCellsWithType( NORM_TRI3 ))
-        pointeUM0 = pointeMedMesh.getGenMeshAtLevel(0)
+        pointeUM0 = pointeMedMesh.getMeshAtLevel(0)
         self.assertTrue(m.getCoords().isEqualWithoutConsideringStr(pointeMedMesh.getCoords(),1e-12))
         self.assertEqual( um0.getMeasureField(0).accumulate(0),
                           pointeUM0.getMeasureField(0).accumulate(0),1e-12)
@@ -243,7 +247,7 @@ class SauvLoaderTest(unittest.TestCase):
         os.remove(sauvFile)
         pass
 
-    @unittest.skipUnless(MEDLoader.HasXDR(),"requires XDR")
+    @unittest.skipUnless(HasXDR(),"requires XDR")
     def testMissingGroups(self):
         """test for issue 0021749: [CEA 601] Some missing groups in mesh after reading a SAUV file with SauvReader."""
         sauvFile = os.path.join(self.__getResourcesDirectory(),"BDC-714.sauv")