fix conflict

[tools/medcoupling.git] / src / MEDLoader / Test / MEDLoaderTest.hxx

diff --git a/src/MEDLoader/Test/MEDLoaderTest.hxx b/src/MEDLoader/Test/MEDLoaderTest.hxx
index 24007ffa31de891f6dd53bd0f8f68e2ba0b9471e..b42b3b3db4f106d4e03c9e3c0f016c2d6ad57602 100644 (file)
--- a/src/MEDLoader/Test/MEDLoaderTest.hxx
+++ b/src/MEDLoader/Test/MEDLoaderTest.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  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
@@ -53,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();
@@ -77,6 +83,10 @@ namespace ParaMEDMEM
     void testWriteUMeshesRW1();
     void testMixCellAndNodesFieldRW1();
     void testGetAllFieldNamesRW1();
+
+    void testMEDLoaderRead1();
+    void testMEDLoaderPolygonRead();
+    void testMEDLoaderPolyhedronRead();
   private:
     MEDCouplingUMesh *build1DMesh_1();
     MEDCouplingUMesh *build2DCurveMesh_1();
@@ -89,6 +99,8 @@ namespace ParaMEDMEM
     MEDCouplingFieldDouble *buildVecFieldOnNodes_1();
     MEDCouplingFieldDouble *buildVecFieldOnGauss_1();
     MEDCouplingFieldDouble *buildVecFieldOnGaussNE_1();
+
+    std::string getResourceFile( const std::string& filename ) const;
   };
 }