Commit ef0f149f authored by Alfredo Di Napoli's avatar Alfredo Di Napoli

Re-arrange test module hierarchy

Tests were written with a very flat module hierarchy which made them
a bit confusing to navigate. This commit moves everything under a common
`Test.*` hierarchy.
parent 85dc07c4
...@@ -876,33 +876,33 @@ executable gargantext-upgrade ...@@ -876,33 +876,33 @@ executable gargantext-upgrade
test-suite garg-test-tasty test-suite garg-test-tasty
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: tasty/Main.hs main-is: drivers/tasty/Main.hs
other-modules: other-modules:
Core.Text Test.Core.Text
Core.Text.Corpus.Query Test.Core.Text.Corpus.Query
Core.Text.Examples Test.Core.Text.Examples
Core.Text.Flow Test.Core.Text.Flow
Core.Utils Test.Core.Utils
Database.Operations Test.Database.Operations
Database.Operations.DocumentSearch Test.Database.Operations.DocumentSearch
Database.Operations.Types Test.Database.Operations.Types
Graph.Clustering Test.Graph.Clustering
Graph.Distance Test.Graph.Distance
Ngrams.Lang Test.Ngrams.Lang
Ngrams.Lang.En Test.Ngrams.Lang.En
Ngrams.Lang.Fr Test.Ngrams.Lang.Fr
Ngrams.Lang.Occurrences Test.Ngrams.Lang.Occurrences
Ngrams.Metrics Test.Ngrams.Metrics
Ngrams.NLP Test.Ngrams.NLP
Ngrams.Query Test.Ngrams.Query
Ngrams.Query.PaginationCorpus Test.Ngrams.Query.PaginationCorpus
Offline.JSON Test.Offline.JSON
Parsers.Date Test.Parsers.Date
Parsers.Types Test.Parsers.Types
Parsers.WOS Test.Parsers.WOS
Utils Test.Utils
Utils.Crypto Test.Utils.Crypto
Utils.Jobs Test.Utils.Jobs
Paths_gargantext Paths_gargantext
hs-source-dirs: hs-source-dirs:
test test
...@@ -972,11 +972,11 @@ test-suite garg-test-tasty ...@@ -972,11 +972,11 @@ test-suite garg-test-tasty
test-suite garg-test-hspec test-suite garg-test-hspec
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: hspec/Main.hs main-is: drivers/hspec/Main.hs
other-modules: other-modules:
Database.Operations Test.Database.Operations
Database.Operations.DocumentSearch Test.Database.Operations.DocumentSearch
Database.Operations.Types Test.Database.Operations.Types
Paths_gargantext Paths_gargantext
hs-source-dirs: hs-source-dirs:
test test
......
module Test.API where
module API.Authentication where
tests :: TestTree
tests = testGroup "Authentication" [unitTests]
...@@ -10,7 +10,7 @@ Portability : POSIX ...@@ -10,7 +10,7 @@ Portability : POSIX
-} -}
module Core.Text where module Test.Core.Text where
{- {-
import Gargantext.API.Ngrams.Types (NgramsTerm(..)) import Gargantext.API.Ngrams.Types (NgramsTerm(..))
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeApplications #-}
module Core.Text.Corpus.Query (tests) where module Test.Core.Text.Corpus.Query (tests) where
import Data.BoolExpr import Data.BoolExpr
import Data.Conduit import Data.Conduit
......
...@@ -23,7 +23,7 @@ This document defines basic of Text definitions according to Gargantext.. ...@@ -23,7 +23,7 @@ This document defines basic of Text definitions according to Gargantext..
{-# LANGUAGE BangPatterns #-} {-# LANGUAGE BangPatterns #-}
module Core.Text.Examples module Test.Core.Text.Examples
where where
{- {-
......
...@@ -12,7 +12,7 @@ From text to viz, all the flow of texts in Gargantext. ...@@ -12,7 +12,7 @@ From text to viz, all the flow of texts in Gargantext.
-} -}
module Core.Text.Flow module Test.Core.Text.Flow
where where
{- {-
......
...@@ -9,7 +9,7 @@ Portability : POSIX ...@@ -9,7 +9,7 @@ Portability : POSIX
-} -}
module Core.Utils where module Test.Core.Utils where
import Test.Hspec import Test.Hspec
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
{-# OPTIONS_GHC -Wno-orphans #-} {-# OPTIONS_GHC -Wno-orphans #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
module Database.Operations ( module Test.Database.Operations (
tests tests
) where ) where
...@@ -37,16 +37,16 @@ import qualified Database.PostgreSQL.Simple.Options as Client ...@@ -37,16 +37,16 @@ import qualified Database.PostgreSQL.Simple.Options as Client
import qualified Database.Postgres.Temp as Tmp import qualified Database.Postgres.Temp as Tmp
import qualified Shelly as SH import qualified Shelly as SH
import Database.Operations.Types import Gargantext.Database.Action.Flow
import Database.Operations.DocumentSearch import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
import Gargantext.Database.Admin.Trigger.Init
import Paths_gargantext import Paths_gargantext
import Test.Database.Operations.DocumentSearch
import Test.Database.Operations.Types
import Test.Hspec import Test.Hspec
import Test.QuickCheck.Monadic import Test.QuickCheck.Monadic
import Test.Tasty.HUnit hiding (assert) import Test.Tasty.HUnit hiding (assert)
import Test.Tasty.QuickCheck import Test.Tasty.QuickCheck
import Gargantext.Database.Admin.Trigger.Init
import Gargantext.Database.Action.Flow
import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
-- | Keeps a log of usernames we have already generated, so that our -- | Keeps a log of usernames we have already generated, so that our
-- roundtrip tests won't fail. -- roundtrip tests won't fail.
......
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE QuasiQuotes #-}
module Database.Operations.DocumentSearch where module Test.Database.Operations.DocumentSearch where
import Prelude import Prelude
...@@ -18,7 +18,7 @@ import Gargantext.Database.Query.Tree.Root ...@@ -18,7 +18,7 @@ import Gargantext.Database.Query.Tree.Root
import Gargantext.Database.Schema.Node (NodePoly(..)) import Gargantext.Database.Schema.Node (NodePoly(..))
import Network.URI (parseURI) import Network.URI (parseURI)
import Database.Operations.Types import Test.Database.Operations.Types
import Test.Hspec.Expectations import Test.Hspec.Expectations
import Test.Tasty.HUnit import Test.Tasty.HUnit
import Gargantext.Core.Text.Terms.Mono.Stem.En import Gargantext.Core.Text.Terms.Mono.Stem.En
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE UndecidableInstances #-}
{-# OPTIONS_GHC -Wno-orphans #-} {-# OPTIONS_GHC -Wno-orphans #-}
module Database.Operations.Types where module Test.Database.Operations.Types where
import Control.Exception import Control.Exception
import Control.Lens import Control.Lens
......
...@@ -10,7 +10,7 @@ Portability : POSIX ...@@ -10,7 +10,7 @@ Portability : POSIX
-} -}
module Graph.Clustering where module Test.Graph.Clustering where
import Gargantext.API.Ngrams.Types (NgramsTerm(..)) import Gargantext.API.Ngrams.Types (NgramsTerm(..))
import Gargantext.Core.Viz.Graph import Gargantext.Core.Viz.Graph
......
...@@ -13,7 +13,7 @@ commentary with @some markup@. ...@@ -13,7 +13,7 @@ commentary with @some markup@.
-} -}
module Graph.Distance where module Test.Graph.Distance where
import Test.Hspec import Test.Hspec
......
...@@ -13,7 +13,7 @@ commentary with @some markup@. ...@@ -13,7 +13,7 @@ commentary with @some markup@.
-} -}
module Ngrams.Lang where module Test.Ngrams.Lang where
{- {-
import Gargantext.Prelude (IO()) import Gargantext.Prelude (IO())
......
...@@ -13,7 +13,7 @@ commentary with @some markup@. ...@@ -13,7 +13,7 @@ commentary with @some markup@.
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
module Ngrams.Lang.En where module Test.Ngrams.Lang.En where
{- {-
import Data.List ((!!)) import Data.List ((!!))
......
...@@ -13,7 +13,7 @@ commentary with @some markup@. ...@@ -13,7 +13,7 @@ commentary with @some markup@.
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
module Ngrams.Lang.Fr where module Test.Ngrams.Lang.Fr where
{- {-
import Test.Hspec import Test.Hspec
......
...@@ -13,7 +13,7 @@ commentary with @some markup@. ...@@ -13,7 +13,7 @@ commentary with @some markup@.
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
module Ngrams.Lang.Occurrences where module Test.Ngrams.Lang.Occurrences where
{- {-
import Test.Hspec import Test.Hspec
......
...@@ -16,7 +16,7 @@ commentary with @some markup@. ...@@ -16,7 +16,7 @@ commentary with @some markup@.
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
--module Ngrams.Metrics (main) where --module Ngrams.Metrics (main) where
module Ngrams.Metrics where module Test.Ngrams.Metrics where
{- {-
import Data.Text (Text) import Data.Text (Text)
......
...@@ -11,7 +11,7 @@ Portability : POSIX ...@@ -11,7 +11,7 @@ Portability : POSIX
-} -}
module Ngrams.NLP where module Test.Ngrams.NLP where
import Data.Text (Text) import Data.Text (Text)
import Test.Hspec import Test.Hspec
......
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeApplications #-}
module Ngrams.Query (tests) where module Test.Ngrams.Query (tests) where
import Control.Monad import Control.Monad
import Data.Coerce import Data.Coerce
...@@ -16,7 +16,7 @@ import qualified Data.Patch.Class as Patch ...@@ -16,7 +16,7 @@ import qualified Data.Patch.Class as Patch
import qualified Data.Validity as Validity import qualified Data.Validity as Validity
import qualified Data.Text as T import qualified Data.Text as T
import Ngrams.Query.PaginationCorpus import Test.Ngrams.Query.PaginationCorpus
import Test.Tasty import Test.Tasty
import Test.Tasty.HUnit import Test.Tasty.HUnit
......
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
module Ngrams.Query.PaginationCorpus where module Test.Ngrams.Query.PaginationCorpus where
import Prelude import Prelude
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeApplications #-}
{-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE QuasiQuotes #-}
module Offline.JSON (tests) where module Test.Offline.JSON (tests) where
import Data.Aeson import Data.Aeson
import Data.Either import Data.Either
......
...@@ -12,7 +12,7 @@ commentary with @some markup@. ...@@ -12,7 +12,7 @@ commentary with @some markup@.
-} -}
module Parsers.Date where module Test.Parsers.Date where
import Test.Hspec import Test.Hspec
...@@ -28,7 +28,8 @@ import Duckling.Time.Types (toRFC3339) ...@@ -28,7 +28,8 @@ import Duckling.Time.Types (toRFC3339)
----------------------------------------------------------- -----------------------------------------------------------
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Core.Text.Corpus.Parsers.Date.Parsec (fromRFC3339) import Gargantext.Core.Text.Corpus.Parsers.Date.Parsec (fromRFC3339)
import Parsers.Types import Test.Parsers.Types
----------------------------------------------------------- -----------------------------------------------------------
fromRFC3339Inv :: Either ParseError ZonedTime -> Text fromRFC3339Inv :: Either ParseError ZonedTime -> Text
......
...@@ -15,7 +15,7 @@ commentary with @some markup@. ...@@ -15,7 +15,7 @@ commentary with @some markup@.
{-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE StandaloneDeriving #-}
module Parsers.Types where module Test.Parsers.Types where
import Gargantext.Prelude import Gargantext.Prelude
......
...@@ -12,4 +12,4 @@ commentary with @some markup@. ...@@ -12,4 +12,4 @@ commentary with @some markup@.
-} -}
module Parsers.WOS where module Test.Parsers.WOS where
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
module Utils where module Test.Utils where
import Prelude import Prelude
import Control.Exception import Control.Exception
......
...@@ -9,7 +9,7 @@ Portability : POSIX ...@@ -9,7 +9,7 @@ Portability : POSIX
-} -}
module Utils.Crypto where module Test.Utils.Crypto where
import Data.Text (Text) import Data.Text (Text)
import Test.Hspec import Test.Hspec
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE NumericUnderscores #-} {-# LANGUAGE NumericUnderscores #-}
module Utils.Jobs (test) where module Test.Utils.Jobs (test) where
import Control.Concurrent import Control.Concurrent
import qualified Control.Concurrent.Async as Async import qualified Control.Concurrent.Async as Async
......
...@@ -7,7 +7,7 @@ import Control.Exception ...@@ -7,7 +7,7 @@ import Control.Exception
import Shelly hiding (FilePath) import Shelly hiding (FilePath)
import System.Process import System.Process
import System.IO import System.IO
import qualified Database.Operations as DB import qualified Test.Database.Operations as DB
import Test.Hspec import Test.Hspec
......
...@@ -12,15 +12,15 @@ module Main where ...@@ -12,15 +12,15 @@ module Main where
import Gargantext.Prelude import Gargantext.Prelude
import qualified Core.Text.Corpus.Query as CorpusQuery import qualified Test.Core.Text.Corpus.Query as CorpusQuery
import qualified Core.Utils as Utils import qualified Test.Core.Utils as Utils
import qualified Graph.Clustering as Graph import qualified Test.Graph.Clustering as Graph
import qualified Ngrams.NLP as NLP import qualified Test.Ngrams.NLP as NLP
import qualified Ngrams.Query as NgramsQuery import qualified Test.Ngrams.Query as NgramsQuery
import qualified Offline.JSON as JSON import qualified Test.Offline.JSON as JSON
import qualified Parsers.Date as PD import qualified Test.Parsers.Date as PD
import qualified Utils.Crypto as Crypto import qualified Test.Utils.Crypto as Crypto
import qualified Utils.Jobs as Jobs import qualified Test.Utils.Jobs as Jobs
import Test.Tasty import Test.Tasty
import Test.Tasty.Hspec import Test.Tasty.Hspec
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment