X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;fp=test%2FTestSuite.hs;h=25057ef382aa7a38003511cfbf94901a17ea7726;hb=957754c693525096c5fd7427decd6404bbb03379;hp=a3563b0721fcc36bb017f561737bb3d437f05fe7;hpb=9849853e69c46b46996e8c775d15661b2aba27a8;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index a3563b0..25057ef 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -9,9 +9,9 @@ import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.HUnit
 import Test.QuickCheck (Testable ())
 
+import Cardinal (cardinal_tests, cardinal_properties)
 import FunctionValues (function_values_tests, function_values_properties)
 import Misc (misc_tests, misc_properties)
-import Tests.Cardinal
 import Tests.Cube as TC
 import Tests.Grid
 import Tests.Tetrahedron as TT
@@ -25,10 +25,6 @@ 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
@@ -53,29 +49,6 @@ tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framewo
 tp = testProperty
 
 
-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" [