ehmry/dhall-haskell
ehmry/dhall-haskell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to reflect new test organization (#874)

Browse Source 
... as standardized in https://github.com/dhall-lang/dhall-lang/pull/443
This commit is contained in:
Gabriel Gonzalez 2019-03-30 10:57:44 -07:00 committed by GitHub
parent 5c690f9ca1
commit 6cbd9f2b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhall/dhall-lang

@ -1 +1 @@
Subproject commit 9303e67aa71d28b2a95d93f7ef910f6e714069e6
Subproject commit c77f22cb10f25d9c3e29801760849c81b8595407

5
dhall/dhall.cabal
View File

@ -109,7 +109,6 @@ Extra-Source-Files:
dhall-lang/tests/normalization/success/haskell-tutorial/combineTypes/*.dhall
dhall-lang/tests/normalization/success/haskell-tutorial/prefer/*.dhall
dhall-lang/tests/normalization/success/haskell-tutorial/projection/*.dhall
dhall-lang/tests/normalization/success/multiline/*.dhall
dhall-lang/tests/normalization/success/prelude/Bool/and/*.dhall
dhall-lang/tests/normalization/success/prelude/Bool/and/*.dhall
dhall-lang/tests/normalization/success/prelude/Bool/build/*.dhall
@ -235,6 +234,10 @@ Extra-Source-Files:
dhall-lang/tests/parser/failure/*.dhall
dhall-lang/tests/parser/success/*.dhall
dhall-lang/tests/parser/success/*.dhallb
dhall-lang/tests/parser/success/import/*.dhall
dhall-lang/tests/parser/success/import/*.dhallb
dhall-lang/tests/parser/success/text/*.dhall
dhall-lang/tests/parser/success/text/*.dhallb
dhall-lang/tests/typecheck/failure/*.dhall
dhall-lang/tests/typecheck/success/*.dhall
dhall-lang/tests/typecheck/success/prelude/Bool/and/*.dhall

27
dhall/tests/Dhall/Test/Normalization.hs
View File

@ -48,7 +48,6 @@ tests =
, shouldNormalize
"enums"
"success/simple/enum"
, multiline
]
tutorialExamples :: TestTree
@ -413,32 +412,6 @@ customization =
, nestedReduction
]
multiline :: TestTree
multiline =
testGroup "Multi-line literals"
[ shouldNormalize
"multi-line escape sequences"
"./success/multiline/escape"
, shouldNormalize
"a multi-line literal with a hanging indent"
"./success/multiline/hangingIndent"
, shouldNormalize
"a multi-line literal with an interior indent"
"./success/multiline/interiorIndent"
, shouldNormalize
"a multi-line literal with an interpolated expression"
"./success/multiline/interpolation"
, should
"preserve comments within a multi-line literal"
"./success/multiline/preserveComment"
, shouldNormalize
"a multi-line literal with one line"
"./success/multiline/singleLine"
, shouldNormalize
"a multi-line literal with two lines"
"./success/multiline/twoLines"
]
simpleCustomization :: TestTree
simpleCustomization = testCase "simpleCustomization" $ do
let tyCtx = insert "min" (Pi "_" Natural (Pi "_" Natural Natural)) empty

63
dhall/tests/Dhall/Test/Parser.hs
View File

@ -46,25 +46,25 @@ tests =
"./dhall-lang/tests/parser/success/quotedLabel"
, shouldParse
"double quoted string"
"./dhall-lang/tests/parser/success/doubleQuotedString"
"./dhall-lang/tests/parser/success/text/doubleQuotedString"
, shouldParse
"Unicode double quoted string"
"./dhall-lang/tests/parser/success/unicodeDoubleQuotedString"
"./dhall-lang/tests/parser/success/text/unicodeDoubleQuotedString"
, shouldParse
"escaped double quoted string"
"./dhall-lang/tests/parser/success/escapedDoubleQuotedString"
"./dhall-lang/tests/parser/success/text/escapedDoubleQuotedString"
, shouldParse
"interpolated double quoted string"
"./dhall-lang/tests/parser/success/interpolatedDoubleQuotedString"
"./dhall-lang/tests/parser/success/text/interpolatedDoubleQuotedString"
, shouldParse
"single quoted string"
"./dhall-lang/tests/parser/success/singleQuotedString"
"./dhall-lang/tests/parser/success/text/singleQuotedString"
, shouldParse
"escaped single quoted string"
"./dhall-lang/tests/parser/success/escapedSingleQuotedString"
"./dhall-lang/tests/parser/success/text/escapedSingleQuotedString"
, shouldParse
"interpolated single quoted string"
"./dhall-lang/tests/parser/success/interpolatedSingleQuotedString"
"./dhall-lang/tests/parser/success/text/interpolatedSingleQuotedString"
, shouldParse
"double"
"./dhall-lang/tests/parser/success/double"
@ -76,16 +76,19 @@ tests =
"./dhall-lang/tests/parser/success/identifier"
, shouldParse
"paths"
"./dhall-lang/tests/parser/success/paths"
"./dhall-lang/tests/parser/success/import/paths"
, shouldParse
"path termination"
"./dhall-lang/tests/parser/success/pathTermination"
"./dhall-lang/tests/parser/success/import/pathTermination"
, shouldParse
"urls"
"./dhall-lang/tests/parser/success/urls"
"./dhall-lang/tests/parser/success/import/urls"
, shouldParse
"environmentVariables"
"./dhall-lang/tests/parser/success/environmentVariables"
"./dhall-lang/tests/parser/success/import/environmentVariables"
, shouldParse
"hash"
"./dhall-lang/tests/parser/success/import/hash"
, shouldParse
"lambda"
"./dhall-lang/tests/parser/success/lambda"
@ -127,7 +130,7 @@ tests =
"./dhall-lang/tests/parser/success/builtins"
, shouldParse
"import alternatives"
"./dhall-lang/tests/parser/success/importAlt"
"./dhall-lang/tests/parser/success/import/importAlt"
, shouldParse
"large expression"
"./dhall-lang/tests/parser/success/largeExpression"
@ -136,13 +139,13 @@ tests =
"./dhall-lang/tests/parser/success/reservedPrefix"
, shouldParse
"interpolated expressions with leading whitespace"
"./dhall-lang/tests/parser/success/template"
"./dhall-lang/tests/parser/success/text/template"
, shouldParse
"collections with type annotations containing imports"
"./dhall-lang/tests/parser/success/collectionImportType"
, shouldParse
"a parenthesized custom header import"
"./dhall-lang/tests/parser/success/parenthesizeUsing"
"./dhall-lang/tests/parser/success/import/parenthesizeUsing"
, shouldNotParse
"accessing a field of an import without parentheses"
"./dhall-lang/tests/parser/failure/importAccess.dhall"
@ -151,7 +154,7 @@ tests =
"./dhall-lang/tests/parser/success/sort"
, shouldParse
"quoted path components"
"./dhall-lang/tests/parser/success/quotedPaths"
"./dhall-lang/tests/parser/success/import/quotedPaths"
, shouldNotParse
"positive double out of bounds"
"./dhall-lang/tests/parser/failure/doubleBoundsPos.dhall"
@ -160,13 +163,39 @@ tests =
"./dhall-lang/tests/parser/failure/doubleBoundsNeg.dhall"
, shouldParse
"as Text"
"./dhall-lang/tests/parser/success/asText"
"./dhall-lang/tests/parser/success/import/asText"
, shouldNotParse
"a multi-line literal without an initial newline"
"./dhall-lang/tests/parser/failure/mandatoryNewline.dhall"
, shouldParse
"a Unicode path component"
"./dhall-lang/tests/parser/success/unicodePaths"
"./dhall-lang/tests/parser/success/import/unicodePaths"
]
multiline :: TestTree
multiline =
Test.Tasty.testGroup "Multi-line literals"
[ shouldParse
"multi-line escape sequences"
"./dhall-lang/tests/parser/success/text/escape"
, shouldParse
"a multi-line literal with a hanging indent"
"./dhall-lang/tests/parser/success/text/hangingIndent"
, shouldParse
"a multi-line literal with an interior indent"
"./dhall-lang/tests/parser/success/text/interiorIndent"
, shouldParse
"a multi-line literal with an interpolated expression"
"./dhall-lang/tests/parser/success/text/interpolation"
, shouldParse
"comments within a multi-line literal"
"./dhall-lang/tests/parser/success/text/preserveComment"
, shouldParse
"a multi-line literal with one line"
"./dhall-lang/tests/parser/success/text/singleLine"
, shouldParse
"a multi-line literal with two lines"
"./dhall-lang/tests/parser/success/text/twoLines"
]
shouldParse :: Text -> FilePath -> TestTree