Switch to Tasty for testing.

[spline3.git] / src / FunctionValues.hs

diff --git a/src/FunctionValues.hs b/src/FunctionValues.hs
index 5332462d940ac7f9e4de10d5c00e1bebaad0e589..5c44dc53902b503c8a71f0da431d36effa565de7 100644 (file)
--- a/src/FunctionValues.hs
+++ b/src/FunctionValues.hs
@@ -15,11 +15,9 @@ module FunctionValues (
 where
 
 import Prelude hiding ( LT )
-import Test.HUnit ( Assertion )
-import Test.Framework ( Test, testGroup )
-import Test.Framework.Providers.HUnit ( testCase )
-import Test.Framework.Providers.QuickCheck2 ( testProperty )
-import Test.QuickCheck ( Arbitrary(..), choose )
+import Test.Tasty ( TestTree, testGroup )
+import Test.Tasty.HUnit ( Assertion, testCase )
+import Test.Tasty.QuickCheck ( Arbitrary(..), choose, testProperty )
 
 import Assertions ( assertTrue )
 import Cardinal ( Cardinal(..), cwx, cwy, cwz )
@@ -371,9 +369,9 @@ test_directions =
                          back_right_top fvs == 15]
 
 
-function_values_tests :: Test.Framework.Test
+function_values_tests :: TestTree
 function_values_tests =
-    testGroup "FunctionValues Tests"
+    testGroup "FunctionValues tests"
                   [ testCase "test directions" test_directions ]
 
 
@@ -429,11 +427,11 @@ prop_z_rotation_doesnt_affect_top fv0 =
       expr2 = top fv1
 
 
-function_values_properties :: Test.Framework.Test
+function_values_properties :: TestTree
 function_values_properties =
   let tp = testProperty
   in
-    testGroup "FunctionValues Properties" [
+    testGroup "FunctionValues properties" [
       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,