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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 73723c2..a3563b0 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 FunctionValues (functionvalues_tests)
+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.Misc
 import Tests.Tetrahedron as TT
 
 main :: IO ()
@@ -41,11 +41,6 @@ grid_tests =
       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" [
@@ -57,10 +52,6 @@ tetrahedron_tests =
 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 =
@@ -195,13 +186,7 @@ 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.