X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FTest%2FMEDLoaderTest.hxx;h=b42b3b3db4f106d4e03c9e3c0f016c2d6ad57602;hb=242bed6361d2165733aa20dab027c4b637c732f3;hp=bdd7278d6e27023e26fccbd298cd3df7a70d7621;hpb=10f37bf6f33a762626d7f1093b2f5450c1688667;p=tools%2Fmedcoupling.git

diff --git a/src/MEDLoader/Test/MEDLoaderTest.hxx b/src/MEDLoader/Test/MEDLoaderTest.hxx
index bdd7278d6..b42b3b3db 100644
--- a/src/MEDLoader/Test/MEDLoaderTest.hxx
+++ b/src/MEDLoader/Test/MEDLoaderTest.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,6 +16,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// Author : Anthony Geay (CEA/DEN)
 
 #ifndef __MEDLOADERTEST_HXX__
 #define __MEDLOADERTEST_HXX__
@@ -52,6 +53,12 @@ namespace ParaMEDMEM
     CPPUNIT_TEST( testWriteUMeshesRW1 );
     CPPUNIT_TEST( testMixCellAndNodesFieldRW1 );
     CPPUNIT_TEST( testGetAllFieldNamesRW1 );
+
+    // Previously in ParaMEDMEM:
+    CPPUNIT_TEST(testMEDLoaderRead1);
+    CPPUNIT_TEST(testMEDLoaderPolygonRead);
+    CPPUNIT_TEST(testMEDLoaderPolyhedronRead);
+
     CPPUNIT_TEST_SUITE_END();
   public:
     void testMesh1DRW();
@@ -76,6 +83,10 @@ namespace ParaMEDMEM
     void testWriteUMeshesRW1();
     void testMixCellAndNodesFieldRW1();
     void testGetAllFieldNamesRW1();
+
+    void testMEDLoaderRead1();
+    void testMEDLoaderPolygonRead();
+    void testMEDLoaderPolyhedronRead();
   private:
     MEDCouplingUMesh *build1DMesh_1();
     MEDCouplingUMesh *build2DCurveMesh_1();
@@ -88,6 +99,8 @@ namespace ParaMEDMEM
     MEDCouplingFieldDouble *buildVecFieldOnNodes_1();
     MEDCouplingFieldDouble *buildVecFieldOnGauss_1();
     MEDCouplingFieldDouble *buildVecFieldOnGaussNE_1();
+
+    std::string getResourceFile( const std::string& filename ) const;
   };
 }