X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=25057ef382aa7a38003511cfbf94901a17ea7726;hb=957754c693525096c5fd7427decd6404bbb03379;hp=23bc60394497ca47ea5a10ea2147a9f711ddeb39;hpb=3e25ac7f9fffaabdc5e62f4b973f3d38be60cf4d;p=spline3.git diff --git a/test/TestSuite.hs b/test/TestSuite.hs index 23bc603..25057ef 100644 --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -9,11 +9,11 @@ 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 Misc (misc_tests, misc_properties) import Tests.Cube as TC -import Tests.FunctionValues import Tests.Grid -import Tests.Misc import Tests.Tetrahedron as TT main :: IO () @@ -25,95 +25,29 @@ 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, + trilinear_c0_t0_tests, + tc "tetrahedra collision test isn't too sensitive" + test_tetrahedra_collision_sensitivity, tc "trilinear reproduced" test_trilinear_reproduced, - tc "zeros reproduced" test_zeros_reproduced, - tc "trilinear9x9x9 reproduced" test_trilinear9x9x9_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 ] + 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 -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 = @@ -188,6 +122,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, @@ -222,14 +159,17 @@ tetrahedron_properties = 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 ] - + $ prop_swapping_vertices_doesnt_affect_coefficients4 ] + + +-- Do the slow tests last so we can stop paying attention. +slow_tests :: Test.Framework.Test +slow_tests = + testGroup "Slow Tests" [ + tp "cube indices within bounds" prop_cube_indices_never_go_out_of_bounds, + tc "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced ] + + tests :: [Test.Framework.Test] tests = [ cardinal_tests, function_values_tests, @@ -245,4 +185,5 @@ tests = [ cardinal_tests, -- p78_25_properties, p79_26_properties, p79_27_properties, - p79_28_properties ] + p79_28_properties, + slow_tests ]