X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMisc.hs;h=56d33eb43c3969ce0c9c40b5efb81582d0b888b1;hb=9ecdab2b3a4bc6bdf50776a5d2092632988fa8fa;hp=09773bf56655b13453ed7dff6e49b160bf70eb11;hpb=0d037f5f0829d9ee7fcccc58570305623665f52e;p=spline3.git

diff --git a/src/Misc.hs b/src/Misc.hs
index 09773bf..56d33eb 100644
--- a/src/Misc.hs
+++ b/src/Misc.hs
@@ -14,11 +14,9 @@ module Misc (
 where
 
 import qualified Data.Vector as V ( Vector, elem, empty, filter )
-import Test.Framework ( Test, testGroup )
-import Test.Framework.Providers.HUnit ( testCase )
-import Test.Framework.Providers.QuickCheck2 ( testProperty )
-import Test.HUnit ( Assertion, assertEqual )
-import Test.QuickCheck ( Property, (==>) )
+import Test.Tasty ( TestTree, testGroup )
+import Test.Tasty.HUnit ( Assertion, assertEqual, testCase )
+import Test.Tasty.QuickCheck ( Property, (==>), testProperty )
 
 
 -- | The standard factorial function. See
@@ -37,6 +35,7 @@ factorial :: Int -> Int
 factorial !n =
   go 1 n
   where
+    go :: Int -> Int -> Int
     go !acc !i
       | i <= 1    = acc
       | otherwise = go (acc * i) (i - 1)
@@ -112,17 +111,17 @@ test_flatten1 =
     assertEqual "flatten actually works" expected_list actual_list
     where
       target = [[[1::Int]], [[2, 3]]]
-      expected_list = [1, 2, 3]
+      expected_list = [1, 2, 3] :: [Int]
       actual_list = flatten target
 
 
-misc_tests :: Test.Framework.Test
+misc_tests :: TestTree
 misc_tests =
-    testGroup "Misc Tests" [
+    testGroup "Misc tests" [
       testCase "flatten (1)" test_flatten1 ]
 
 
-misc_properties :: Test.Framework.Test
+misc_properties :: TestTree
 misc_properties =
-    testGroup "Misc Properties" [
+    testGroup "Misc properties" [
       testProperty "factorial greater" prop_factorial_greater ]