Rename Tetrahedron.fv to Tetrahedron.function_values.

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 2432224e2926278548c2d98b2487d46e91c89972..0e11d1c0cfc4cf675862f47af66d4dfa3885a668 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -10,10 +10,10 @@ import Test.HUnit
 import Test.QuickCheck (Testable ())
 
 import Cardinal (cardinal_tests, cardinal_properties)
+import Cube (cube_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 Tetrahedron (tetrahedron_tests, tetrahedron_properties)
 
 main :: IO ()
@@ -31,93 +31,6 @@ tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framewo
 tp = testProperty
 
 
-
-p78_25_properties :: Test.Framework.Test
-p78_25_properties =
-    testGroup "p. 78, Section (2.5) Properties" [
-      tp "c_ijk1 identity" prop_cijk1_identity ]
-
-edge_incidence_tests :: Test.Framework.Test
-edge_incidence_tests =
-    testGroup "Edge Incidence Tests" [
-      tp "t0 shares edge with t6" prop_t0_shares_edge_with_t6,
-      tp "t0 shares edge with t1" prop_t0_shares_edge_with_t1,
-      tp "t0 shares edge with t3" prop_t0_shares_edge_with_t3,
-      tp "t1 shares edge with t2" prop_t1_shares_edge_with_t2,
-      tp "t1 shares edge with t19" prop_t1_shares_edge_with_t19,
-      tp "t2 shares edge with t3" prop_t2_shares_edge_with_t3,
-      tp "t2 shares edge with t12" prop_t2_shares_edge_with_t12,
-      tp "t3 shares edge with t21" prop_t3_shares_edge_with_t21,
-      tp "t4 shares edge with t5" prop_t4_shares_edge_with_t5,
-      tp "t4 shares edge with t7" prop_t4_shares_edge_with_t7,
-      tp "t4 shares edge with t10" prop_t4_shares_edge_with_t10,
-      tp "t5 shares edge with t6" prop_t5_shares_edge_with_t6,
-      tp "t5 shares edge with t16" prop_t5_shares_edge_with_t16,
-      tp "t6 shares edge with t7" prop_t6_shares_edge_with_t7,
-      tp "t7 shares edge with t20" prop_t7_shares_edge_with_t20 ]
-
-
-p79_26_properties :: Test.Framework.Test
-p79_26_properties =
-    testGroup "p. 79, Section (2.6) Properties" [
-      tp "c0120 identity1" TC.prop_c0120_identity1,
-      tp "c0120 identity2" TC.prop_c0120_identity2,
-      tp "c0120 identity3" TC.prop_c0120_identity3,
-      tp "c0120 identity4" TC.prop_c0120_identity4,
-      tp "c0120 identity5" TC.prop_c0120_identity5,
-      tp "c0120 identity6" TC.prop_c0120_identity6,
-      tp "c0120 identity7" TC.prop_c0120_identity7,
-      tp "c0210 identity1" TC.prop_c0210_identity1,
-      tp "c0300 identity1" TC.prop_c0300_identity1,
-      tp "c1110 identity" TC.prop_c1110_identity,
-      tp "c1200 identity1" TC.prop_c1200_identity1,
-      tp "c2100 identity1" TC.prop_c2100_identity1]
-
-p79_27_properties :: Test.Framework.Test
-p79_27_properties =
-    testGroup "p. 79, Section (2.7) Properties" [
-      tp "c0102 identity1" TC.prop_c0102_identity1,
-      tp "c0201 identity1" TC.prop_c0201_identity1,
-      tp "c0300 identity2" TC.prop_c0300_identity2,
-      tp "c1101 identity" TC.prop_c1101_identity,
-      tp "c1200 identity2" TC.prop_c1200_identity2,
-      tp "c2100 identity2" TC.prop_c2100_identity2 ]
-
-
-p79_28_properties :: Test.Framework.Test
-p79_28_properties =
-    testGroup "p. 79, Section (2.8) Properties" [
-      tp "c3000 identity" TC.prop_c3000_identity,
-      tp "c2010 identity" TC.prop_c2010_identity,
-      tp "c2001 identity" TC.prop_c2001_identity,
-      tp "c1020 identity" TC.prop_c1020_identity,
-      tp "c1002 identity" TC.prop_c1002_identity,
-      tp "c1011 identity" TC.prop_c1011_identity ]
-
-
-cube_properties :: Test.Framework.Test
-cube_properties =
-    testGroup "Cube Properties" [
-  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,
-  tp "interior values all identical" prop_interior_values_all_identical,
-  tp "c-tilde_2100 rotation correct" prop_c_tilde_2100_rotation_correct,
-  tp "c-tilde_2100 correct" prop_c_tilde_2100_correct ]
-
-
 tests :: [Test.Framework.Test]
 tests = [ cardinal_tests,
           function_values_tests,
@@ -128,9 +41,4 @@ tests = [ cardinal_tests,
           tetrahedron_properties,
           misc_properties,          
           cardinal_properties,
-          edge_incidence_tests,
---          p78_25_properties,
-          p79_26_properties,
-          p79_27_properties,
-          p79_28_properties,
           slow_tests ]