From bdb7aa793c761f42533810557628c79c80e9c8b3 Mon Sep 17 00:00:00 2001
From: Chris Penner <christopher.penner@gmail.com>
Date: Wed, 9 Mar 2022 11:39:35 -0600
Subject: [PATCH] Fix pretty-printer tests

---
 lib/unison-pretty-printer/LICENSE                           | 2 +-
 lib/unison-pretty-printer/package.yaml                      | 4 ++++
 lib/unison-pretty-printer/tests/Suite.hs                    | 3 +--
 lib/unison-pretty-printer/tests/Unison/Test/ColorText.hs    | 2 +-
 lib/unison-pretty-printer/tests/Unison/Test/Range.hs        | 2 +-
 .../tests/Unison/Test/{ => Util}/Pretty.hs                  | 0
 lib/unison-pretty-printer/unison-pretty-printer.cabal       | 6 +++++-
 7 files changed, 13 insertions(+), 6 deletions(-)
 rename lib/unison-pretty-printer/tests/Unison/Test/{ => Util}/Pretty.hs (100%)

diff --git a/lib/unison-pretty-printer/LICENSE b/lib/unison-pretty-printer/LICENSE
index c45ac9a54..2d9c5682e 100644
--- a/lib/unison-pretty-printer/LICENSE
+++ b/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
diff --git a/lib/unison-pretty-printer/package.yaml b/lib/unison-pretty-printer/package.yaml
index 8ec552f30..c2b77be01 100644
--- a/lib/unison-pretty-printer/package.yaml
+++ b/lib/unison-pretty-printer/package.yaml
@@ -70,3 +70,7 @@ tests:
     dependencies:
       - base
       - unison-pretty-printer
+      - raw-strings-qq
+      - easytest
+      - containers
+      - code-page
diff --git a/lib/unison-pretty-printer/tests/Suite.hs b/lib/unison-pretty-printer/tests/Suite.hs
index d34d793dc..017998d37 100644
--- a/lib/unison-pretty-printer/tests/Suite.hs
+++ b/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 ()
diff --git a/lib/unison-pretty-printer/tests/Unison/Test/ColorText.hs b/lib/unison-pretty-printer/tests/Unison/Test/ColorText.hs
index 31a1de5d3..f34dd762c 100644
--- a/lib/unison-pretty-printer/tests/Unison/Test/ColorText.hs
+++ b/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,
diff --git a/lib/unison-pretty-printer/tests/Unison/Test/Range.hs b/lib/unison-pretty-printer/tests/Unison/Test/Range.hs
index 91f11a07f..92cc29c87 100644
--- a/lib/unison-pretty-printer/tests/Unison/Test/Range.hs
+++ b/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 ()
diff --git a/lib/unison-pretty-printer/tests/Unison/Test/Pretty.hs b/lib/unison-pretty-printer/tests/Unison/Test/Util/Pretty.hs
similarity index 100%
rename from lib/unison-pretty-printer/tests/Unison/Test/Pretty.hs
rename to lib/unison-pretty-printer/tests/Unison/Test/Util/Pretty.hs
diff --git a/lib/unison-pretty-printer/unison-pretty-printer.cabal b/lib/unison-pretty-printer/unison-pretty-printer.cabal
index f0e111fcf..9a6186f05 100644
--- a/lib/unison-pretty-printer/unison-pretty-printer.cabal
+++ b/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