Merge pull request #125 from github/tasty-golden-scrumptious-tests

Use tasty-golden for golden tests and ditch vendored hspec-expectations package.

Author: Patrick Thomson

.travis.yml

@@ -28,7 +28,7 @@ before_install:
 - cabal --version
 
 install:
-- cabal new-update hackage.haskell.org
+- cabal new-update -v hackage.haskell.org
 - cabal new-configure --enable-tests --write-ghc-environment-files=always
 - cabal new-build --only-dependencies -j
 

cabal.project

@@ -14,8 +14,3 @@ source-repository-package
   type: git
   location: https://github.com/joshvera/proto3-wire.git
   tag: 84664e22f01beb67870368f1f88ada5d0ad01f56
-
-source-repository-package
-  type: git
-  location: https://github.com/rewinfrey/hspec-expectations-pretty-diff
-  tag: 94af5871c24ba319f7f72fefa53c1a4d074c9a29

semantic.cabal

@@ -274,7 +274,7 @@ library
   autogen-modules:     Paths_semantic
   other-modules:       Paths_semantic
   build-depends:       base >= 4.12 && < 5
-                     , ansi-terminal ^>= 0.8.2
+                     , ansi-terminal >= 0.8.2 && <1
                      , array ^>= 0.5.3.0
                      , attoparsec ^>= 0.13.2.2
                      , cmark-gfm == 0.1.8
@@ -340,6 +340,7 @@ test-suite test
   import:              haskell, dependencies, executable-flags
   type:                exitcode-stdio-1.0
   hs-source-dirs:      test
+  ghc-options:         -Wunused-imports
   main-is:             Spec.hs
   other-modules:       Analysis.Go.Spec
                      , Analysis.PHP.Spec
@@ -381,13 +382,16 @@ test-suite test
                      , Test.Hspec.LeanCheck
   build-depends:       semantic
                      , tree-sitter-json
-                     , Glob
+                     , Glob ^>= 0.10.0
                      , hspec >= 2.6 && <3
                      , hspec-core >= 2.6 && <3
-                     , hspec-expectations-pretty-diff ^>= 0.7.2.5
+                     , hspec-expectations ^>= 0.8.2
+                     , tasty ^>= 1.2.3
+                     , tasty-golden ^>= 2.3.2
+                     , tasty-hspec ^>= 1.1.5.1
                      , HUnit ^>= 1.6.0.0
                      , leancheck >= 0.8 && <1
-                     , temporary
+                     , temporary ^>= 1.3
   if flag(release)
     ghc-options:       -dynamic
 
@@ -398,9 +402,9 @@ test-suite parse-examples
   main-is:             Examples.hs
   build-depends:       semantic
                      , Glob
-                     , hspec >= 2.4.1
+                     , hspec
                      , hspec-core
-                     , hspec-expectations-pretty-diff
+                     , hspec-expectations
 
 benchmark evaluation
   import:              haskell, executable-flags
@@ -409,7 +413,7 @@ benchmark evaluation
   main-is:             Main.hs
   ghc-options:         -static
   build-depends:       base
-                     , criterion
+                     , criterion ^>= 1.5
                      , semantic
 
 source-repository head

test/Analysis/Go/Spec.hs

@@ -1,10 +1,8 @@
 {-# OPTIONS_GHC -O0 #-}
 module Analysis.Go.Spec (spec) where
 
-import Data.Abstract.Evaluatable (EvalError(..))
 import qualified Data.Abstract.ModuleTable as ModuleTable
 import qualified Data.Language as Language
-import qualified Language.Go.Assignment as Go
 import SpecHelpers
 
 

test/Analysis/PHP/Spec.hs

@@ -1,12 +1,9 @@
 {-# OPTIONS_GHC -O0 #-}
 module Analysis.PHP.Spec (spec) where
 
-import           Control.Abstract
-import           Data.Abstract.Evaluatable (EvalError (..))
 import qualified Data.Abstract.ModuleTable as ModuleTable
 import qualified Data.Abstract.Value.Concrete as Value
 import qualified Data.Language as Language
-import qualified Language.PHP.Assignment as PHP
 import           SpecHelpers
 
 

test/Analysis/Python/Spec.hs

@@ -1,9 +1,8 @@
+{-# OPTIONS_GHC -O0 #-}
 module Analysis.Python.Spec (spec) where
 
-import Data.Abstract.Evaluatable (EvalError(..))
 import qualified Data.Abstract.ModuleTable as ModuleTable
 import Data.Abstract.Value.Concrete
-import qualified Language.Python.Assignment as Python
 import qualified Data.Language as Language
 
 import SpecHelpers

test/Analysis/Ruby/Spec.hs

@@ -2,14 +2,13 @@
 {-# LANGUAGE TupleSections #-}
 module Analysis.Ruby.Spec (spec) where
 
-import           Control.Abstract (Declaration (..), ScopeError (..), runDeref)
+import           Control.Abstract (Declaration (..), ScopeError (..))
 import           Control.Effect.Resumable (SomeError (..))
 import           Data.Abstract.Evaluatable
 import qualified Data.Abstract.ModuleTable as ModuleTable
 import           Data.Abstract.Number as Number
 import           Data.Abstract.Value.Concrete as Value
 import qualified Data.Language as Language
-import           Data.List.NonEmpty (NonEmpty (..))
 import           Data.Sum
 
 import SpecHelpers

test/Analysis/TypeScript/Spec.hs

@@ -5,20 +5,15 @@ module Analysis.TypeScript.Spec (spec) where
 import           Data.Syntax.Statement (StatementBlock(..))
 import qualified Data.Abstract.ScopeGraph as ScopeGraph (AccessControl(..))
 import           Control.Abstract.ScopeGraph hiding (AccessControl(..))
-import           Control.Abstract.Value as Value hiding (String, Unit)
-import           Control.Arrow ((&&&))
 import           Data.Abstract.Evaluatable
 import qualified Data.Abstract.Heap as Heap
 import           Data.Abstract.Module (ModuleInfo (..))
 import qualified Data.Abstract.ModuleTable as ModuleTable
 import           Data.Abstract.Number as Number
 import           Data.Abstract.Package (PackageInfo (..))
-import qualified Data.Abstract.ScopeGraph as ScopeGraph
 import           Data.Abstract.Value.Concrete as Concrete
 import qualified Data.Language as Language
-import qualified Data.List.NonEmpty as NonEmpty
 import           Data.Location
-import qualified Data.Map.Internal as Map
 import           Data.Quieterm
 import           Data.Scientific (scientific)
 import           Data.Sum

test/Control/Abstract/Evaluator/Spec.hs

@@ -8,19 +8,14 @@ import qualified Control.Abstract.Heap as Heap
 import           Data.Abstract.Address.Precise as Precise
 import           Data.Abstract.BaseError
 import           Data.Abstract.Evaluatable
-import           Data.Abstract.FreeVariables
 import           Data.Abstract.Module
 import qualified Data.Abstract.Number as Number
 import           Data.Abstract.Package
 import qualified Data.Abstract.ScopeGraph as ScopeGraph
 import           Data.Abstract.Value.Concrete as Value
-import           Data.Algebra
-import           Data.Bifunctor (first)
-import           Data.Functor.Const
 import qualified Data.Language as Language
 import qualified Data.Map.Strict as Map
 import           Data.Sum
-import           Data.Text (pack)
 import           SpecHelpers hiding (reassociate)
 import           System.IO.Unsafe (unsafePerformIO)
 

test/Data/Abstract/Name/Spec.hs

@@ -2,8 +2,6 @@ module Data.Abstract.Name.Spec where
 
 import SpecHelpers
 
-import Data.Abstract.Name
-
 spec :: Spec
 spec = describe "Data.Abstract.Name" $
   it "should format anonymous names correctly" $ do