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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 3a0af81..82e2870 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -53,13 +53,9 @@ misc_tests =
 tetrahedron_tests :: Test.Framework.Test
 tetrahedron_tests =
     testGroup "Tetrahedron Tests" [
+      tetrahedron1_geometry_tests,
       tetrahedron2_geometry_tests,
-      tc "volume (1)" test_volume1,
-      tc "doesn't contain point (1)" test_doesnt_contain_point1,
-      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
@@ -166,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,