Move the Tetrahedron tests into the Tetrehedron module.

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 7b1a55a099bf31c49fcf5d5203d08a43e254834e..2432224e2926278548c2d98b2487d46e91c89972 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -14,7 +14,7 @@ import FunctionValues (function_values_tests, function_values_properties)
 import Grid (grid_tests, slow_tests)
 import Misc (misc_tests, misc_properties)
 import Tests.Cube as TC
-import Tests.Tetrahedron as TT
+import Tetrahedron (tetrahedron_tests, tetrahedron_properties)
 
 main :: IO ()
 main = do
@@ -26,27 +26,11 @@ tc :: Test.Framework.Providers.API.TestName -> Test.HUnit.Assertion -> Test.Fram
 tc = testCase
 
 
-
-
-
-tetrahedron_tests :: Test.Framework.Test
-tetrahedron_tests =
-    testGroup "Tetrahedron Tests" [
-      tetrahedron1_geometry_tests,
-      tetrahedron2_geometry_tests,
-      containment_tests ]
-
 -- | Defined so that my test names fit on one line.
 tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framework.Test
 tp = testProperty
 
 
-p78_24_properties :: Test.Framework.Test
-p78_24_properties =
-    testGroup "p. 78, Section (2.4) Properties" [
-      tp "c3000 identity" TT.prop_c3000_identity,
-      tp "c2100 identity" TT.prop_c2100_identity,
-      tp "c1110 identity" TT.prop_c1110_identity]
 
 p78_25_properties :: Test.Framework.Test
 p78_25_properties =
@@ -134,35 +118,6 @@ cube_properties =
   tp "c-tilde_2100 correct" prop_c_tilde_2100_correct ]
 
 
-tetrahedron_properties :: Test.Framework.Test
-tetrahedron_properties =
-    testGroup "Tetrahedron Properties" [
-      tp "b0_v0_always_unity" prop_b0_v0_always_unity,
-      tp "b0_v1_always_zero" prop_b0_v1_always_zero,
-      tp "b0_v2_always_zero" prop_b0_v2_always_zero,
-      tp "b0_v3_always_zero" prop_b0_v3_always_zero,
-      tp "b1_v1_always_unity" prop_b1_v1_always_unity,
-      tp "b1_v0_always_zero" prop_b1_v0_always_zero,
-      tp "b1_v2_always_zero" prop_b1_v2_always_zero,
-      tp "b1_v3_always_zero" prop_b1_v3_always_zero,
-      tp "b2_v2_always_unity" prop_b2_v2_always_unity,
-      tp "b2_v0_always_zero" prop_b2_v0_always_zero,
-      tp "b2_v1_always_zero" prop_b2_v1_always_zero,
-      tp "b2_v3_always_zero" prop_b2_v3_always_zero,
-      tp "b3_v3_always_unity" prop_b3_v3_always_unity,
-      tp "b3_v0_always_zero" prop_b3_v0_always_zero,
-      tp "b3_v1_always_zero" prop_b3_v1_always_zero,
-      tp "b3_v2_always_zero" prop_b3_v2_always_zero,
-      tp "swapping_vertices_doesnt_affect_coefficients1"
-         $ prop_swapping_vertices_doesnt_affect_coefficients1,
-      tp "swapping_vertices_doesnt_affect_coefficients2"
-         $ prop_swapping_vertices_doesnt_affect_coefficients2,
-      tp "swapping_vertices_doesnt_affect_coefficients3"
-         $ prop_swapping_vertices_doesnt_affect_coefficients3,
-      tp "swapping_vertices_doesnt_affect_coefficients4"
-         $ prop_swapping_vertices_doesnt_affect_coefficients4 ]
-
-
 tests :: [Test.Framework.Test]
 tests = [ cardinal_tests,
           function_values_tests,
@@ -174,7 +129,6 @@ tests = [ cardinal_tests,
           misc_properties,          
           cardinal_properties,
           edge_incidence_tests,
-          p78_24_properties,
 --          p78_25_properties,
           p79_26_properties,
           p79_27_properties,