diff --git a/hledger-lib/Hledger/Utils/Test.hs b/hledger-lib/Hledger/Utils/Test.hs index d431a2f2d..361957fac 100644 --- a/hledger-lib/Hledger/Utils/Test.hs +++ b/hledger-lib/Hledger/Utils/Test.hs @@ -31,7 +31,7 @@ import Control.Monad.State.Strict (StateT, evalStateT, execStateT) -- import Data.CallStack import Data.List (isInfixOf) import qualified Data.Text as T -import Test.Tasty +import Test.Tasty hiding (defaultMain) import Test.Tasty.HUnit -- import Test.Tasty.QuickCheck as QC -- import Test.Tasty.SmallCheck as SC diff --git a/hledger-ui/Hledger/UI/Main.hs b/hledger-ui/Hledger/UI/Main.hs index 0b12d87b2..2d1373bb7 100644 --- a/hledger-ui/Hledger/UI/Main.hs +++ b/hledger-ui/Hledger/UI/Main.hs @@ -172,7 +172,7 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{inputopts_=_iopts,reportopts_=rop if not (watch_ uopts') then - void $ defaultMain brickapp ui + void $ Brick.defaultMain brickapp ui else do -- a channel for sending misc. events to the app diff --git a/hledger/Hledger/Cli/Commands.hs b/hledger/Hledger/Cli/Commands.hs index cddb36c22..4fb43b742 100644 --- a/hledger/Hledger/Cli/Commands.hs +++ b/hledger/Hledger/Cli/Commands.hs @@ -57,6 +57,7 @@ import qualified Data.Text as T import Data.Time.Calendar import System.Environment (withArgs) import System.Console.CmdArgs.Explicit as C +import Test.Tasty (defaultMain) import Hledger import Hledger.Cli.CliOptions @@ -271,7 +272,7 @@ testmode = hledgerCommandMode testcmd :: CliOpts -> Journal -> IO () testcmd opts _undefined = do withArgs (words' $ query_ $ reportopts_ opts) $ - defaultMain $ tests "hledger" [ -- Test.Tasty.defaultMain from Hledger.Util.Tests + Test.Tasty.defaultMain $ tests "hledger" [ tests_Hledger ,tests "Hledger.Cli" [ tests_Cli_Utils diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index e24065b58..d9b15cde4 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: a8cb399c2c97d23c9fc48e12709494216df3069cce7ec448277be8fde91f72d0 +-- hash: 8a2b2b502050a55652603b9859bcf11a6dbf6cb265a4b7305e36bd31e288af3a name: hledger version: 1.15.99 @@ -175,6 +175,7 @@ library , shakespeare >=2.0.2.2 , split >=0.1 , tabular >=0.2 + , tasty >=1.2.3 , temporary , text >=0.11 , time >=1.5 @@ -225,6 +226,7 @@ executable hledger , shakespeare >=2.0.2.2 , split >=0.1 , tabular >=0.2 + , tasty >=1.2.3 , temporary , text >=0.11 , time >=1.5 @@ -276,6 +278,7 @@ test-suite test , shakespeare >=2.0.2.2 , split >=0.1 , tabular >=0.2 + , tasty >=1.2.3 , temporary , test-framework , test-framework-hunit @@ -328,6 +331,7 @@ benchmark bench , shakespeare >=2.0.2.2 , split >=0.1 , tabular >=0.2 + , tasty >=1.2.3 , temporary , text >=0.11 , time >=1.5 diff --git a/hledger/package.yaml b/hledger/package.yaml index 9b5e30a5c..e2289a5cf 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -131,6 +131,7 @@ dependencies: - split >=0.1 - math-functions >=0.2.0.0 - tabular >=0.2 +- tasty >=1.2.3 - temporary - text >=0.11 - time >=1.5