Fix pretty-printer tests

lib/unison-pretty-printer/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2021, Unison Computing, public benefit corp and contributors
+Copyright (c) 2013-2022, Unison Computing, public benefit corp and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

lib/unison-pretty-printer/package.yaml

@@ -70,3 +70,7 @@ tests:
     dependencies:
       - base
       - unison-pretty-printer
+      - raw-strings-qq
+      - easytest
+      - containers
+      - code-page

lib/unison-pretty-printer/tests/Suite.hs

@@ -7,7 +7,6 @@ import EasyTest
 import System.Environment (getArgs)
 import System.IO
 import System.IO.CodePage (withCP65001)
-import qualified Unison.Core.Test.Name as Name
 import qualified Unison.Test.ColorText as ColorText
 import qualified Unison.Test.Range as Range
 import qualified Unison.Test.Util.Pretty as Pretty
@@ -17,7 +16,7 @@ test =
   tests
     [ Range.test,
       ColorText.test,
-      Pretty.test,
+      Pretty.test
     ]
 
 main :: IO ()

lib/unison-pretty-printer/tests/Unison/Test/ColorText.hs

@@ -7,7 +7,7 @@ module Unison.Test.ColorText where
 import qualified Data.Map as Map
 import EasyTest
 import Text.RawString.QQ
-import Unison.Lexer (Pos (..))
+import Unison.Lexer.Pos (Pos (..))
 import Unison.Util.AnnotatedText
   ( AnnotatedExcerpt (..),
     condensedExcerptToText,

lib/unison-pretty-printer/tests/Unison/Test/Range.hs

@@ -1,7 +1,7 @@
 module Unison.Test.Range where
 
 import EasyTest
-import Unison.Lexer (Pos (..))
+import Unison.Lexer.Pos (Pos (..))
 import Unison.Util.Range
 
 test :: Test ()

lib/unison-pretty-printer/unison-pretty-printer.cabal

@@ -116,8 +116,8 @@ test-suite pretty-printer-tests
   main-is: Suite.hs
   other-modules:
       Unison.Test.ColorText
-      Unison.Test.Pretty
       Unison.Test.Range
+      Unison.Test.Util.Pretty
       Paths_unison_pretty_printer
   hs-source-dirs:
       tests
@@ -145,6 +145,10 @@ test-suite pretty-printer-tests
   ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures -W -threaded -rtsopts "-with-rtsopts=-N -T" -v0
   build-depends:
       base
+    , code-page
+    , containers
+    , easytest
+    , raw-strings-qq
     , unison-pretty-printer
   if flag(optimized)
     ghc-options: -funbox-strict-fields -O2