Fixes #120 - Adding more items to measure sequence

AbsaOSS · Apr 18, 2024 · a8348a6 · a8348a6
1 parent ed67783
commit a8348a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/server/src/test/scala/za/co/absa/atum/server/api/TestData.scala b/server/src/test/scala/za/co/absa/atum/server/api/TestData.scala
@@ -73,8 +73,8 @@ trait TestData {
 
   // Atum Context
   protected val atumContextDTO1: AtumContextDTO = AtumContextDTO(
-    partitioning = Seq.empty,
-    measures = Set(MeasureDTO("count", Seq("*"))),
+    partitioning = partitioningSubmitDTO1.partitioning,
+    measures = Set(measureDTO1, measureDTO2),
     additionalData = Map.empty
   )
 
@@ -83,12 +83,11 @@ trait TestData {
     measures = Set(MeasureDTO("count", Seq("1")))
   )
 
-  // Expected Atum context
-  protected val expectedAtumContextDTO1: AtumContextDTO = AtumContextDTO(
-    partitioning = partitioningSubmitDTO1.partitioning,
-    measures = Set(measureDTO2),
-    additionalData = Map.empty
-  )
+//  protected val atumContextDTO3: AtumContextDTO = AtumContextDTO(
+//    partitioning = partitioningSubmitDTO1.partitioning,
+//    measures = Set(measureDTO2),
+//    additionalData = Map.empty
+//  )
 
   // Checkpoint
   protected val checkpointDTO1: CheckpointDTO = CheckpointDTO(

diff --git a/server/src/test/scala/za/co/absa/atum/server/api/controller/PartitioningControllerSpec.scala b/server/src/test/scala/za/co/absa/atum/server/api/controller/PartitioningControllerSpec.scala
@@ -35,7 +35,7 @@ class PartitioningControllerSpec extends ZIOSpecDefault with TestData {
   when(partitioningServiceMock.createPartitioningIfNotExists(partitioningSubmitDTO1))
     .thenReturn(ZIO.right(()))
   when(partitioningServiceMock.getPartitioningMeasures(partitioningDTO1))
-    .thenReturn(ZIO.succeed(Seq(measureDTO2)))
+    .thenReturn(ZIO.succeed(Seq(measureDTO1, measureDTO2)))
   when(partitioningServiceMock.getPartitioningAdditionalData(partitioningDTO1))
     .thenReturn(ZIO.succeed(Map.empty))
 
@@ -51,7 +51,7 @@ class PartitioningControllerSpec extends ZIOSpecDefault with TestData {
         test("Returns expected AtumContextDTO") {
           for {
             result <- PartitioningController.createPartitioningIfNotExists(partitioningSubmitDTO1)
-          } yield assertTrue (result == expectedAtumContextDTO1)
+          } yield assertTrue (result == atumContextDTO1)
         },
         test("Returns expected InternalServerErrorResponse") {
           assertZIO(PartitioningController.createPartitioningIfNotExists(partitioningSubmitDTO2).exit)(