X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=2432224e2926278548c2d98b2487d46e91c89972;hb=993490fd9d940f5e8dea4f934c07c1a5a6c1f8ff;hp=73723c270fa810119cfb97013adf6d1fdb37b0a5;hpb=1f20ae355d28b53fc2e1e31c4bd131e9ede00a87;p=spline3.git diff --git a/test/TestSuite.hs b/test/TestSuite.hs index 73723c2..2432224 100644 --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -9,12 +9,12 @@ import Test.Framework.Providers.QuickCheck2 (testProperty) import Test.HUnit import Test.QuickCheck (Testable ()) -import FunctionValues (functionvalues_tests) -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.Grid -import Tests.Misc -import Tests.Tetrahedron as TT +import Tetrahedron (tetrahedron_tests, tetrahedron_properties) main :: IO () main = do @@ -25,72 +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 ] - - -grid_tests :: Test.Framework.Test -grid_tests = - testGroup "Grid Tests" [ - 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 ] - - -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" [ - 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 = - 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 = @@ -158,9 +98,18 @@ 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 "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, @@ -169,49 +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 ] - - --- 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, @@ -223,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,