test: update samples

biscuit/test/Spec/SampleReader.hs

@@ -1,14 +1,17 @@
-{-# LANGUAGE DataKinds          #-}
-{-# LANGUAGE DeriveAnyClass     #-}
-{-# LANGUAGE DeriveFunctor      #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE DeriveTraversable  #-}
-{-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE FlexibleInstances  #-}
-{-# LANGUAGE LambdaCase         #-}
-{-# LANGUAGE NamedFieldPuns     #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveAnyClass              #-}
+{-# LANGUAGE DeriveFunctor               #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE DeriveTraversable           #-}
+{-# LANGUAGE DerivingStrategies          #-}
+{-# LANGUAGE DuplicateRecordFields       #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NamedFieldPuns              #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeApplications            #-}
 module Spec.SampleReader where
 
 import           Control.Arrow                 ((&&&))
@@ -31,6 +34,7 @@ import           Data.Text                     (Text, pack, unpack)
 import           Data.Text.Encoding            (decodeUtf8, encodeUtf8)
 import           Data.Traversable              (for)
 import           GHC.Generics                  (Generic)
+import           GHC.Records                   (HasField(getField))
 
 import           Test.Tasty                    hiding (Timeout)
 import           Test.Tasty.HUnit
@@ -151,21 +155,45 @@ data BlockDesc
   deriving stock (Eq, Show, Generic)
   deriving anyclass (FromJSON, ToJSON)
 
+data FactSet
+  = FactSet
+  { origin :: [Maybe Integer]
+  , facts :: [Text]
+  }
+  deriving stock (Eq, Show, Generic)
+  deriving anyclass (FromJSON, ToJSON)
+
+data RuleSet
+  = RuleSet
+  { origin :: Maybe Integer
+  , rules :: [Text]
+  }
+  deriving stock (Eq, Show, Generic)
+  deriving anyclass (FromJSON, ToJSON)
+
+data CheckSet
+  = CheckSet
+  { origin :: Maybe Integer
+  , checks :: [Text]
+  }
+  deriving stock (Eq, Show, Generic)
+  deriving anyclass (FromJSON, ToJSON)
+
 data WorldDesc
   =  WorldDesc
-  { facts    :: [Text]
-  , rules    :: [Text]
-  , checks   :: [Text]
+  { facts    :: [FactSet]
+  , rules    :: [RuleSet]
+  , checks   :: [CheckSet]
   , policies :: [Text]
   }
   deriving stock (Eq, Show, Generic)
   deriving anyclass (FromJSON, ToJSON)
 
 instance Semigroup WorldDesc where
   a <> b = WorldDesc
-    { facts = facts a <> facts b
-    , rules = rules a <> rules b
-    , checks = checks a <> checks b
+    { facts = getField @"facts" a <> getField @"facts" b
+    , rules = getField @"rules" a <> getField @"rules" b
+    , checks = getField @"checks" a <> getField @"checks" b
     , policies = policies a <> policies b
     }
 
@@ -307,12 +335,7 @@ mkTestCaseFromBiscuit title filename biscuit authorizers = do
       mkValidation authorizer = do
         Right success <- authorizeBiscuit biscuit authorizer
         pure ValidationR
-          { world = Just $ WorldDesc
-             { facts = []
-             , rules = []
-             , checks = []
-             , policies = []
-             }
+          { world = Just mempty
           , result = Ok 0
           , authorizer_code = authorizer
           , revocation_ids = encodeHex <$> toList (getRevocationIds biscuit)