Reduce more duplication in the Grid tests.

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index d06e1e96732a07f1852a8e4913e050f49b616cd5..e30ae4a6d4f124228eae0173e5e024f46fcb90ba 100644 (file)
--- a/src/Tests/Grid.hs
+++ b/src/Tests/Grid.hs
@@ -19,29 +19,41 @@ import ThreeDimensional
 -- | Check all coefficients of tetrahedron0 belonging to the cube
 --   centered on (1,1,1) with a grid constructed from the trilinear
 --   values. See example one in the paper.
-trilinear_c0_t0_coefficient_tests :: Test.Framework.Test
-trilinear_c0_t0_coefficient_tests =
-  testGroup "trilinear c0 t0 coefficients"
-    [testCase "c0030 is correct" test_trilinear_c0030,
-     testCase "c0003 is correct" test_trilinear_c0003,
-     testCase "c0021 is correct" test_trilinear_c0021,
-     testCase "c0012 is correct" test_trilinear_c0012,
-     testCase "c0120 is correct" test_trilinear_c0120,
-     testCase "c0102 is correct" test_trilinear_c0102,
-     testCase "c0111 is correct" test_trilinear_c0111,
-     testCase "c0210 is correct" test_trilinear_c0210,
-     testCase "c0201 is correct" test_trilinear_c0201,
-     testCase "c0300 is correct" test_trilinear_c0300,
-     testCase "c1020 is correct" test_trilinear_c1020,
-     testCase "c1002 is correct" test_trilinear_c1002,
-     testCase "c1011 is correct" test_trilinear_c1011,
-     testCase "c1110 is correct" test_trilinear_c1110,
-     testCase "c1101 is correct" test_trilinear_c1101,
-     testCase "c1200 is correct" test_trilinear_c1200,
-     testCase "c2010 is correct" test_trilinear_c2010,
-     testCase "c2001 is correct" test_trilinear_c2001,
-     testCase "c2100 is correct" test_trilinear_c2100,
-     testCase "c3000 is correct" test_trilinear_c3000]
+--
+--   We also verify that the four vertices on face0 of the cube are
+--   in the correct location.
+--
+trilinear_c0_t0_tests :: Test.Framework.Test
+trilinear_c0_t0_tests =
+  testGroup "trilinear c0 t0"
+    [testGroup "coefficients"
+      [testCase "c0030 is correct" test_trilinear_c0030,
+       testCase "c0003 is correct" test_trilinear_c0003,
+       testCase "c0021 is correct" test_trilinear_c0021,
+       testCase "c0012 is correct" test_trilinear_c0012,
+       testCase "c0120 is correct" test_trilinear_c0120,
+       testCase "c0102 is correct" test_trilinear_c0102,
+       testCase "c0111 is correct" test_trilinear_c0111,
+       testCase "c0210 is correct" test_trilinear_c0210,
+       testCase "c0201 is correct" test_trilinear_c0201,
+       testCase "c0300 is correct" test_trilinear_c0300,
+       testCase "c1020 is correct" test_trilinear_c1020,
+       testCase "c1002 is correct" test_trilinear_c1002,
+       testCase "c1011 is correct" test_trilinear_c1011,
+       testCase "c1110 is correct" test_trilinear_c1110,
+       testCase "c1101 is correct" test_trilinear_c1101,
+       testCase "c1200 is correct" test_trilinear_c1200,
+       testCase "c2010 is correct" test_trilinear_c2010,
+       testCase "c2001 is correct" test_trilinear_c2001,
+       testCase "c2100 is correct" test_trilinear_c2100,
+       testCase "c3000 is correct" test_trilinear_c3000],
+
+    testGroup "face0 vertices"
+      [testCase "v0 is correct" test_trilinear_f0_t0_v0,
+       testCase "v1 is correct" test_trilinear_f0_t0_v1,
+       testCase "v2 is correct" test_trilinear_f0_t0_v2,
+       testCase "v3 is correct" test_trilinear_f0_t0_v3]
+    ]
   where
     g = make_grid 1 trilinear
     cube = cube_at g 1 1 1
@@ -127,53 +139,21 @@ trilinear_c0_t0_coefficient_tests =
     test_trilinear_c3000 =
       assertAlmostEqual "c3000 is correct" (c t 3 0 0 0) 4
 
+    test_trilinear_f0_t0_v0 :: Assertion
+    test_trilinear_f0_t0_v0 =
+      assertEqual "v0 is correct" (v0 t) (1, 1, 1)
+
+    test_trilinear_f0_t0_v1 :: Assertion
+    test_trilinear_f0_t0_v1 =
+      assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
+
+    test_trilinear_f0_t0_v2 :: Assertion
+    test_trilinear_f0_t0_v2 =
+      assertEqual "v2 is correct" (v2 t) (0.5, 0.5, 1.5)
 
--- | 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 :: Assertion
-test_trilinear_f0_t0_v0 =
-    assertEqual "v0 is correct" (v0 t) (1, 1, 1)
-      where
-        g = make_grid 1 trilinear
-        cube = cube_at g 1 1 1
-        t = tetrahedron0 cube
-
-
--- | 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 :: Assertion
-test_trilinear_f0_t0_v1 =
-    assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
-      where
-        g = make_grid 1 trilinear
-        cube = cube_at g 1 1 1
-        t = tetrahedron0 cube
-
-
--- | 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 :: Assertion
-test_trilinear_f0_t0_v2 =
-    assertEqual "v2 is correct" (v2 t) (0.5, 0.5, 1.5)
-      where
-        g = make_grid 1 trilinear
-        cube = cube_at g 1 1 1
-        t = tetrahedron0 cube
-
-
--- | 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 :: Assertion
-test_trilinear_f0_t0_v3 =
-    assertClose "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
-      where
-        g = make_grid 1 trilinear
-        cube = cube_at g 1 1 1
-        t = tetrahedron0 cube
+    test_trilinear_f0_t0_v3 :: Assertion
+    test_trilinear_f0_t0_v3 =
+      assertClose "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
 
 
 test_trilinear_reproduced :: Assertion

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index f82fbdf916e95485840d5d1eda92d32bcf99539b..a866bddcca32cf87de8e0aa4552048f289de9eba 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -37,11 +37,7 @@ function_values_tests =
 grid_tests :: Test.Framework.Test
 grid_tests =
     testGroup "Grid Tests" [
-      trilinear_c0_t0_coefficient_tests,
-      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,
+      trilinear_c0_t0_tests,
       tc "tetrahedra collision test isn't too sensitive"
          test_tetrahedra_collision_sensitivity,
       tc "trilinear reproduced" test_trilinear_reproduced,