From 7dc1bddff823d14a48538f15ce4586c83a03ddff Mon Sep 17 00:00:00 2001 From: Brandon Barker Date: Thu, 26 Dec 2024 18:50:19 -0500 Subject: [PATCH] making it a bit easier to run individual tests --- unison-syntax/package.yaml | 1 + unison-syntax/test/Unison/Test/Doc.hs | 7 ++++++- unison-syntax/unison-syntax.cabal | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/unison-syntax/package.yaml b/unison-syntax/package.yaml index 0742346f40..843819e9fa 100644 --- a/unison-syntax/package.yaml +++ b/unison-syntax/package.yaml @@ -41,6 +41,7 @@ tests: - easytest - free - megaparsec + - safe - unison-core1 - unison-prelude - unison-syntax diff --git a/unison-syntax/test/Unison/Test/Doc.hs b/unison-syntax/test/Unison/Test/Doc.hs index 9028404ada..5d8d272168 100644 --- a/unison-syntax/test/Unison/Test/Doc.hs +++ b/unison-syntax/test/Unison/Test/Doc.hs @@ -2,7 +2,9 @@ module Unison.Test.Doc (test) where import Control.Comonad.Trans.Cofree (CofreeF ((:<))) import Data.Bifunctor (first) +import Data.Char (isAlphaNum) import Data.List.NonEmpty (NonEmpty ((:|))) +import Data.Maybe (fromMaybe) import Data.Text (Text) import EasyTest import Text.Megaparsec qualified as P @@ -12,6 +14,7 @@ import Unison.Syntax.Name qualified as Name import Unison.Syntax.Parser.Doc qualified as DP import Unison.Syntax.Parser.Doc.Data qualified as Doc import Unison.Util.Recursion +import Safe (headMay) test :: Test () test = @@ -133,7 +136,7 @@ t :: [Doc.Top String (Fix (Doc.Leaf Text String)) (Fix (Doc.Top String (Fix (Doc.Leaf Text String))))] -> Test () t s expected = - scope s + scope simpleScope $ scope s . either (crash . P.errorBundlePretty) ( \actual -> @@ -147,6 +150,8 @@ t s expected = crash "actual != expected" ) $ P.runParser (DP.doc (Name.toText . HQ'.toName . snd <$> typeOrTerm) (P.manyTill P.anySingle) P.eof) "test case" s + where + simpleScope = fromMaybe "default" $ headMay $ words $ filter isAlphaNum s -- * Helper functions to make it easier to read the examples. diff --git a/unison-syntax/unison-syntax.cabal b/unison-syntax/unison-syntax.cabal index 8a3e2948ef..3d57394223 100644 --- a/unison-syntax/unison-syntax.cabal +++ b/unison-syntax/unison-syntax.cabal @@ -132,6 +132,7 @@ test-suite syntax-tests , easytest , free , megaparsec + , safe , text , unison-core1 , unison-prelude