move from test-framework to tasty

adpextwindong · Mar 26, 2016 · 5d139b4 · 5d139b4
1 parent 31fddf1
commit 5d139b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/language-java.cabal b/language-java.cabal
@@ -48,11 +48,9 @@ Test-Suite test-java-parse
   Main-is:           Tests.hs
   Build-Depends:     base >= 3 && < 5
                    , mtl
-                   , QuickCheck >= 2
-                   , HUnit
-                   , test-framework
-                   , test-framework-quickcheck2
-                   , test-framework-hunit
+                   , tasty
+                   , tasty-quickcheck
+                   , tasty-hunit
                    , language-java
                    , filepath
                    , directory

diff --git a/tests/Tests.hs b/tests/Tests.hs
@@ -1,13 +1,9 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 module Main where
 
-import Test.Framework (defaultMain, testGroup)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.Framework.Providers.HUnit (testCase)
-import Test.HUnit (assertBool)
-
-import Test.QuickCheck
-import Test.QuickCheck.Test
+import Test.Tasty
+import Test.Tasty.QuickCheck
+import Test.Tasty.HUnit
 
 import System.Directory
 import System.FilePath
@@ -65,7 +61,7 @@ main = do
     allGoodJavas <- getAllJavaPaths (testJavaDirectory </> "good")
     allBadJavas <- getAllJavaPaths (testJavaDirectory </> "bad")
 
-    defaultMain
+    defaultMain $ testGroup "java"
         [ testGroup "parsing unit good" (map (toTestCase True) allGoodJavas)
         , testGroup "parsing unit bad" (map (toTestCase False) allBadJavas)
         , testProperty "parsing.generating==id" (\g -> case parser compilationUnit (show $ pretty g) of