From caf8cdf0ca499072438c7048604fdbfbee02f99d Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 29 Nov 2019 06:20:22 -0800 Subject: [PATCH] ;test: consistent singular naming for test suites and files --- hledger-lib/hledger-lib.cabal | 10 ++++++---- hledger-lib/package.yaml | 13 +++++++++---- hledger-lib/test/doctests.hs | 2 ++ hledger-lib/test/{unittests.hs => unittest.hs} | 0 hledger-web/package.yaml | 5 +++-- hledger-web/{tests => test}/HomeTest.hs | 0 hledger-web/{tests => test}/TestImport.hs | 0 hledger-web/{tests/main.hs => test/test.hs} | 3 +++ hledger/hledger.cabal | 8 ++++---- hledger/package.yaml | 6 +++--- hledger/test/{test.hs => unittest.hs} | 0 11 files changed, 30 insertions(+), 17 deletions(-) rename hledger-lib/test/{unittests.hs => unittest.hs} (100%) rename hledger-web/{tests => test}/HomeTest.hs (100%) rename hledger-web/{tests => test}/TestImport.hs (100%) rename hledger-web/{tests/main.hs => test/test.hs} (84%) rename hledger/test/{test.hs => unittest.hs} (100%) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index bf70c7e1a..d08c4badf 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: cf0e219278c663cf046db556525050092c383724e703e70b43ed174a0cc146b9 +-- hash: 50ae1fdf62051f33ffe1ef49edc8913a28b524ebdba88d72ef257cc0b25a95c2 name: hledger-lib version: 1.15.99 @@ -30,6 +30,8 @@ build-type: Simple extra-source-files: CHANGES.md README + test/unittest.hs + test/doctests.hs hledger_csv.5 hledger_csv.txt hledger_csv.info @@ -146,7 +148,7 @@ library , utf8-string >=0.3.5 default-language: Haskell2010 -test-suite doctests +test-suite doctest type: exitcode-stdio-1.0 main-is: doctests.hs hs-source-dirs: @@ -201,9 +203,9 @@ test-suite doctests buildable: False default-language: Haskell2010 -test-suite unittests +test-suite unittest type: exitcode-stdio-1.0 - main-is: unittests.hs + main-is: unittest.hs hs-source-dirs: ./. test diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index c20737868..adf2ee76c 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -23,6 +23,8 @@ tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5, GHC==8.8.1 extra-source-files: - CHANGES.md - README +- test/unittest.hs +- test/doctests.hs - hledger_csv.5 - hledger_csv.txt - hledger_csv.info @@ -150,20 +152,23 @@ library: # other-modules: # - Ledger.Parser.Text +# "cabal test hledger-lib" currently fails, see doctest suite below tests: - unittests: + unittest: buildable: true source-dirs: test - main: unittests.hs + main: unittest.hs other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 dependencies: - hledger-lib - doctests: + # Running this test suite with cabal requires cabal exec: + # cabal exec -- cabal test hledger-lib:test:doctest + doctest: buildable: true source-dirs: test - main: doctests.hs + main: doctests.hs # can't call it doctest.hs ("File name does not match module name") other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 dependencies: - Glob >=0.7 diff --git a/hledger-lib/test/doctests.hs b/hledger-lib/test/doctests.hs index 29a13ae26..da71f229a 100644 --- a/hledger-lib/test/doctests.hs +++ b/hledger-lib/test/doctests.hs @@ -15,6 +15,8 @@ or: $ stack test hledger-lib:test:doctests [--test-arguments '[--verbose] [--slow] [CIFILEPATHSUBSTRINGS]'] -} +-- This file can't be called doctest.hs ("File name does not match module name") + {-# LANGUAGE PackageImports #-} diff --git a/hledger-lib/test/unittests.hs b/hledger-lib/test/unittest.hs similarity index 100% rename from hledger-lib/test/unittests.hs rename to hledger-lib/test/unittest.hs diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index c65175e75..54a2ab6de 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -156,8 +156,9 @@ executables: # 2018/06 not building and not testing anything useful, disabled for now # tests: # test: -# source-dirs: tests -# main: main.hs +# source-dirs: test +# main: test.hs +# other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 # cpp-options: -DVERSION="1.15.99" # dependencies: # - base diff --git a/hledger-web/tests/HomeTest.hs b/hledger-web/test/HomeTest.hs similarity index 100% rename from hledger-web/tests/HomeTest.hs rename to hledger-web/test/HomeTest.hs diff --git a/hledger-web/tests/TestImport.hs b/hledger-web/test/TestImport.hs similarity index 100% rename from hledger-web/tests/TestImport.hs rename to hledger-web/test/TestImport.hs diff --git a/hledger-web/tests/main.hs b/hledger-web/test/test.hs similarity index 84% rename from hledger-web/tests/main.hs rename to hledger-web/test/test.hs index a6e0ed47f..e1b237e09 100644 --- a/hledger-web/tests/main.hs +++ b/hledger-web/test/test.hs @@ -4,6 +4,9 @@ module Main where +-- cabal missing-home-modules workaround from hledger-lib needed here ? +-- {-# LANGUAGE PackageImports #-} + import Import import Yesod.Default.Config import Yesod.Test diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 3829db2f1..957a18f6e 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: c34a49b389c7aa9792791b41a60416463ac2aff3589693aaf40f68e8b7b9cf75 +-- hash: dce1e3c4551b6781f95215575bb9b99ffa903ccf39375c8df7bbe8ec32f49d12 name: hledger version: 1.15.99 @@ -32,7 +32,7 @@ build-type: Simple extra-source-files: CHANGES.md README.md - test/test.hs + test/unittest.hs bench/10000x1000x10.journal hledger.1 hledger.txt @@ -243,9 +243,9 @@ executable hledger ghc-options: -threaded default-language: Haskell2010 -test-suite test +test-suite unittest type: exitcode-stdio-1.0 - main-is: test.hs + main-is: unittest.hs hs-source-dirs: test ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path diff --git a/hledger/package.yaml b/hledger/package.yaml index e206621f4..54d48546a 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -25,7 +25,7 @@ tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5, GHC==8.8.1 extra-source-files: - CHANGES.md - README.md -- test/test.hs +- test/unittest.hs - bench/10000x1000x10.journal - hledger.1 - hledger.txt @@ -204,9 +204,9 @@ executables: - hledger tests: - test: + unittest: source-dirs: test - main: test.hs + main: unittest.hs other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 cpp-options: -DVERSION="1.15.99" dependencies: diff --git a/hledger/test/test.hs b/hledger/test/unittest.hs similarity index 100% rename from hledger/test/test.hs rename to hledger/test/unittest.hs