X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=a39f5685be3ec0c92ab7d759b010feb5c14f47ff;hb=19480b63a1835c71b6fd8ecd23c6f0eb915043ae;hp=abe2275b7ea87c8ec14c3c841f8865629a3ffeed;hpb=a2cc10f44d77965b97c21ba74aa2acb302cd8fe0;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index abe2275..a39f568 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -3,6 +3,7 @@ where
 
 import Test.Framework (defaultMain, testGroup, Test, TestName, TestOptions(..))
 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
@@ -16,7 +17,9 @@ import Tests.Misc
 import Tests.Tetrahedron as TT
 
 main :: IO ()
-main = defaultMain tests
+main = do
+  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
@@ -59,7 +62,8 @@ grid_tests =
       tc "trilinear f0_t0_v2" test_trilinear_f0_t0_v2,
       tc "trilinear f0_t0_v3" test_trilinear_f0_t0_v3,
       tc "trilinear reproduced" test_trilinear_reproduced,
-      tc "zeros reproduced" test_zeros_reproduced ]
+      tc "zeros reproduced" test_zeros_reproduced,
+      tc "trilinearx2 reproduced (t0)" test_trilinearx2_reproduced_t0 ]
 
 
 misc_tests :: Test.Framework.Test
@@ -116,7 +120,7 @@ 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]
+      tp "c1110 identity" TT.prop_c1110_identity]
 
 p78_25_properties :: Test.Framework.Test
 p78_25_properties =
@@ -149,12 +153,10 @@ p79_26_properties =
       tp "c0120 identity1" TC.prop_c0120_identity1,
       tp "c0120 identity2" TC.prop_c0120_identity2,
       tp "c0120 identity3" TC.prop_c0120_identity3,
---
--- These repeats of the previous test are failing at the moment.
---
---      tp "c0120 identity4" TC.prop_c0120_identity4,
---      tp "c0120 identity5" TC.prop_c0120_identity5,
---      tp "c0120 identity6" TC.prop_c0120_identity6,
+      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,