From b3292c1fc1b757b65f158d55e8d652d6d8a89c8a Mon Sep 17 00:00:00 2001 From: vbd Date: Fri, 14 Sep 2007 07:14:43 +0000 Subject: [PATCH] staffan : * put tests in separate namespace --- src/INTERP_KERNEL/Test/HexaTests.hxx | 2 +- src/INTERP_KERNEL/Test/Interpolation3DTestSuite.hxx | 2 +- src/INTERP_KERNEL/Test/MeshTestToolkit.cxx | 3 ++- src/INTERP_KERNEL/Test/MeshTestToolkit.hxx | 4 +++- src/INTERP_KERNEL/Test/MultiElementTetraTests.hxx | 2 +- src/INTERP_KERNEL/Test/PerfTest.cxx | 4 ++-- src/INTERP_KERNEL/Test/SingleElementTetraTests.hxx | 2 +- src/INTERP_KERNEL/Test/TestInterpKernel.cxx | 6 +++--- .../Test/TransformedTriangleIntersectTest.cxx | 4 +++- .../Test/TransformedTriangleIntersectTest.hxx | 2 +- src/INTERP_KERNEL/Test/TransformedTriangleTest.cxx | 4 +++- src/INTERP_KERNEL/Test/TransformedTriangleTest.hxx | 4 +++- src/INTERP_KERNEL/TransformedTriangle.hxx | 11 +++++++---- 13 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/INTERP_KERNEL/Test/HexaTests.hxx b/src/INTERP_KERNEL/Test/HexaTests.hxx index c92a326cc..825551db0 100644 --- a/src/INTERP_KERNEL/Test/HexaTests.hxx +++ b/src/INTERP_KERNEL/Test/HexaTests.hxx @@ -3,7 +3,7 @@ #include "Interpolation3DTestSuite.hxx" -namespace INTERP_UTILS +namespace INTERP_TEST { /** * Class performing intersection tests on meshes with hexahedral elements. diff --git a/src/INTERP_KERNEL/Test/Interpolation3DTestSuite.hxx b/src/INTERP_KERNEL/Test/Interpolation3DTestSuite.hxx index 50a69f21c..7a80b2ef3 100644 --- a/src/INTERP_KERNEL/Test/Interpolation3DTestSuite.hxx +++ b/src/INTERP_KERNEL/Test/Interpolation3DTestSuite.hxx @@ -5,7 +5,7 @@ #include -namespace INTERP_UTILS +namespace INTERP_TEST { class Interpolation3DTestSuite : public CppUnit::TestFixture diff --git a/src/INTERP_KERNEL/Test/MeshTestToolkit.cxx b/src/INTERP_KERNEL/Test/MeshTestToolkit.cxx index e4f6b4c2e..d206280ad 100644 --- a/src/INTERP_KERNEL/Test/MeshTestToolkit.cxx +++ b/src/INTERP_KERNEL/Test/MeshTestToolkit.cxx @@ -27,8 +27,9 @@ using namespace MEDMEM; using namespace std; using namespace MED_EN; +using namespace INTERP_UTILS; -namespace INTERP_UTILS +namespace INTERP_TEST { double MeshTestToolkit::sumRow(const IntersectionMatrix& m, int i) const diff --git a/src/INTERP_KERNEL/Test/MeshTestToolkit.hxx b/src/INTERP_KERNEL/Test/MeshTestToolkit.hxx index dfd63d33c..ee42b7060 100644 --- a/src/INTERP_KERNEL/Test/MeshTestToolkit.hxx +++ b/src/INTERP_KERNEL/Test/MeshTestToolkit.hxx @@ -9,7 +9,9 @@ class MEDMEM::Interpolation3D; using MEDMEM::Interpolation3D; class MEDMEM::MESH; -namespace INTERP_UTILS +using namespace INTERP_UTILS; + +namespace INTERP_TEST { class MeshTestToolkit diff --git a/src/INTERP_KERNEL/Test/MultiElementTetraTests.hxx b/src/INTERP_KERNEL/Test/MultiElementTetraTests.hxx index e7abf0ce2..fcbc673f0 100644 --- a/src/INTERP_KERNEL/Test/MultiElementTetraTests.hxx +++ b/src/INTERP_KERNEL/Test/MultiElementTetraTests.hxx @@ -3,7 +3,7 @@ #include "Interpolation3DTestSuite.hxx" -namespace INTERP_UTILS +namespace INTERP_TEST { /** * Class testing algorithm by intersecting meshes of several diff --git a/src/INTERP_KERNEL/Test/PerfTest.cxx b/src/INTERP_KERNEL/Test/PerfTest.cxx index d3a6e898d..73432b66b 100644 --- a/src/INTERP_KERNEL/Test/PerfTest.cxx +++ b/src/INTERP_KERNEL/Test/PerfTest.cxx @@ -10,7 +10,7 @@ using namespace MEDMEM; using namespace MED_EN; -namespace INTERP_UTILS +namespace INTERP_TEST { class PerfTestToolkit : public MeshTestToolkit { @@ -51,7 +51,7 @@ namespace INTERP_UTILS int main(int argc, char** argv) { - using INTERP_UTILS::PerfTestToolkit; + using INTERP_TEST::PerfTestToolkit; assert(argc == 3); diff --git a/src/INTERP_KERNEL/Test/SingleElementTetraTests.hxx b/src/INTERP_KERNEL/Test/SingleElementTetraTests.hxx index 52a7386c0..3cc7d1668 100644 --- a/src/INTERP_KERNEL/Test/SingleElementTetraTests.hxx +++ b/src/INTERP_KERNEL/Test/SingleElementTetraTests.hxx @@ -3,7 +3,7 @@ #include "Interpolation3DTestSuite.hxx" -namespace INTERP_UTILS +namespace INTERP_TEST { /** * Class testing algorithm by intersecting simple meshes having only one element each. This serves mainly to verify that diff --git a/src/INTERP_KERNEL/Test/TestInterpKernel.cxx b/src/INTERP_KERNEL/Test/TestInterpKernel.cxx index c0ae7053c..6252407c0 100644 --- a/src/INTERP_KERNEL/Test/TestInterpKernel.cxx +++ b/src/INTERP_KERNEL/Test/TestInterpKernel.cxx @@ -25,14 +25,14 @@ #include "SingleElementTetraTests.hxx" #include "HexaTests.hxx" -using namespace INTERP_UTILS; +using namespace INTERP_TEST; // --- Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION( HexaTests ); CPPUNIT_TEST_SUITE_REGISTRATION( MultiElementTetraTests ); CPPUNIT_TEST_SUITE_REGISTRATION( SingleElementTetraTests ); -CPPUNIT_TEST_SUITE_REGISTRATION( INTERP_UTILS::TransformedTriangleIntersectTest ); -CPPUNIT_TEST_SUITE_REGISTRATION( INTERP_UTILS::TransformedTriangleTest ); +CPPUNIT_TEST_SUITE_REGISTRATION( INTERP_TEST::TransformedTriangleIntersectTest ); +CPPUNIT_TEST_SUITE_REGISTRATION( INTERP_TEST::TransformedTriangleTest ); // --- generic Main program from KERNEL_SRC/src/Basics/Test diff --git a/src/INTERP_KERNEL/Test/TransformedTriangleIntersectTest.cxx b/src/INTERP_KERNEL/Test/TransformedTriangleIntersectTest.cxx index daf60b1ae..8b3d5a3ee 100644 --- a/src/INTERP_KERNEL/Test/TransformedTriangleIntersectTest.cxx +++ b/src/INTERP_KERNEL/Test/TransformedTriangleIntersectTest.cxx @@ -90,7 +90,9 @@ isZero[DoubleProduct(TT::NO_DP*int(seg) + TT::EDGES_FOR_CORNER[3*corner+2] )] // table above //////////////////////////////////////////////////////////////////////////////////////////////////////// -namespace INTERP_UTILS +using namespace INTERP_UTILS; + +namespace INTERP_TEST { //////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/INTERP_KERNEL/Test/TransformedTriangleIntersectTest.hxx b/src/INTERP_KERNEL/Test/TransformedTriangleIntersectTest.hxx index aced9fc04..19060f42c 100644 --- a/src/INTERP_KERNEL/Test/TransformedTriangleIntersectTest.hxx +++ b/src/INTERP_KERNEL/Test/TransformedTriangleIntersectTest.hxx @@ -4,7 +4,7 @@ #include #include "../TransformedTriangle.hxx" -namespace INTERP_UTILS +namespace INTERP_TEST { class TransformedTriangleIntersectTest : public CppUnit::TestFixture diff --git a/src/INTERP_KERNEL/Test/TransformedTriangleTest.cxx b/src/INTERP_KERNEL/Test/TransformedTriangleTest.cxx index 07258f452..1146d61f0 100644 --- a/src/INTERP_KERNEL/Test/TransformedTriangleTest.cxx +++ b/src/INTERP_KERNEL/Test/TransformedTriangleTest.cxx @@ -2,7 +2,9 @@ #include -namespace INTERP_UTILS +using namespace INTERP_UTILS; + +namespace INTERP_TEST { void TransformedTriangleTest::setUp() diff --git a/src/INTERP_KERNEL/Test/TransformedTriangleTest.hxx b/src/INTERP_KERNEL/Test/TransformedTriangleTest.hxx index cfb7196e5..648383482 100644 --- a/src/INTERP_KERNEL/Test/TransformedTriangleTest.hxx +++ b/src/INTERP_KERNEL/Test/TransformedTriangleTest.hxx @@ -6,7 +6,9 @@ #define ERR_TOL 1.0e-8 -namespace INTERP_UTILS +using INTERP_UTILS::TransformedTriangle; + +namespace INTERP_TEST { class TransformedTriangleTest : public CppUnit::TestFixture diff --git a/src/INTERP_KERNEL/TransformedTriangle.hxx b/src/INTERP_KERNEL/TransformedTriangle.hxx index bcbb61f14..6e2b9d599 100644 --- a/src/INTERP_KERNEL/TransformedTriangle.hxx +++ b/src/INTERP_KERNEL/TransformedTriangle.hxx @@ -22,8 +22,11 @@ #include "Log.hxx" -class TransformedTriangleTest; -class TransformedTriangleIntersectTest; +namespace INTERP_TEST +{ + class TransformedTriangleTest; + class TransformedTriangleIntersectTest; +} namespace INTERP_UTILS @@ -84,8 +87,8 @@ namespace INTERP_UTILS public: - friend class TransformedTriangleTest; - friend class TransformedTriangleIntersectTest; + friend class INTERP_TEST::TransformedTriangleTest; + friend class INTERP_TEST::TransformedTriangleIntersectTest; /* * Enumerations representing the different geometric elements of the unit tetrahedron -- 2.39.2