X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=f4018af39d350dd384fe5541141e8981a9a32d64;hb=4d50411b7c5932c1e1487810aca9460059160042;hp=7fc5079329b9b8b5278ca100c943e53359069240;hpb=7c648d2c1ca966c4ba1dfff08a13100f065d5dbf;p=spline3.git diff --git a/test/TestSuite.hs b/test/TestSuite.hs index 7fc5079..f4018af 100644 --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -1,5 +1,10 @@ +module TestSuite +where + import Test.Framework (defaultMain, testGroup, Test, TestName, TestOptions(..)) -import Test.Framework.Providers.HUnit +import Test.Framework.Providers.API (TestName) +import Test.Framework.Providers.DocTest +import Test.Framework.Providers.HUnit (testCase) import Test.Framework.Providers.QuickCheck2 (testProperty) import Test.HUnit import Test.QuickCheck (Testable ()) @@ -11,27 +16,97 @@ import Tests.Grid import Tests.Misc import Tests.Tetrahedron as TT --- The list of HUnit tests. -test_suite = TestList (concat [cardinal_tests, - function_values_tests, - grid_tests, - misc_tests, - tetrahedron_tests]) - main :: IO () main = do - putStrLn "HUnit" - putStrLn "-----" - runTestTT test_suite - putStrLn "" - - defaultMain tests - - return () + dt <- docTest ["src/Everything.hs"] ["-isrc"] + defaultMain $ [dt] ++ tests + +-- | Defined so that my test names fit on one line. +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 (t0)" test_trilinear_reproduced_t0, + tc "trilinear reproduced (t1)" test_trilinear_reproduced_t1, + tc "trilinear reproduced (t2)" test_trilinear_reproduced_t2, + tc "trilinear reproduced (t3)" test_trilinear_reproduced_t3, + tc "trilinear reproduced (t4)" test_trilinear_reproduced_t4, + tc "trilinear reproduced (t5)" test_trilinear_reproduced_t5, + tc "trilinear reproduced (t6)" test_trilinear_reproduced_t6, + tc "trilinear reproduced (t7)" test_trilinear_reproduced_t7, + tc "trilinear reproduced (t8)" test_trilinear_reproduced_t8, + tc "trilinear reproduced (t9)" test_trilinear_reproduced_t9, + tc "trilinear reproduced (t10)" test_trilinear_reproduced_t10, + tc "trilinear reproduced (t11)" test_trilinear_reproduced_t11, + tc "trilinear reproduced (t12)" test_trilinear_reproduced_t12, + tc "trilinear reproduced (t13)" test_trilinear_reproduced_t13, + tc "trilinear reproduced (t14)" test_trilinear_reproduced_t14, + tc "trilinear reproduced (t15)" test_trilinear_reproduced_t15, + tc "trilinear reproduced (t16)" test_trilinear_reproduced_t16, + tc "trilinear reproduced (t17)" test_trilinear_reproduced_t17, + tc "trilinear reproduced (t18)" test_trilinear_reproduced_t18, + tc "trilinear reproduced (t19)" test_trilinear_reproduced_t19, + tc "trilinear reproduced (t20)" test_trilinear_reproduced_t20, + tc "trilinear reproduced (t21)" test_trilinear_reproduced_t21, + tc "trilinear reproduced (t22)" test_trilinear_reproduced_t22, + tc "trilinear reproduced (t23)" test_trilinear_reproduced_t23, + 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 ] -- | Defined so that my test names fit on one line. -tp :: Test.QuickCheck.Testable a => TestName -> a -> Test.Framework.Test +tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framework.Test tp = testProperty misc_properties :: Test.Framework.Test @@ -227,7 +302,12 @@ tetrahedron_properties = tp "z rotation doesn't affect down" prop_z_rotation_doesnt_affect_down ] tests :: [Test.Framework.Test] -tests = [ cube_properties, +tests = [ cardinal_tests, + function_values_tests, + grid_tests, + misc_tests, + tetrahedron_tests, + cube_properties, tetrahedron_properties, misc_properties, cardinal_properties,