X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNELTest%2FQuadraticPlanarInterpTest.hxx;h=b5cb15293f30edee2105b4fac16d6a8e71a930ad;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=8024a21ac68cd9a901cd7c14e6ffa8026a594d7e;hpb=10f37bf6f33a762626d7f1093b2f5450c1688667;p=tools%2Fmedcoupling.git

diff --git a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest.hxx b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest.hxx
index 8024a21ac..b5cb15293 100644
--- a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest.hxx
+++ b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  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 _QUADRATICPLANARINTERPTEST_HXX_
 #define _QUADRATICPLANARINTERPTEST_HXX_
@@ -26,8 +27,6 @@
 #include "InterpKernelGeo2DEdgeArcCircle.hxx"
 #include "InterpKernelGeo2DQuadraticPolygon.hxx"
 
-using namespace INTERP_KERNEL;
-
 namespace INTERP_TEST
 {
   class INTERPKERNELTEST_EXPORT QuadraticPlanarInterpTest : public CppUnit::TestFixture
@@ -107,6 +106,10 @@ namespace INTERP_TEST
     //
     CPPUNIT_TEST( checkNormalize );
     CPPUNIT_TEST( checkMakePartitionAbs1 );
+    //
+    CPPUNIT_TEST( checkIsInOrOut );
+    CPPUNIT_TEST( checkGetMiddleOfPoints );
+    CPPUNIT_TEST( checkGetMiddleOfPointsOriented );
     CPPUNIT_TEST_SUITE_END();
   public:  
     void setUp();
@@ -195,11 +198,16 @@ namespace INTERP_TEST
     //
     void checkNormalize();
     void checkMakePartitionAbs1();
+    // From Adrien:
+    void checkIsInOrOut();
+    void checkGetMiddleOfPoints();
+    void checkGetMiddleOfPointsOriented();
+
   private:
-    QuadraticPolygon *buildQuadraticPolygonCoarseInfo(const double *coords, const int *conn, int lgth);
-    EdgeArcCircle *buildArcOfCircle(const double *center, double radius, double alphaStart, double alphaEnd);
-    double btw2NodesAndACenter(const Node& n1, const Node& n2, const double *center);
-    void checkBasicsOfPolygons(QuadraticPolygon& pol1, QuadraticPolygon& pol2, bool checkDirection);
+    INTERP_KERNEL::QuadraticPolygon *buildQuadraticPolygonCoarseInfo(const double *coords, const int *conn, int lgth);
+    INTERP_KERNEL::EdgeArcCircle *buildArcOfCircle(const double *center, double radius, double alphaStart, double alphaEnd);
+    double btw2NodesAndACenter(const INTERP_KERNEL::Node& n1, const INTERP_KERNEL::Node& n2, const double *center);
+    void checkBasicsOfPolygons(INTERP_KERNEL::QuadraticPolygon& pol1, INTERP_KERNEL::QuadraticPolygon& pol2, bool checkDirection);
   };
 }