]> gitweb.michael.orlitzky.com - spline3.git/blobdiff - test/TestSuite.hs
Move the Tetrahedron tests into the Tetrehedron module.
[spline3.git] / test / TestSuite.hs
index 0748d36a78a70e58af12c6c707884de5cf44d74e..2432224e2926278548c2d98b2487d46e91c89972 100644 (file)
@@ -9,12 +9,12 @@ import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.HUnit
 import Test.QuickCheck (Testable ())
 
-import Tests.Cardinal
+import Cardinal (cardinal_tests, cardinal_properties)
+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.FunctionValues
-import Tests.Grid
-import Tests.Misc
-import Tests.Tetrahedron as TT
+import Tetrahedron (tetrahedron_tests, tetrahedron_properties)
 
 main :: IO ()
 main = do
@@ -25,102 +25,12 @@ main = do
 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,
-      tc "trilinearx2 reproduced (t0)" test_trilinearx2_reproduced_t0 ]
-
-
-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 => Test.Framework.TestName -> a -> Test.Framework.Test
 tp = testProperty
 
-misc_properties :: Test.Framework.Test
-misc_properties =
-    testGroup "Misc Properties" [
-      tp "factorial greater" prop_factorial_greater ]
-
-cardinal_properties :: Test.Framework.Test
-cardinal_properties =
-    testGroup "Cardinal Properties" [
-      tp "ccwx rotation changes direction" prop_ccwx_rotation_changes_direction,
-      tp "cwx rotation changes direction" prop_cwx_rotation_changes_direction,
-      tp "ccwy rotation changes direction" prop_ccwy_rotation_changes_direction,
-      tp "cwy rotation changes direction" prop_cwy_rotation_changes_direction,
-      tp "ccwz rotation changes direction" prop_ccwz_rotation_changes_direction,
-      tp "cwz rotation changes direction" prop_cwz_rotation_changes_direction,
-      tp "ccwx rotation result unique" prop_ccwx_rotation_result_unique,
-      tp "cwx rotation result unique" prop_cwx_rotation_result_unique,
-      tp "ccwy rotation result unique" prop_ccwy_rotation_result_unique,
-      tp "cwy rotation result unique" prop_cwy_rotation_result_unique,
-      tp "ccwz rotation result unique" prop_ccwz_rotation_result_unique,
-      tp "cwz rotation result unique" prop_cwz_rotation_result_unique,
-      tp "four cwx is identity" prop_four_cwx_is_identity,
-      tp "four ccwx is identity" prop_four_ccwx_is_identity,
-      tp "four cwy is identity" prop_four_cwy_is_identity,
-      tp "four ccwy is identity" prop_four_ccwy_is_identity,
-      tp "four cwz is identity" prop_four_cwz_is_identity,
-      tp "four ccwz is identity" prop_four_ccwz_is_identity]
-
-
-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 =
@@ -188,6 +98,18 @@ p79_28_properties =
 cube_properties :: Test.Framework.Test
 cube_properties =
     testGroup "Cube Properties" [
+  tp "opposite octant tetrahedra are disjoint (1)"
+     prop_opposite_octant_tetrahedra_disjoint1,
+  tp "opposite octant tetrahedra are disjoint (2)"
+     prop_opposite_octant_tetrahedra_disjoint2,
+  tp "opposite octant tetrahedra are disjoint (3)"
+     prop_opposite_octant_tetrahedra_disjoint3,
+  tp "opposite octant tetrahedra are disjoint (4)"
+     prop_opposite_octant_tetrahedra_disjoint4,
+  tp "opposite octant tetrahedra are disjoint (5)"
+     prop_opposite_octant_tetrahedra_disjoint5,
+  tp "opposite octant tetrahedra are disjoint (6)"
+     prop_opposite_octant_tetrahedra_disjoint6,
   tp "all volumes positive" prop_all_volumes_positive,
   tp "all volumes exact" prop_all_volumes_exact,
   tp "v0 all equal" prop_v0_all_equal,
@@ -196,40 +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,
-      tp "x rotation doesn't affect front" prop_x_rotation_doesnt_affect_front,
-      tp "x rotation doesn't affect back" prop_x_rotation_doesnt_affect_back,
-      tp "y rotation doesn't affect left" prop_y_rotation_doesnt_affect_left,
-      tp "y rotation doesn't affect right" prop_y_rotation_doesnt_affect_right,
-      tp "z rotation doesn't affect top" prop_z_rotation_doesnt_affect_top,
-      tp "z rotation doesn't affect down" prop_z_rotation_doesnt_affect_down ]
-                 
 tests :: [Test.Framework.Test]
 tests = [ cardinal_tests,
           function_values_tests,
@@ -241,8 +129,8 @@ tests = [ cardinal_tests,
           misc_properties,          
           cardinal_properties,
           edge_incidence_tests,
-          p78_24_properties,
 --          p78_25_properties,
           p79_26_properties,
           p79_27_properties,
-          p79_28_properties ]
+          p79_28_properties,
+          slow_tests ]