X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=82e287045749e63a0072c1433a4053d95a5d8000;hb=86d39fb9ddd83414f4b896bea89404e9786ff0d0;hp=3d058e457c18e9c0906ea90003585514b6eab864;hpb=dee2b5197cb2eea8ec6e234a44d2ad5b3587302e;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 3d058e4..82e2870 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -55,10 +55,7 @@ tetrahedron_tests =
     testGroup "Tetrahedron Tests" [
       tetrahedron1_geometry_tests,
       tetrahedron2_geometry_tests,
-      tc "doesn't contain point (2)" test_doesnt_contain_point2,
-      tc "doesn't contain point (3)" test_doesnt_contain_point3,
-      tc "doesn't contain point (4)" test_doesnt_contain_point4,
-      tc "doesn't contain point (5)" test_doesnt_contain_point5 ]
+      containment_tests ]
 
 -- | Defined so that my test names fit on one line.
 tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framework.Test
@@ -165,6 +162,9 @@ p79_28_properties =
 cube_properties :: Test.Framework.Test
 cube_properties =
     testGroup "Cube Properties" [
+  tp "front/back tetrahedra are disjoint" prop_front_back_tetrahedra_disjoint,
+  tp "top/down tetrahedra are disjoint" prop_top_down_tetrahedra_disjoint,
+  tp "left/right tetrahedra are disjoint" prop_left_right_tetrahedra_disjoint,
   tp "all volumes positive" prop_all_volumes_positive,
   tp "all volumes exact" prop_all_volumes_exact,
   tp "v0 all equal" prop_v0_all_equal,