Separate pretty-printer test suite

2024-09-11 10:35:57 +03:00 · 2022-03-09 11:21:24 -06:00 · 2022-03-09 11:21:24 -06:00 · 0adda1a855
commit 0adda1a855
parent 763e0ec834
9 changed files with 12 additions and 1216 deletions
--- a/lib/unison-pretty-printer/tests/Suite.hs
+++ b/lib/unison-pretty-printer/tests/Suite.hs
@ -8,69 +8,16 @@ import System.Environment (getArgs)
 import System.IO
 import System.IO.CodePage (withCP65001)
 import qualified Unison.Core.Test.Name as Name
-import qualified Unison.Test.ABT as ABT
-import qualified Unison.Test.ANF as ANF
-import qualified Unison.Test.Cache as Cache
-import qualified Unison.Test.Codebase.Branch as Branch
-import qualified Unison.Test.Codebase.Causal as Causal
-import qualified Unison.Test.Codebase.Path as Path
-import qualified Unison.Test.CodebaseInit as CodebaseInit
 import qualified Unison.Test.ColorText as ColorText
-import qualified Unison.Test.DataDeclaration as DataDeclaration
-import qualified Unison.Test.FileParser as FileParser
-import qualified Unison.Test.Lexer as Lexer
-import qualified Unison.Test.MCode as MCode
 import qualified Unison.Test.Range as Range
-import qualified Unison.Test.Referent as Referent
-import qualified Unison.Test.Term as Term
-import qualified Unison.Test.TermParser as TermParser
-import qualified Unison.Test.TermPrinter as TermPrinter
-import qualified Unison.Test.Type as Type
-import qualified Unison.Test.TypePrinter as TypePrinter
-import qualified Unison.Test.Typechecker as Typechecker
-import qualified Unison.Test.Typechecker.Context as Context
-import qualified Unison.Test.Typechecker.TypeError as TypeError
-import qualified Unison.Test.UnisonSources as UnisonSources
-import qualified Unison.Test.Util.Bytes as Bytes
-import qualified Unison.Test.Util.PinBoard as PinBoard
 import qualified Unison.Test.Util.Pretty as Pretty
-import qualified Unison.Test.Util.Relation as Relation
-import qualified Unison.Test.Util.Text as Text
-import qualified Unison.Test.Var as Var

 test :: Test ()
 test =
  tests
-    [ Cache.test,
-      Lexer.test,
-      Term.test,
-      TermParser.test,
-      TermPrinter.test,
-      Type.test,
-      TypeError.test,
-      TypePrinter.test,
-      UnisonSources.test,
-      FileParser.test,
-      DataDeclaration.test,
-      Range.test,
+    [ Range.test,
      ColorText.test,
-      Bytes.test,
-      Text.test,
-      Relation.test,
-      Path.test,
-      Causal.test,
-      Referent.test,
-      ABT.test,
-      ANF.test,
-      MCode.test,
-      Var.test,
-      Typechecker.test,
-      Context.test,
-      Name.test,
      Pretty.test,
-      PinBoard.test,
-      CodebaseInit.test,
-      Branch.test
    ]

 main :: IO ()
--- a/lib/unison-pretty-printer/tests/Unison/Test/ColorText.hs
+++ b/lib/unison-pretty-printer/tests/Unison/Test/ColorText.hs
--- a/lib/unison-pretty-printer/unison-pretty-printer.cabal
+++ b/lib/unison-pretty-printer/unison-pretty-printer.cabal
@ -115,6 +115,7 @@ test-suite pretty-printer-tests
  type: exitcode-stdio-1.0
  main-is: Suite.hs
  other-modules:
+      Unison.Test.ColorText
      Unison.Test.Pretty
      Unison.Test.Range
      Paths_unison_pretty_printer
--- a/parser-typechecker/package.yaml
+++ b/parser-typechecker/package.yaml
@ -136,6 +136,7 @@ library:
    - unison-core
    - unison-core1
    - unison-prelude
+    - unison-pretty-printer
    - unison-util
    - unison-util-relation
    - open-browser
@ -178,3 +179,4 @@ executables:
      - unison-prelude
      - unison-util
      - unison-util-relation
+      - unison-pretty-printer
--- a/parser-typechecker/src/Unison/Util/Pretty.hs
+++ b/parser-typechecker/src/Unison/Util/Pretty.hs
--- a/parser-typechecker/tests/Suite.hs
+++ b/parser-typechecker/tests/Suite.hs
@ -15,12 +15,10 @@ import qualified Unison.Test.Codebase.Branch as Branch
 import qualified Unison.Test.Codebase.Causal as Causal
 import qualified Unison.Test.Codebase.Path as Path
 import qualified Unison.Test.CodebaseInit as CodebaseInit
-import qualified Unison.Test.ColorText as ColorText
 import qualified Unison.Test.DataDeclaration as DataDeclaration
 import qualified Unison.Test.FileParser as FileParser
 import qualified Unison.Test.Lexer as Lexer
 import qualified Unison.Test.MCode as MCode
-import qualified Unison.Test.Range as Range
 import qualified Unison.Test.Referent as Referent
 import qualified Unison.Test.Term as Term
 import qualified Unison.Test.TermParser as TermParser
@ -33,7 +31,6 @@ import qualified Unison.Test.Typechecker.TypeError as TypeError
 import qualified Unison.Test.UnisonSources as UnisonSources
 import qualified Unison.Test.Util.Bytes as Bytes
 import qualified Unison.Test.Util.PinBoard as PinBoard
-import qualified Unison.Test.Util.Pretty as Pretty
 import qualified Unison.Test.Util.Relation as Relation
 import qualified Unison.Test.Util.Text as Text
 import qualified Unison.Test.Var as Var
@ -52,8 +49,6 @@ test =
      UnisonSources.test,
      FileParser.test,
      DataDeclaration.test,
-      Range.test,
-      ColorText.test,
      Bytes.test,
      Text.test,
      Relation.test,
@ -67,7 +62,6 @@ test =
      Typechecker.test,
      Context.test,
      Name.test,
-      Pretty.test,
      PinBoard.test,
      CodebaseInit.test,
      Branch.test
--- a/parser-typechecker/unison-parser-typechecker.cabal
+++ b/parser-typechecker/unison-parser-typechecker.cabal
@ -173,7 +173,6 @@ library
      Unison.Util.Free
      Unison.Util.Logger
      Unison.Util.PinBoard
-      Unison.Util.Pretty
      Unison.Util.Rope
      Unison.Util.Star3
      Unison.Util.Text
@ -293,6 +292,7 @@ library
    , unison-core
    , unison-core1
    , unison-prelude
+    , unison-pretty-printer
    , unison-util
    , unison-util-relation
    , unliftio
@ -321,7 +321,6 @@ executable tests
      Unison.Test.Codebase.Causal
      Unison.Test.Codebase.Path
      Unison.Test.CodebaseInit
-      Unison.Test.ColorText
      Unison.Test.Common
      Unison.Test.DataDeclaration
      Unison.Test.FileParser
@ -397,6 +396,7 @@ executable tests
    , unison-core1
    , unison-parser-typechecker
    , unison-prelude
+    , unison-pretty-printer
    , unison-util
    , unison-util-relation
    , unliftio
--- a/unison-cli/package.yaml
+++ b/unison-cli/package.yaml
@ -40,6 +40,7 @@ dependencies:
  - unison-prelude
  - unison-util
  - unison-util-relation
+  - unison-pretty-printer
  - unliftio

 library:
--- a/unison-cli/unison-cli.cabal
+++ b/unison-cli/unison-cli.cabal
@ -108,6 +108,7 @@ library
    , unison-core1
    , unison-parser-typechecker
    , unison-prelude
+    , unison-pretty-printer
    , unison-util
    , unison-util-relation
    , unliftio
@ -185,6 +186,7 @@ executable integration-tests
    , unison-core1
    , unison-parser-typechecker
    , unison-prelude
+    , unison-pretty-printer
    , unison-util
    , unison-util-relation
    , unliftio
@ -256,6 +258,7 @@ executable transcripts
    , unison-core1
    , unison-parser-typechecker
    , unison-prelude
+    , unison-pretty-printer
    , unison-util
    , unison-util-relation
    , unliftio
@ -331,6 +334,7 @@ executable unison
    , unison-core1
    , unison-parser-typechecker
    , unison-prelude
+    , unison-pretty-printer
    , unison-util
    , unison-util-relation
    , unliftio
@ -410,6 +414,7 @@ test-suite tests
    , unison-core1
    , unison-parser-typechecker
    , unison-prelude
+    , unison-pretty-printer
    , unison-util
    , unison-util-relation
    , unliftio