From fdb7796f70fce1fe058c6ea12f76c560d4fb1f3e Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Thu, 30 May 2024 13:46:16 -0400 Subject: [PATCH] Use let binding for goldenFile in each test --- test-suite-golden/src/Golden.hs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test-suite-golden/src/Golden.hs b/test-suite-golden/src/Golden.hs index 18f2d60..43f8051 100644 --- a/test-suite-golden/src/Golden.hs +++ b/test-suite-golden/src/Golden.hs @@ -55,47 +55,52 @@ goldenTestSet title dhallFiles = do [ testGroup ".dhall to .cabal" [ goldenVsFile (testName dhallFile) - (cabalFile -<.> goldExt Cabal) + goldenFile cabalFile (writeDhallCabal dhallFile) | dhallFile <- dhallFiles , let cabalFile = cabalFilePath dhallFile + , let goldenFile = cabalFile -<.> goldExt Cabal ] , testGroup ".dhall to dhall" [ goldenVsString (testName dhallFile) - (dhallFile -<.> goldExt Dhall) + goldenFile (fmap fromString . showDhall $ dhallFile) | dhallFile <- dhallFiles + , let goldenFile = dhallFile -<.> goldExt Dhall ] , testGroup ".dhall to json" [ goldenVsFile (testName dhallFile) - (dhallFile -<.> goldExt Json) + goldenFile jsonFile (writeJson dhallFile jsonFile) | dhallFile <- dhallFiles , let jsonFile = dhallFile -<.> ".json" + , let goldenFile = dhallFile -<.> goldExt Json ] , testGroup ".dhall to yaml" [ goldenVsFile (testName dhallFile) - (dhallFile -<.> goldExt Yaml) + goldenFile yamlFile (writeYaml dhallFile yamlFile) | dhallFile <- dhallFiles , let yamlFile = dhallFile -<.> ".yaml" + , let goldenFile = dhallFile -<.> goldExt Yaml ] , testGroup ".yaml to .cabal" [ goldenVsFile (testName dhallFile) - (cabalFile -<.> goldExt Cabal) + goldenFile cabalFile (writeYamlCabal yamlFile cabalFile yamlCabalFile) | dhallFile <- dhallFiles , let yamlFile = dhallFile -<.> ".yaml" , let cabalFile = cabalFilePath dhallFile , let yamlCabalFile = yamlFile <.> ".cabal" + , let goldenFile = cabalFile -<.> goldExt Cabal ] ]