Closes #120 - Fixing the build

AbsaOSS · Apr 26, 2024 · 66af419 · 66af419
1 parent 42e9604
commit 66af419
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 78 deletions.
diff --git a/...base/src/test/scala/za/co/absa/atum/database/runs/GetPartitioningAdditionalDataTest.scala b/...base/src/test/scala/za/co/absa/atum/database/runs/GetPartitioningAdditionalDataTest.scala
@@ -158,43 +158,4 @@ class GetPartitioningAdditionalDataTest extends DBTestSuite{
       }
   }
 
-  // Integration test
-  test("Testing actual data") {
-    val partitioning = JsonBString(
-      """
-        |{
-        |   "version": 1,
-        |   "keys": ["string1", "string2"],
-        |   "keysToValues": {
-        |     "string1": "string1",
-        |     "string2": "string2"
-        |   }
-        |}
-        |""".stripMargin
-    )
-
-    function("runs.get_partitioning_additional_data")
-      .setParam("i_partitioning", partitioning)
-      .execute { queryResult =>
-        var rowCount = 0
-
-        queryResult.foreach(row => {
-
-          rowCount += 1
-
-          println(s"Row number ${rowCount}")
-          println(s"Row: ${row}")
-          val columnCount = row.resultSet.getMetaData.getColumnCount
-          for (i <- 1 to columnCount) {
-            println(s"Column ${i}: ${row.resultSet.getString(i)}")
-          }
-          println()
-
-        })
-
-        println()
-        println(s"Total rows: $rowCount")
-      }
-  }
-
 }
diff --git a/database/src/test/scala/za/co/absa/atum/database/runs/GetPartitioningMeasuresTest.scala b/database/src/test/scala/za/co/absa/atum/database/runs/GetPartitioningMeasuresTest.scala
@@ -139,44 +139,5 @@ class GetPartitioningMeasuresTest extends DBTestSuite {
       }
   }
 
-  //integration testing
-  test("Testing actual data") {
-    val partitioning = JsonBString(
-      """
-        |{
-        |   "version": 1,
-        |   "keys": ["string1", "string2"],
-        |   "keysToValues": {
-        |     "string1": "string1",
-        |     "string2": "string2"
-        |   }
-        |}
-        |""".stripMargin
-    )
-
-    function("runs.get_partitioning_measures")
-      .setParam("i_partitioning", partitioning)
-      .execute { queryResult =>
-        var rowCount = 0
-
-        queryResult.foreach(row => {
-
-          rowCount+= 1
-
-          println(s"Row number ${rowCount}")
-          println(s"Row: ${row}")
-          val columnCount = row.resultSet.getMetaData.getColumnCount
-          for (i <- 1 to columnCount) {
-            println(s"Column ${i}: ${row.resultSet.getString(i)}")
-          }
-          println()
-
-        })
-
-        println()
-        println(s"Total rows: $rowCount")
-      }
-  }
-
 }
 
diff --git a/...a/co/absa/atum/server/api/database/runs/functions/GetPartitioningAdditionalDataSpec.scala b/...a/co/absa/atum/server/api/database/runs/functions/GetPartitioningAdditionalDataSpec.scala
@@ -37,6 +37,13 @@ class GetPartitioningAdditionalDataSpec extends ConfigProviderSpec {
           getPartitioningAdditionalData <- ZIO.service[GetPartitioningAdditionalData]
           result <- getPartitioningAdditionalData(partitioningDTO).either
         } yield assertTrue (result.isLeft)
+      },
+      test("Returns expected sequence of Additional data with provided partitioning") {
+        val partitioningDTO: PartitioningDTO = Seq(PartitionDTO("string1", "string1"), PartitionDTO("string2", "string2"))
+        for {
+          getPartitioningAdditionalData <- ZIO.service[GetPartitioningAdditionalData]
+          result <- getPartitioningAdditionalData(partitioningDTO).either
+        } yield assertTrue(result.isInstanceOf[Right[_, _]])
       }
     ).provide(
       GetPartitioningAdditionalData.layer,

diff --git a/...cala/za/co/absa/atum/server/api/database/runs/functions/GetPartitioningMeasuresSpec.scala b/...cala/za/co/absa/atum/server/api/database/runs/functions/GetPartitioningMeasuresSpec.scala
@@ -38,6 +38,13 @@ class GetPartitioningMeasuresSpec extends ConfigProviderSpec {
           getPartitioningMeasures <- ZIO.service[GetPartitioningMeasures]
           result <- getPartitioningMeasures(partitioningDTO).either
         } yield assertTrue(result.isLeft)
+      },
+      test ("Returns expected sequence of Measures with existing partitioning") {
+      val partitioningDTO: PartitioningDTO = Seq(PartitionDTO("string1", "string1"), PartitionDTO("string2", "string2"))
+        for {
+          getPartitioningMeasures <- ZIO.service[GetPartitioningMeasures]
+          result <- getPartitioningMeasures(partitioningDTO).either
+        } yield assertTrue (result.isInstanceOf[Right[_, _]])
       }
     ).provide(
       GetPartitioningMeasures.layer,