From 45adbfc047f0022b5dd8610f342a288d7df7ea31 Mon Sep 17 00:00:00 2001 From: Pavel Salamon Date: Wed, 22 May 2024 10:29:41 +0200 Subject: [PATCH] fix tests --- .../server/api/http/CreateCheckpointEndpointSpec.scala | 8 +++++--- .../server/api/http/CreatePartitioningEndpointSpec.scala | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/src/test/scala/za/co/absa/atum/server/api/http/CreateCheckpointEndpointSpec.scala b/server/src/test/scala/za/co/absa/atum/server/api/http/CreateCheckpointEndpointSpec.scala index 77c0dae4b..114904e35 100644 --- a/server/src/test/scala/za/co/absa/atum/server/api/http/CreateCheckpointEndpointSpec.scala +++ b/server/src/test/scala/za/co/absa/atum/server/api/http/CreateCheckpointEndpointSpec.scala @@ -28,7 +28,7 @@ import za.co.absa.atum.server.api.TestData import za.co.absa.atum.server.api.controller.CheckpointController import za.co.absa.atum.server.model.ErrorResponse.{GeneralErrorResponse, InternalServerErrorResponse} import za.co.absa.atum.server.model.PlayJsonImplicits.{readsCheckpointDTO, writesCheckpointDTO} -import za.co.absa.atum.server.model.SuccessResponse.SingleSuccessResponse +import za.co.absa.atum.server.model.SuccessResponse.{SingleSuccessResponse, mapToSingleSingleSuccessResponse} import zio._ import zio.test.Assertion.equalTo import zio.test._ @@ -47,7 +47,9 @@ object CreateCheckpointEndpointSpec extends ZIOSpecDefault with Endpoints with T private val checkpointControllerMockLayer = ZLayer.succeed(checkpointControllerMock) private val createCheckpointServerEndpoint = - createCheckpointEndpoint.zServerLogic(CheckpointController.createCheckpoint) + createCheckpointEndpoint.zServerLogic( + CheckpointController.createCheckpoint _ andThen(_.map(SingleSuccessResponse(_))) + ) def spec: Spec[TestEnvironment with Scope, Any] = { val backendStub = TapirStubInterpreter(SttpBackendStub.apply(new RIOMonadError[CheckpointController])) @@ -68,7 +70,7 @@ object CreateCheckpointEndpointSpec extends ZIOSpecDefault with Endpoints with T val body = response.map(_.body) val statusCode = response.map(_.code) - assertZIO(body <&> statusCode)(equalTo(Right(checkpointDTO1), StatusCode.Created)) + assertZIO(body <&> statusCode)(equalTo(Right(SingleSuccessResponse(checkpointDTO1)), StatusCode.Created)) }, test("Returns expected BadRequest") { val response = request diff --git a/server/src/test/scala/za/co/absa/atum/server/api/http/CreatePartitioningEndpointSpec.scala b/server/src/test/scala/za/co/absa/atum/server/api/http/CreatePartitioningEndpointSpec.scala index eb3d74515..01c7263fc 100644 --- a/server/src/test/scala/za/co/absa/atum/server/api/http/CreatePartitioningEndpointSpec.scala +++ b/server/src/test/scala/za/co/absa/atum/server/api/http/CreatePartitioningEndpointSpec.scala @@ -47,7 +47,9 @@ object CreatePartitioningEndpointSpec extends ZIOSpecDefault with Endpoints with private val createPartitioningEndpointMockLayer = ZLayer.succeed(createPartitioningEndpointMock) private val createPartitioningServerEndpoint = - createPartitioningEndpoint.zServerLogic(PartitioningController.createPartitioningIfNotExists) + createPartitioningEndpoint.zServerLogic( + PartitioningController.createPartitioningIfNotExists _ andThen (_.map(SingleSuccessResponse(_))) + ) def spec: Spec[TestEnvironment with Scope, Any] = { val backendStub = TapirStubInterpreter(SttpBackendStub.apply(new RIOMonadError[PartitioningController]))