X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCardinal.hs;h=530ea1acbf5e94014bda8b59f04f9a2e382cf2fd;hb=5297a1f696e0f99ceaef5e3adb76c5ab425f528d;hp=300c340687fbd86daf9a21035a19207acb936f0b;hpb=380f69c2f37dc154c6f908fb893beb4bb1b185a6;p=spline3.git

diff --git a/src/Cardinal.hs b/src/Cardinal.hs
index 300c340..530ea1a 100644
--- a/src/Cardinal.hs
+++ b/src/Cardinal.hs
@@ -24,13 +24,13 @@ where
 
 import Control.Monad (liftM, liftM2)
 import Prelude hiding (LT)
-
-import Test.HUnit (Assertion, assertEqual)
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
-
-import Test.QuickCheck (Arbitrary(..), Property, (==>), oneof)
+import Test.Tasty ( TestTree, testGroup )
+import Test.Tasty.HUnit ( Assertion, assertEqual, testCase )
+import Test.Tasty.QuickCheck (
+  Arbitrary( arbitrary ),
+  Property, (==>),
+  oneof,
+  testProperty )
 
 
 data Cardinal = F   -- ^ Front
@@ -440,17 +440,17 @@ prop_four_ccwz_is_identity c =
     (ccwz . ccwz . ccwz . ccwz) c == c
 
 
-cardinal_tests :: Test.Framework.Test
+cardinal_tests :: TestTree
 cardinal_tests =
-  testGroup "Cardinal Tests" [
+  testGroup "Cardinal tests" [
     testCase "c-tilde_2100 rotation correct"test_c_tilde_2100_rotation_correct ]
 
 
-cardinal_properties :: Test.Framework.Test
+cardinal_properties :: TestTree
 cardinal_properties =
   let tp = testProperty
   in
-    testGroup "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,