Fix test

Author: sevanspowell

metadata-lib/metadata-lib.cabal

@@ -103,6 +103,7 @@ test-suite unit-tests
                 , QuickCheck
                 , aeson
                 , aeson-pretty
+                , aeson-qq
                 , base >=4.12 && <5
                 , base64-bytestring
                 , bytestring

metadata-lib/test/Test/Cardano/Metadata/Validation.hs

@@ -9,14 +9,16 @@ module Test.Cardano.Metadata.Validation
   ) where
 
 import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.Encode.Pretty as Aeson
+import Data.Aeson.QQ
+    ( aesonQQ )
+import qualified Data.ByteString.Lazy as BSL
 import Data.Foldable
     ( forM_, traverse_ )
 import Data.Int
     ( Int32, Int64, Int8 )
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as M
-import Data.Maybe
-    ( fromJust )
 import qualified Data.Text as T
 import Data.Validation
     ( Validation (Failure) )
@@ -59,6 +61,7 @@ import Cardano.Metadata.Types.Common
     , seqSucc
     , seqZero
     , unSequenceNumber
+    , unSubject
     )
 import Cardano.Metadata.Validation.Rules
     ( ValidationError (ErrorMetadataFileBaseNameLengthBounds, ErrorMetadataFileExpectedExtension, ErrorMetadataFileNameDoesntMatchSubject, ErrorMetadataFileTooBig, ErrorMetadataPropertySequenceNumberMustBeLarger)
@@ -78,6 +81,7 @@ import Cardano.Metadata.Validation.Types
     , Metadata (Metadata)
     , invalid
     , metaAttestedProperties
+    , metaSubject
     , metaVerifiableProperties
     , onMatchingAttestedProperties
     , valid
@@ -102,6 +106,21 @@ tests = testGroup "Validation tests"
       ]
   ]
 
+-- | From a JSON value, parse some Metadata and use the length of the
+-- pretty encoded JSON value and parsed Subject to make a well-formed
+-- File.
+asMetadataFile :: Aeson.Value -> File Metadata
+asMetadataFile json =
+  let
+    -- Prettily print the JSON to get a realistic and consistent file size
+    fileSize = BSL.length (Aeson.encodePretty json)
+    metadata = case Aeson.fromJSON json of
+      Aeson.Error err -> error err
+      Aeson.Success a -> a
+    fileName = unSubject (metaSubject metadata) <> ".json"
+  in
+    File metadata (fromIntegral fileSize) (T.unpack fileName)
+
 prop_rules_isJSONFile :: H.Property
 prop_rules_isJSONFile = property $ do
   -- All files with the ".json" extension should pass
@@ -241,8 +260,7 @@ prop_rules_subjectMatchesFileName = property $ do
 unit_sequence_number_of_unknown_property_validated :: Assertion
 unit_sequence_number_of_unknown_property_validated = do
   let
-    before :: Metadata
-    before = fromJust $ Aeson.decode' [r|
+    before = [aesonQQ|
                   {
                     "subject": "1234",
                     "prop": {
@@ -251,8 +269,7 @@ unit_sequence_number_of_unknown_property_validated = do
                     }
                   }
                   |]
-    after :: Metadata
-    after = fromJust $ Aeson.decode' [r|
+    after = [aesonQQ|
                   {
                     "subject": "1234",
                     "prop": {
@@ -261,7 +278,7 @@ unit_sequence_number_of_unknown_property_validated = do
                     }
                   }
                   |]
-    diff = Changed (File before undefined undefined) (File after undefined undefined)
+    diff = Changed (asMetadataFile before) (asMetadataFile after)
 
   defaultRules `apply` diff
    @?= (Failure (ErrorMetadataPropertySequenceNumberMustBeLarger (AttestedProperty {attestedValue = Aeson.String "hello", attestedSignatures = [], attestedSequenceNumber = seqFromNatural 0}) (AttestedProperty {attestedValue = Aeson.String "goodbye", attestedSignatures = [], attestedSequenceNumber = seqFromNatural 0}) (seqFromNatural 0) (seqFromNatural 0) NE.:| []) :: Validation (NE.NonEmpty (ValidationError ())) ())