Changes in src/Tesselation/unittests/Tesselation_BoundaryTriangleUnitTest.cpp [6a7fcbb:c1d78c]

File:

• src/Tesselation/unittests/Tesselation_BoundaryTriangleUnitTest.cpp (modified) (8 diffs)

src/Tesselation/unittests/Tesselation_BoundaryTriangleUnitTest.cpp

@@ -54 +54 @@
 void TesselationBoundaryTriangleTest::createTriangle(const std::vector<Vector> &Vectors)
 {
-  CPPUNIT_ASSERT_EQUAL( (size_t)3, Vectors.size() );
+  CPPUNIT_ASSERT_EQUAL( (size_t)NDIM, Vectors.size() );
 
   // create nodes
@@ -76 +76 @@
 }
 
+/** This cleanly removes a triangle created via createTriangle() from memory.
+ *
+ */
+void TesselationBoundaryTriangleTest::removeTriangle()
+{
+  delete(triangle);
+  for (int i=0;i<NDIM;++i) {
+    // TesselPoint does not delete its vector as it only got a reference
+    delete tesselpoints[i];
+  }
+}
+
 void TesselationBoundaryTriangleTest::setUp()
 {
@@ -92 +104 @@
 void TesselationBoundaryTriangleTest::tearDown()
 {
-  delete(triangle);
-  for (int i=0;i<3;++i) {
-    // TesselPoint does not delete its vector as it only got a reference
-    delete tesselpoints[i];
-  }
+  removeTriangle();
   logger::purgeInstance();
   errorLogger::purgeInstance();
@@ -187 +195 @@
 {
   {
-    delete triangle;
+    removeTriangle();
     // test is from --create-micelle 200 --radius 30. --position "0,0,0" of sles.data
     // failure is: Intersection (23.1644,24.1867,65.1272) is not inside triangle [659|Na2451,O3652,Na3762].
@@ -200 +208 @@
   }
   {
-    delete triangle;
+    removeTriangle();
     // test is from --create-micelle 200 --radius 30. --position "0,0,0" of sles.data
     // failure is: Intersection (20.6787,70.655,71.5657) is not inside triangle [622|Na1197,Na2166,O3366].
@@ -214 +222 @@
   }
   {
-    delete triangle;
+    removeTriangle();
     // test is from --create-micelle 200 --radius 30. --position "0,0,0" of sles.data
     // failure is:Intersection (27.56537519896,13.40256646925,6.672946688134) is not inside triangle [702|Na5016,O6388,Na6498].
@@ -254 +262 @@
   }
 
-  delete triangle;
+  removeTriangle();
   // create better triangle;
   VECTORSET(std::vector) Vectors;
@@ -289 +297 @@
 {
   {
-    delete triangle;
+    removeTriangle();
     // test is from --create-micelle 200 --radius 30. --position "0,0,0" of sles.data
     // failure is:Intersection (27.56537519896,13.40256646925,6.672946688134) is not inside triangle [702|Na5016,O6388,Na6498].