resolve test input file mainnet-config.json

Author: mgmeier

cardano-node/test/Test/Cardano/Tracing/NewTracing/Consistency.hs

@@ -8,7 +8,8 @@ import           Cardano.Node.Tracing.Consistency (checkNodeTraceConfiguration)
 
 import           Control.Monad.IO.Class (MonadIO, liftIO)
 import           Data.Text
-import           System.FilePath ((</>))
+import qualified System.Directory as IO
+import           System.FilePath (takeFileName, (</>))
 
 import           Hedgehog (Property)
 import qualified Hedgehog as H
@@ -21,40 +22,33 @@ tests = do
   H.checkSequential
       $ H.Group "Configuration Consistency tests"
       $ Prelude.map test
-            [ {--( []
+            [ ( []
               -- This file name shoud reference the current standard config  with new tracing
               -- Add this testcase when hydra has access to a config file with new tracing config
-              , "mainnet-config.json"
-              , configPrefix)
-              ,--}
+              , configSubdir </> "mainnet-config.json"
+              )
+              ,
               (  []
-              , "goodConfig.yaml"
-              , testPrefix)
+              , testSubdir </> "goodConfig.yaml"
+              )
             , (  [ "Config namespace error: Illegal namespace ChainDB.CopyToImmutableDBEvent2.CopiedBlockToImmutableDB"
                   , "Config namespace error: Illegal namespace SubscriptionDNS"
                   ]
-              , "badConfig.yaml"
-              , testPrefix)
+              , testSubdir </> "badConfig.yaml"
+              )
             ]
   where
-    test (actualValue, goldenBaseName, prefix) =
-        (PropertyName goldenBaseName, goldenTestJSON actualValue goldenBaseName prefix)
+    test (actualValue, goldenBaseName) =
+        (PropertyName (takeFileName goldenBaseName), goldenTestJSON actualValue goldenBaseName)
 
-
-goldenTestJSON :: [Text] -> FilePath -> (FilePath -> IO FilePath) -> Property
-goldenTestJSON expectedOutcome goldenFileBaseName prefixFunc =
+goldenTestJSON :: [Text] -> FilePath -> Property
+goldenTestJSON expectedOutcome goldenFileBaseName =
     H.withTests 1 $ H.withShrinks 0 $ H.property $ do
-      basePath <- H.getProjectBase
-      prefixPath <- liftIO $ prefixFunc basePath
-      goldenFp    <- H.note $ prefixPath </> goldenFileBaseName
+      base <- H.note =<< H.evalIO . IO.canonicalizePath =<< H.getProjectBase
+      let goldenFp = base </> goldenFileBaseName
       actualValue <- liftIO $ checkNodeTraceConfiguration goldenFp
       actualValue H.=== expectedOutcome
 
-
--- configPrefix :: FilePath -> IO FilePath
--- configPrefix projectBase = do
---   base <- canonicalizePath projectBase
---   return $ base </> "configuration/cardano/"
-
-testPrefix :: FilePath ->  IO FilePath
-testPrefix _ = pure "test/Test/Cardano/Tracing/NewTracing/data/"
+testSubdir, configSubdir :: FilePath
+testSubdir    = "cardano-node/test/Test/Cardano/Tracing/NewTracing/data"
+configSubdir  = "configuration/cardano"