From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 8 Jul 2011 20:18:31 +0000 (-0400)
Subject: Finish moving the tests to test-framework.
X-Git-Tag: 0.0.1~266
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=a2cc10f44d77965b97c21ba74aa2acb302cd8fe0;p=spline3.git

Finish moving the tests to test-framework.
---

diff --git a/src/Tests/Cardinal.hs b/src/Tests/Cardinal.hs
index c3f60e5..1786021 100644
--- a/src/Tests/Cardinal.hs
+++ b/src/Tests/Cardinal.hs
@@ -53,9 +53,9 @@ instance Arbitrary Cardinal where
 --   Zeilfelder, p. 87.  This test checks that the directions are
 --   rotated properly.  The order of the letters has to be just right
 --   since I haven't defined a proper Eq instance for Cardinals.
-test_c_tilde_2100_rotation_correct :: Test
+test_c_tilde_2100_rotation_correct :: Assertion
 test_c_tilde_2100_rotation_correct =
-    TestCase $ assertEqual "auto-rotate equals manual rotate" ((ccwz . ccwz . cwy) expr1) expr2
+    assertEqual "auto-rotate equals manual rotate" ((ccwz . ccwz . cwy) expr1) expr2
     where
       expr1 =
           (3/8)*I +
@@ -75,9 +75,6 @@ test_c_tilde_2100_rotation_correct =
           (1/96)*(FL + BR + FR + BL) +
           (1/192)*(FD + LD + RD + BD)
 
-cardinal_tests :: [Test]
-cardinal_tests = [test_c_tilde_2100_rotation_correct]
-
 -- | A list of all directions, sans the interior and composite types.
 all_directions :: [Cardinal]
 all_directions = [L, R, F, B, D, T, FL, FR, FD, FT,
diff --git a/src/Tests/FunctionValues.hs b/src/Tests/FunctionValues.hs
index 3694f03..40d2502 100644
--- a/src/Tests/FunctionValues.hs
+++ b/src/Tests/FunctionValues.hs
@@ -82,9 +82,9 @@ instance Arbitrary FunctionValues where
 
 
 
-test_directions :: Test
+test_directions :: Assertion
 test_directions =
-    TestCase $ assertTrue "all direction functions work" (and equalities)
+    assertTrue "all direction functions work" (and equalities)
         where
           fvs = make_values trilinear 1 1 1
           equalities = [ interior fvs == 4,
@@ -114,6 +114,3 @@ test_directions =
                          back_left_top fvs == 3,
                          back_right_down fvs == 7,
                          back_right_top fvs == 15]
-
-function_values_tests :: [Test]
-function_values_tests = [test_directions]
diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index e6bd8d0..750cff8 100644
--- a/src/Tests/Grid.hs
+++ b/src/Tests/Grid.hs
@@ -24,9 +24,9 @@ instance Arbitrary Grid where
 -- | Check the value of c0030 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0030 :: Test
+test_trilinear_c0030 :: Assertion
 test_trilinear_c0030 =
-    TestCase $ assertAlmostEqual "c0030 is correct" (c t 0 0 3 0) (17/8)
+    assertAlmostEqual "c0030 is correct" (c t 0 0 3 0) (17/8)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -36,9 +36,9 @@ test_trilinear_c0030 =
 -- | Check the value of c0003 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0003 :: Test
+test_trilinear_c0003 :: Assertion
 test_trilinear_c0003 =
-    TestCase $ assertAlmostEqual "c0003 is correct" (c t 0 0 0 3) (27/8)
+    assertAlmostEqual "c0003 is correct" (c t 0 0 0 3) (27/8)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -48,9 +48,9 @@ test_trilinear_c0003 =
 -- | Check the value of c0021 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0021 :: Test
+test_trilinear_c0021 :: Assertion
 test_trilinear_c0021 =
-    TestCase $ assertAlmostEqual "c0021 is correct" (c t 0 0 2 1) (61/24)
+    assertAlmostEqual "c0021 is correct" (c t 0 0 2 1) (61/24)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -60,9 +60,9 @@ test_trilinear_c0021 =
 -- | Check the value of c0012 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0012 :: Test
+test_trilinear_c0012 :: Assertion
 test_trilinear_c0012 =
-    TestCase $ assertAlmostEqual "c0012 is correct" (c t 0 0 1 2) (71/24)
+    assertAlmostEqual "c0012 is correct" (c t 0 0 1 2) (71/24)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -72,9 +72,9 @@ test_trilinear_c0012 =
 -- | Check the value of c0120 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0120 :: Test
+test_trilinear_c0120 :: Assertion
 test_trilinear_c0120 =
-    TestCase $ assertAlmostEqual "c0120 is correct" (c t 0 1 2 0) (55/24)
+    assertAlmostEqual "c0120 is correct" (c t 0 1 2 0) (55/24)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -84,9 +84,9 @@ test_trilinear_c0120 =
 -- | Check the value of c0102 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0102 :: Test
+test_trilinear_c0102 :: Assertion
 test_trilinear_c0102 =
-    TestCase $ assertAlmostEqual "c0102 is correct" (c t 0 1 0 2) (73/24)
+    assertAlmostEqual "c0102 is correct" (c t 0 1 0 2) (73/24)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -96,9 +96,9 @@ test_trilinear_c0102 =
 -- | Check the value of c0111 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0111 :: Test
+test_trilinear_c0111 :: Assertion
 test_trilinear_c0111 =
-    TestCase $ assertAlmostEqual "c0111 is correct" (c t 0 1 1 1) (8/3)
+    assertAlmostEqual "c0111 is correct" (c t 0 1 1 1) (8/3)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -108,9 +108,9 @@ test_trilinear_c0111 =
 -- | Check the value of c0210 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0210 :: Test
+test_trilinear_c0210 :: Assertion
 test_trilinear_c0210 =
-    TestCase $ assertAlmostEqual "c0210 is correct" (c t 0 2 1 0) (29/12)
+    assertAlmostEqual "c0210 is correct" (c t 0 2 1 0) (29/12)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -120,9 +120,9 @@ test_trilinear_c0210 =
 -- | Check the value of c0201 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0201 :: Test
+test_trilinear_c0201 :: Assertion
 test_trilinear_c0201 =
-    TestCase $ assertAlmostEqual "c0201 is correct" (c t 0 2 0 1) (11/4)
+    assertAlmostEqual "c0201 is correct" (c t 0 2 0 1) (11/4)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -132,9 +132,9 @@ test_trilinear_c0201 =
 -- | Check the value of c0300 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0300 :: Test
+test_trilinear_c0300 :: Assertion
 test_trilinear_c0300 =
-    TestCase $ assertAlmostEqual "c0300 is correct" (c t 0 3 0 0) (5/2)
+    assertAlmostEqual "c0300 is correct" (c t 0 3 0 0) (5/2)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -144,9 +144,9 @@ test_trilinear_c0300 =
 -- | Check the value of c1020 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1020 :: Test
+test_trilinear_c1020 :: Assertion
 test_trilinear_c1020 =
-    TestCase $ assertAlmostEqual "c1020 is correct" (c t 1 0 2 0) (8/3)
+    assertAlmostEqual "c1020 is correct" (c t 1 0 2 0) (8/3)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -156,9 +156,9 @@ test_trilinear_c1020 =
 -- | Check the value of c1002 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1002 :: Test
+test_trilinear_c1002 :: Assertion
 test_trilinear_c1002 =
-    TestCase $ assertAlmostEqual "c1002 is correct" (c t 1 0 0 2) (23/6)
+    assertAlmostEqual "c1002 is correct" (c t 1 0 0 2) (23/6)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -168,9 +168,9 @@ test_trilinear_c1002 =
 -- | Check the value of c1011 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1011 :: Test
+test_trilinear_c1011 :: Assertion
 test_trilinear_c1011 =
-    TestCase $ assertAlmostEqual "c1011 is correct" (c t 1 0 1 1) (13/4)
+    assertAlmostEqual "c1011 is correct" (c t 1 0 1 1) (13/4)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -180,9 +180,9 @@ test_trilinear_c1011 =
 -- | Check the value of c1110 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1110 :: Test
+test_trilinear_c1110 :: Assertion
 test_trilinear_c1110 =
-    TestCase $ assertAlmostEqual "c1110 is correct" (c t 1 1 1 0) (23/8)
+    assertAlmostEqual "c1110 is correct" (c t 1 1 1 0) (23/8)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -192,9 +192,9 @@ test_trilinear_c1110 =
 -- | Check the value of c1101 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1101 :: Test
+test_trilinear_c1101 :: Assertion
 test_trilinear_c1101 =
-    TestCase $ assertAlmostEqual "c1101 is correct" (c t 1 1 0 1) (27/8)
+    assertAlmostEqual "c1101 is correct" (c t 1 1 0 1) (27/8)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -204,9 +204,9 @@ test_trilinear_c1101 =
 -- | Check the value of c1200 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1200 :: Test
+test_trilinear_c1200 :: Assertion
 test_trilinear_c1200 =
-    TestCase $ assertAlmostEqual "c1200 is correct" (c t 1 2 0 0) 3
+    assertAlmostEqual "c1200 is correct" (c t 1 2 0 0) 3
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -216,9 +216,9 @@ test_trilinear_c1200 =
 -- | Check the value of c2010 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c2010 :: Test
+test_trilinear_c2010 :: Assertion
 test_trilinear_c2010 =
-    TestCase $ assertAlmostEqual "c2010 is correct" (c t 2 0 1 0) (10/3)
+    assertAlmostEqual "c2010 is correct" (c t 2 0 1 0) (10/3)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -228,9 +228,9 @@ test_trilinear_c2010 =
 -- | Check the value of c2001 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c2001 :: Test
+test_trilinear_c2001 :: Assertion
 test_trilinear_c2001 =
-    TestCase $ assertAlmostEqual "c2001 is correct" (c t 2 0 0 1) 4
+    assertAlmostEqual "c2001 is correct" (c t 2 0 0 1) 4
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -240,9 +240,9 @@ test_trilinear_c2001 =
 -- | Check the value of c2100 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c2100 :: Test
+test_trilinear_c2100 :: Assertion
 test_trilinear_c2100 =
-    TestCase $ assertAlmostEqual "c2100 is correct" (c t 2 1 0 0) (7/2)
+    assertAlmostEqual "c2100 is correct" (c t 2 1 0 0) (7/2)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -252,9 +252,9 @@ test_trilinear_c2100 =
 -- | Check the value of c3000 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c3000 :: Test
+test_trilinear_c3000 :: Assertion
 test_trilinear_c3000 =
-    TestCase $ assertAlmostEqual "c3000 is correct" (c t 3 0 0 0) 4
+    assertAlmostEqual "c3000 is correct" (c t 3 0 0 0) 4
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -264,9 +264,9 @@ test_trilinear_c3000 =
 -- | Make sure that v0 of tetrahedron0 belonging to the cube centered
 --   on (1,1,1) with a grid constructed from the trilinear values
 --   winds up in the right place. See example one in the paper.
-test_trilinear_f0_t0_v0 :: Test
+test_trilinear_f0_t0_v0 :: Assertion
 test_trilinear_f0_t0_v0 =
-    TestCase $ assertEqual "v0 is correct" (v0 t) (1, 1, 1)
+    assertEqual "v0 is correct" (v0 t) (1, 1, 1)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -276,9 +276,9 @@ test_trilinear_f0_t0_v0 =
 -- | Make sure that v1 of tetrahedron0 belonging to the cube centered
 --   on (1,1,1) with a grid constructed from the trilinear values
 --   winds up in the right place. See example one in the paper.
-test_trilinear_f0_t0_v1 :: Test
+test_trilinear_f0_t0_v1 :: Assertion
 test_trilinear_f0_t0_v1 =
-    TestCase $ assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
+    assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -288,9 +288,9 @@ test_trilinear_f0_t0_v1 =
 -- | Make sure that v2 of tetrahedron0 belonging to the cube centered
 --   on (1,1,1) with a grid constructed from the trilinear values
 --   winds up in the right place. See example one in the paper.
-test_trilinear_f0_t0_v2 :: Test
+test_trilinear_f0_t0_v2 :: Assertion
 test_trilinear_f0_t0_v2 =
-    TestCase $ assertEqual "v2 is correct" (v2 t) (0.5, 0.5, 1.5)
+    assertEqual "v2 is correct" (v2 t) (0.5, 0.5, 1.5)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -300,18 +300,18 @@ test_trilinear_f0_t0_v2 =
 -- | Make sure that v3 of tetrahedron0 belonging to the cube centered
 --   on (1,1,1) with a grid constructed from the trilinear values
 --   winds up in the right place. See example one in the paper.
-test_trilinear_f0_t0_v3 :: Test
+test_trilinear_f0_t0_v3 :: Assertion
 test_trilinear_f0_t0_v3 =
-    TestCase $ assertClose "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
+    assertClose "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
-test_trilinear_reproduced :: Test
+test_trilinear_reproduced :: Assertion
 test_trilinear_reproduced =
-    TestCase $ assertTrue "trilinears are reproduced correctly" $
+    assertTrue "trilinears are reproduced correctly" $
              and [p (i', j', k') ~= value_at trilinear i j k
                     | i <- [0..2],
                       j <- [0..2],
@@ -326,9 +326,9 @@ test_trilinear_reproduced =
       p = polynomial t0
 
 
-test_zeros_reproduced :: Test
+test_zeros_reproduced :: Assertion
 test_zeros_reproduced =
-    TestCase $ assertTrue "the zero function is reproduced correctly" $
+    assertTrue "the zero function is reproduced correctly" $
              and [p (i', j', k') ~= value_at zeros i j k
                     | i <- [0..2],
                       j <- [0..2],
@@ -341,34 +341,3 @@ test_zeros_reproduced =
       c0 = fromJust $ cube_at g 1 1 1
       t0 = tetrahedron0 c0
       p = polynomial t0
-
-
--- | A list of all HUnit tests defined in this module.
-grid_tests :: [Test]
-grid_tests =
-    [test_trilinear_c0030,
-     test_trilinear_c0003,
-     test_trilinear_c0021,
-     test_trilinear_c0012,
-     test_trilinear_c0120,
-     test_trilinear_c0102,
-     test_trilinear_c0111,
-     test_trilinear_c0210,
-     test_trilinear_c0201,
-     test_trilinear_c0300,
-     test_trilinear_c1020,
-     test_trilinear_c1002,
-     test_trilinear_c1011,
-     test_trilinear_c1110,
-     test_trilinear_c1101,
-     test_trilinear_c1200,
-     test_trilinear_c2010,
-     test_trilinear_c2001,
-     test_trilinear_c2100,
-     test_trilinear_c3000,
-     test_trilinear_f0_t0_v0,
-     test_trilinear_f0_t0_v1,
-     test_trilinear_f0_t0_v2,
-     test_trilinear_f0_t0_v3,
-     test_trilinear_reproduced,
-     test_zeros_reproduced]
diff --git a/src/Tests/Misc.hs b/src/Tests/Misc.hs
index f282434..fd16064 100644
--- a/src/Tests/Misc.hs
+++ b/src/Tests/Misc.hs
@@ -11,13 +11,10 @@ prop_factorial_greater n =
     n <= 20 ==> factorial n >= n
 
 
-test_flatten1 :: Test
+test_flatten1 :: Assertion
 test_flatten1 =
-    TestCase $ assertEqual "flatten actually works" expected_list actual_list
+    assertEqual "flatten actually works" expected_list actual_list
     where
       target = [[[1::Int]], [[2, 3]]]
       expected_list = [1, 2, 3]
       actual_list = flatten target
-
-misc_tests :: [Test]
-misc_tests = [ test_flatten1 ]
diff --git a/src/Tests/Tetrahedron.hs b/src/Tests/Tetrahedron.hs
index 1ec4c8e..18fe2ba 100644
--- a/src/Tests/Tetrahedron.hs
+++ b/src/Tests/Tetrahedron.hs
@@ -27,9 +27,9 @@ instance Arbitrary Tetrahedron where
 -- | Check the volume of a particular tetrahedron against the value
 --   computed by hand. Its vertices are in clockwise order, so the
 --   volume should be negative.
-test_volume1 :: Test
+test_volume1 :: Assertion
 test_volume1 =
-    TestCase $ assertEqual "volume is correct" True (vol ~= (-1/3))
+    assertEqual "volume is correct" True (vol ~= (-1/3))
     where
       p0 = (0, -0.5, 0)
       p1 = (0, 0.5, 0)
@@ -46,9 +46,9 @@ test_volume1 =
 -- | Check the volume of a particular tetrahedron against the value
 --   computed by hand. Its vertices are in counter-clockwise order, so
 --   the volume should be positive.
-test_volume2 :: Test
+test_volume2 :: Assertion
 test_volume2 =
-    TestCase $ assertEqual "volume is correct" True (vol ~= (1/3))
+    assertEqual "volume is correct" True (vol ~= (1/3))
     where
       p0 = (0, -0.5, 0)
       p1 = (2, 0, 0)
@@ -64,9 +64,9 @@ test_volume2 =
 
 -- | Ensure that a tetrahedron contains a particular point chosen to
 --   be inside of it.
-test_contains_point1 :: Test
+test_contains_point1 :: Assertion
 test_contains_point1 =
-    TestCase $ assertEqual "contains an inner point" True (contains_point t inner_point)
+    assertEqual "contains an inner point" True (contains_point t inner_point)
     where
       p0 = (0, -0.5, 0)
       p1 = (0, 0.5, 0)
@@ -82,9 +82,9 @@ test_contains_point1 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (first test).
-test_doesnt_contain_point1 :: Test
+test_doesnt_contain_point1 :: Assertion
 test_doesnt_contain_point1 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (0, -0.5, 0)
       p1 = (0, 0.5, 0)
@@ -100,9 +100,9 @@ test_doesnt_contain_point1 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (second test).
-test_doesnt_contain_point2 :: Test
+test_doesnt_contain_point2 :: Assertion
 test_doesnt_contain_point2 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (0, 1, 1)
       p1 = (1, 1, 1)
@@ -118,9 +118,9 @@ test_doesnt_contain_point2 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (third test).
-test_doesnt_contain_point3 :: Test
+test_doesnt_contain_point3 :: Assertion
 test_doesnt_contain_point3 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (1, 1, 1)
       p1 = (1, 0, 1)
@@ -136,9 +136,9 @@ test_doesnt_contain_point3 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (fourth test).
-test_doesnt_contain_point4 :: Test
+test_doesnt_contain_point4 :: Assertion
 test_doesnt_contain_point4 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (1, 0, 1)
       p1 = (0, 0, 1)
@@ -154,9 +154,9 @@ test_doesnt_contain_point4 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (fifth test).
-test_doesnt_contain_point5 :: Test
+test_doesnt_contain_point5 :: Assertion
 test_doesnt_contain_point5 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (0, 0, 1)
       p1 = (0, 1, 1)
@@ -169,17 +169,6 @@ test_doesnt_contain_point5 =
                         v3 = p3,
                         fv = empty_values }
 
--- | A list of all HUnit tests defined in this module.
-tetrahedron_tests :: [Test]
-tetrahedron_tests = [test_volume1,
-                     test_volume2,
-                     test_contains_point1,
-                     test_doesnt_contain_point1,
-                     test_doesnt_contain_point2,
-                     test_doesnt_contain_point3,
-                     test_doesnt_contain_point4,
-                     test_doesnt_contain_point5 ]
-
 
 -- | The barycentric coordinate of v0 with respect to itself should
 --   be one.
diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 7fc5079..abe2275 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,5 +1,9 @@
+module TestSuite
+where
+
 import Test.Framework (defaultMain, testGroup, Test, TestName, TestOptions(..))
-import Test.Framework.Providers.HUnit
+import Test.Framework.Providers.API (TestName)
+import Test.Framework.Providers.HUnit (testCase)
 import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.HUnit
 import Test.QuickCheck (Testable ())
@@ -11,27 +15,72 @@ import Tests.Grid
 import Tests.Misc
 import Tests.Tetrahedron as TT
 
--- The list of HUnit tests.
-test_suite = TestList (concat [cardinal_tests,
-                               function_values_tests,
-                               grid_tests,
-                               misc_tests,
-                               tetrahedron_tests])
-
 main :: IO ()
-main = do
-  putStrLn "HUnit"
-  putStrLn "-----"
-  runTestTT test_suite
-  putStrLn ""
-  
-  defaultMain tests
-              
-  return ()
+main = defaultMain tests
+
+-- | Defined so that my test names fit on one line.
+tc :: Test.Framework.Providers.API.TestName -> Test.HUnit.Assertion -> Test.Framework.Test
+tc = testCase
+
+cardinal_tests :: Test.Framework.Test
+cardinal_tests =
+    testGroup "Cardinal Tests" [
+      tc "c-tilde_2100 rotation correct" test_c_tilde_2100_rotation_correct ]
+
+function_values_tests :: Test.Framework.Test
+function_values_tests =
+    testGroup "FunctionValues Tests" [ tc "test directions" test_directions ]
+
+grid_tests :: Test.Framework.Test
+grid_tests =
+    testGroup "Grid Tests" [
+      tc "trilinear c0030" test_trilinear_c0030,
+      tc "trilinear c0003" test_trilinear_c0003,
+      tc "trilinear c0021" test_trilinear_c0021,
+      tc "trilinear c0012" test_trilinear_c0012,
+      tc "trilinear c0120" test_trilinear_c0120,
+      tc "trilinear c0102" test_trilinear_c0102,
+      tc "trilinear c0111" test_trilinear_c0111,
+      tc "trilinear c0210" test_trilinear_c0210,
+      tc "trilinear c0201" test_trilinear_c0201,
+      tc "trilinear c0300" test_trilinear_c0300,
+      tc "trilinear c1020" test_trilinear_c1020,
+      tc "trilinear c1002" test_trilinear_c1002,
+      tc "trilinear c1011" test_trilinear_c1011,
+      tc "trilinear c1110" test_trilinear_c1110,
+      tc "trilinear c1101" test_trilinear_c1101,
+      tc "trilinear c1200" test_trilinear_c1200,
+      tc "trilinear c2010" test_trilinear_c2010,
+      tc "trilinear c2001" test_trilinear_c2001,
+      tc "trilinear c2100" test_trilinear_c2100,
+      tc "trilinear c3000" test_trilinear_c3000,
+      tc "trilinear f0_t0_v0" test_trilinear_f0_t0_v0,
+      tc "trilinear f0_t0_v1" test_trilinear_f0_t0_v1,
+      tc "trilinear f0_t0_v2" test_trilinear_f0_t0_v2,
+      tc "trilinear f0_t0_v3" test_trilinear_f0_t0_v3,
+      tc "trilinear reproduced" test_trilinear_reproduced,
+      tc "zeros reproduced" test_zeros_reproduced ]
+
+
+misc_tests :: Test.Framework.Test
+misc_tests =
+    testGroup "Misc Tests" [
+      tc "flatten (1)" test_flatten1 ]
 
+tetrahedron_tests :: Test.Framework.Test
+tetrahedron_tests =
+    testGroup "Tetrahedron Tests" [
+      tc "volume (1)" test_volume1,
+      tc "volume (2)" test_volume2,
+      tc "contains point (1)" test_contains_point1,
+      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 ]
 
 -- | Defined so that my test names fit on one line.
-tp :: Test.QuickCheck.Testable a => TestName -> a -> Test.Framework.Test
+tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framework.Test
 tp = testProperty
 
 misc_properties :: Test.Framework.Test
@@ -227,7 +276,12 @@ tetrahedron_properties =
       tp "z rotation doesn't affect down" prop_z_rotation_doesnt_affect_down ]
                  
 tests :: [Test.Framework.Test]
-tests = [ cube_properties,
+tests = [ cardinal_tests,
+          function_values_tests,
+          grid_tests,
+          misc_tests,
+          tetrahedron_tests,
+          cube_properties,
           tetrahedron_properties,
           misc_properties,          
           cardinal_properties,