From 042f5d5cf384e71ddc86e002c4a216f6f550bd05 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Tue, 4 Feb 2025 13:33:21 +0100 Subject: [PATCH] Round-trip test: DomainRegistration <-> DomainRegistration' --- libs/wire-api/src/Wire/API/EnterpriseLogin.hs | 4 ++++ libs/wire-api/test/unit/Test/Wire/API/Roundtrip/Aeson.hs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/wire-api/src/Wire/API/EnterpriseLogin.hs b/libs/wire-api/src/Wire/API/EnterpriseLogin.hs index 6d141baf75e..919deab7d95 100644 --- a/libs/wire-api/src/Wire/API/EnterpriseLogin.hs +++ b/libs/wire-api/src/Wire/API/EnterpriseLogin.hs @@ -239,6 +239,8 @@ data DomainRegistration' = DomainRegistration' dnsVerificationToken :: Maybe DnsVerificationToken, authTokenHash :: Maybe Token } + deriving (Eq, Show, Generic) + deriving (Arbitrary) via (GenericUniform DomainRegistration') data DomainRegistrationSettings' = Locked' @@ -246,6 +248,8 @@ data DomainRegistrationSettings' | NoRegistration' | DomainForBackend HttpsUrl | DomainForLocalTeam TeamId (Maybe SAML.IdPId) + deriving (Eq, Show, Generic) + deriving (Arbitrary) via (GenericUniform DomainRegistrationSettings') newToOld :: Domain -> DomainRegistration' -> DomainRegistration newToOld domain DomainRegistration' {..} = DomainRegistration {..} diff --git a/libs/wire-api/test/unit/Test/Wire/API/Roundtrip/Aeson.hs b/libs/wire-api/test/unit/Test/Wire/API/Roundtrip/Aeson.hs index 787f4488813..8823dee095a 100644 --- a/libs/wire-api/test/unit/Test/Wire/API/Roundtrip/Aeson.hs +++ b/libs/wire-api/test/unit/Test/Wire/API/Roundtrip/Aeson.hs @@ -36,6 +36,7 @@ import Wire.API.Conversation.Member qualified as Conversation.Member import Wire.API.Conversation.Role qualified as Conversation.Role import Wire.API.Conversation.Typing qualified as Conversation.Typing import Wire.API.CustomBackend qualified as CustomBackend +import Wire.API.EnterpriseLogin qualified as EnterpriseLogin import Wire.API.Event.Conversation qualified as Event.Conversation import Wire.API.Event.Team qualified as Event.Team import Wire.API.Event.WebSocketProtocol qualified as EventWebSocketProtocol @@ -349,7 +350,9 @@ tests = testRoundTrip @TeamsIntra.TeamStatus, testRoundTrip @TeamsIntra.TeamStatusUpdate, testRoundTrip @TeamsIntra.TeamData, - testRoundTrip @TeamsIntra.TeamName + testRoundTrip @TeamsIntra.TeamName, + testProperty "EnterpriseLogin.EnterpriseLogin'" $ \(dom, new) -> do + EnterpriseLogin.oldToNew (EnterpriseLogin.newToOld dom new) === Right (dom, new) ] testRoundTrip ::