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

[tools/medcoupling.git] / src / ParaMEDMEMTest / ParaMEDMEMTest.hxx

diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
index b15b53fd1291ddeaca8383333fb01068136f4431..77f59fe750c9db18c08de84e016c9e2b981b9550 100644 (file)
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
@@ -48,9 +48,13 @@ class ParaMEDMEMTest : public CppUnit::TestFixture
   CPPUNIT_TEST(testInterpKernelDECPartialProcs);    // 3 procs
   CPPUNIT_TEST(testInterpKernelDEC3DSurfEmptyBBox); // 3 procs
   CPPUNIT_TEST(testOverlapDEC1);                    // 3 procs
+  CPPUNIT_TEST(testOverlapDEC1_bis);                // 3 procs
+  CPPUNIT_TEST(testOverlapDEC1_ter);                // 3 procs
   CPPUNIT_TEST(testOverlapDEC2);                    // 3 procs
-  CPPUNIT_TEST(testOverlapDEC3);                    // 2 procs
-  CPPUNIT_TEST(testOverlapDEC4);                    // 2 procs
+  CPPUNIT_TEST(testOverlapDEC2_bis);                // 3 procs
+  CPPUNIT_TEST(testOverlapDEC2_ter);                // 3 procs
+//  CPPUNIT_TEST(testOverlapDEC3);                    // 2 procs
+//  CPPUNIT_TEST(testOverlapDEC4);                    // 2 procs
 
   CPPUNIT_TEST(testSynchronousEqualInterpKernelWithoutInterpNativeDEC_2D);// 5 procs
   CPPUNIT_TEST(testSynchronousEqualInterpKernelWithoutInterpDEC_2D);      // 5 procs
@@ -64,11 +68,11 @@ class ParaMEDMEMTest : public CppUnit::TestFixture
   CPPUNIT_TEST(testAsynchronousSlowerSourceInterpKernelDEC_2D);           // 5 procs
   CPPUNIT_TEST(testAsynchronousSlowSourceInterpKernelDEC_2D);             // 5 procs
   CPPUNIT_TEST(testAsynchronousFastSourceInterpKernelDEC_2D);             // 5 procs
-//#ifdef MED_ENABLE_FVM
-//  //can be added again after FVM correction for 2D
-//  //  CPPUNIT_TEST(testNonCoincidentDEC_2D);
-//  CPPUNIT_TEST(testNonCoincidentDEC_3D);
-//#endif
+#ifdef MED_ENABLE_FVM
+  //can be added again after FVM correction for 2D
+  //  CPPUNIT_TEST(testNonCoincidentDEC_2D);
+  CPPUNIT_TEST(testNonCoincidentDEC_3D);
+#endif
   CPPUNIT_TEST(testStructuredCoincidentDEC);     // 5 procs
   CPPUNIT_TEST(testICoco1);           // 2 procs
   CPPUNIT_TEST(testGauthier1);        // 4 procs
@@ -78,13 +82,7 @@ class ParaMEDMEMTest : public CppUnit::TestFixture
   CPPUNIT_TEST(testFabienAPI1);       // 3 procs
   CPPUNIT_TEST(testFabienAPI2);       // 3 procs
 
-  //
-  CPPUNIT_TEST(testMEDLoaderRead1);
-  CPPUNIT_TEST(testMEDLoaderPolygonRead);
-  CPPUNIT_TEST(testMEDLoaderPolyhedronRead);
-
   CPPUNIT_TEST_SUITE_END();
-  
 
 public:
  
@@ -109,8 +107,11 @@ public:
   void testInterpKernelDECPartialProcs();
   void testInterpKernelDEC3DSurfEmptyBBox();
   void testOverlapDEC1();
+  void testOverlapDEC1_bis();
+  void testOverlapDEC1_ter();
   void testOverlapDEC2();
-//  void testOverlapDEC2_bis();
+  void testOverlapDEC2_bis();
+  void testOverlapDEC2_ter();
   void testOverlapDEC3();
 //  void testOverlapDEC3_bis();
   void testOverlapDEC4();
@@ -140,14 +141,7 @@ public:
   void testGauthier4();
   void testFabienAPI1();
   void testFabienAPI2();
-  //
-  void testMEDLoaderRead1();
-  void testMEDLoaderPolygonRead();
-  void testMEDLoaderPolyhedronRead();
-  void testMEDLoaderWrite1();
-  void testMEDLoaderPolygonWrite();
 
-  std::string getResourceFile( const std::string& );
   std::string getTmpDirectory();
   std::string makeTmpFile( const std::string&, const std::string& = "" );