merge conflict resolution

AbsaOSS · May 23, 2024 · 4bf50a1 · 4bf50a1
1 parent 09249cb
commit 4bf50a1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...r/api/controller/FlowControllerSpec.scala → ...ller/FlowControllerIntegrationTests.scala b/...r/api/controller/FlowControllerSpec.scala → ...ller/FlowControllerIntegrationTests.scala
@@ -25,7 +25,7 @@ import zio._
 import zio.test.Assertion.failsWithA
 import zio.test._
 
-object FlowControllerSpec extends ZIOSpecDefault with TestData {
+object FlowControllerIntegrationTests extends ZIOSpecDefault with TestData {
   private val flowServiceMock = mock(classOf[FlowService])
   when(flowServiceMock.getFlowCheckpoints(checkpointQueryDTO1))
     .thenReturn(ZIO.fail(ServiceError("boom!")))
@@ -36,7 +36,7 @@ object FlowControllerSpec extends ZIOSpecDefault with TestData {
   private val flowServiceMockLayer = ZLayer.succeed(flowServiceMock)
 
   override def spec: Spec[TestEnvironment with Scope, Any] = {
-    suite("FlowControllerSpec")(
+    suite("FlowControllerSuite")(
       suite("GetFlowCheckpointsSuite")(
         test("Returns expected InternalServerErrorResponse") {
           assertZIO(FlowController.getFlowCheckpoints(checkpointQueryDTO1).exit)(

diff --git a/...r/api/repository/FlowRepositorySpec.scala → ...tory/FlowRepositoryIntegrationTests.scala b/...r/api/repository/FlowRepositorySpec.scala → ...tory/FlowRepositoryIntegrationTests.scala
@@ -27,7 +27,7 @@ import zio.test._
 import zio.test.junit.ZTestJUnitRunner
 
 @RunWith(classOf[ZTestJUnitRunner])
-class FlowRepositorySpec extends ZIOSpecDefault with TestData {
+class FlowRepositoryIntegrationTests extends ZIOSpecDefault with TestData {
 
   private val getFlowCheckpointsMock = mock(classOf[GetFlowCheckpoints])
 
@@ -38,8 +38,8 @@ class FlowRepositorySpec extends ZIOSpecDefault with TestData {
 
   override def spec: Spec[TestEnvironment with Scope, Any] = {
 
-    suite("FlowRepositorySpec")(
-      suite("GetFlowCheckpoints")(
+    suite("FlowRepositoryIntegrationSuite")(
+      suite("GetFlowCheckpointsSuite")(
         test("Returns expected DatabaseError") {
           assertZIO(FlowRepository.getFlowCheckpoints(checkpointQueryDTO1).exit)(
             failsWithA[DatabaseError]

diff --git a/.../server/api/service/FlowServiceSpec.scala → ...service/FlowServiceIntegrationTests.scala b/.../server/api/service/FlowServiceSpec.scala → ...service/FlowServiceIntegrationTests.scala
@@ -28,7 +28,7 @@ import zio.test._
 import zio.test.junit.ZTestJUnitRunner
 
 @RunWith(classOf[ZTestJUnitRunner])
-class FlowServiceSpec extends ZIOSpecDefault with TestData {
+class FlowServiceIntegrationTests extends ZIOSpecDefault with TestData {
   private val flowRepositoryMock = mock(classOf[FlowRepository])
 
   when(flowRepositoryMock.getFlowCheckpoints(checkpointQueryDTO1)).thenReturn(ZIO.fail(DatabaseError("boom!")))
@@ -39,7 +39,7 @@ class FlowServiceSpec extends ZIOSpecDefault with TestData {
 
   override def spec: Spec[TestEnvironment with Scope, Any] = {
 
-    suite("FlowServiceSpec")(
+    suite("FlowServiceSuite")(
       suite("GetFlowCheckpointsSuite")(
         test("Returns expected ServiceError") {
           assertZIO(FlowService.getFlowCheckpoints(checkpointQueryDTO1).exit)(