Initial solution of Integration tests control.

.github/workflows/build.yml

@@ -73,4 +73,4 @@ jobs:
         run: sbt flywayMigrate
 
       - name: Build and run tests
-        run: sbt "project server" ++${{matrix.scala}} test doc
+        run: sbt "project server" ++${{matrix.scala}} testIT doc

.github/workflows/jacoco_check.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Add coverage to PR
         if: steps.jacocorun.outcome == 'success'
         id: jacoco-agent
-        uses: madrapps/jacoco-report@${{ env.jaCocoReportVersion }}
+        uses: madrapps/jacoco-report@v1.6.1
         with:
           name: agent-jacoco-report
           paths: ${{ github.workspace }}/agent/target/jvm-${{ env.scalaShort12 }}/jacoco/report/jacoco.xml
@@ -63,7 +63,7 @@ jobs:
       - name: Add coverage to PR
         if: steps.jacocorun.outcome == 'success'
         id: jacoco-model
-        uses: madrapps/jacoco-report@${{ env.jaCocoReportVersion }}
+        uses: madrapps/jacoco-report@v1.6.1
         with:
           name: model-jacoco-report
           paths: ${{ github.workspace }}/model/target/jvm-${{ env.scalaShort12 }}/jacoco/report/jacoco.xml
@@ -118,4 +118,4 @@ jobs:
               }
             }
 
-            core.setFailed('JaCoCo test coverage report generation failed, and related PR comments were updated.');
+            core.setFailed('JaCoCo test coverage report generation failed, and related PR comments were updated.');

.sbtrc

@@ -0,0 +1,5 @@
+# Test run control
+alias test=; testOnly -l IntegrationTest
+alias testDB=; testOnly -t IntegrationTest
+alias testIT=; testOnly -- -t IntegrationTest
+alias testAll=; testOnly

build.sbt

@@ -130,14 +130,6 @@ lazy val database = (projectMatrix in file("database"))
       },
       libraryDependencies ++= Dependencies.databaseDependencies,
       (Compile / compile) := ((Compile / compile) dependsOn printScalaVersion).value,
-      test := {}
     ): _*
   )
   .jvmPlatform(scalaVersions = Seq(Versions.serviceScalaVersion))
-
-lazy val dbTest = taskKey[Unit]("Launch DB tests")
-
-dbTest := {
-  println("Running DB tests")
-  (database.jvm(Versions.serviceScalaVersion) / Test / test).value
-}

database/src/test/scala/za/co/absa/atum/database/runs/CreateOrUpdateAdditionalDataTest.scala

@@ -16,6 +16,7 @@
 
 package za.co.absa.atum.database.runs
 
+import za.co.absa.atum.tags.IntegrationTestTag
 import za.co.absa.balta.DBTestSuite
 import za.co.absa.balta.classes.JsonBString
 import za.co.absa.balta.classes.setter.CustomDBType
@@ -38,7 +39,7 @@ class CreateOrUpdateAdditionalDataTest extends DBTestSuite{
       |""".stripMargin
   )
 
-  test("Partitioning and AD present, delete & re-insert, and also 'ignore' of AD records performed") {
+  test("Partitioning and AD present, delete & re-insert, and also 'ignore' of AD records performed", IntegrationTestTag) {
 
     table("runs.partitionings").insert(
       add("partitioning", partitioning)
@@ -102,7 +103,7 @@ class CreateOrUpdateAdditionalDataTest extends DBTestSuite{
     }
   }
 
-  test("Partitioning and AD present, new AD records inserted, nothing backed up") {
+  test("Partitioning and AD present, new AD records inserted, nothing backed up", IntegrationTestTag) {
 
     table("runs.partitionings").insert(
       add("partitioning", partitioning)
@@ -168,7 +169,7 @@ class CreateOrUpdateAdditionalDataTest extends DBTestSuite{
    }
   }
 
-  test("Partitioning and AD present, but no new AD records were backed-up or inserted, no changes detected") {
+  test("Partitioning and AD present, but no new AD records were backed-up or inserted, no changes detected", IntegrationTestTag) {
 
     table("runs.partitionings").insert(
       add("partitioning", partitioning)
@@ -216,7 +217,7 @@ class CreateOrUpdateAdditionalDataTest extends DBTestSuite{
     assert(table("runs.additional_data_history").count(add("fk_partitioning", fkPartitioning)) == 0)
   }
 
-  test("Partitioning not present, no action taken") {
+  test("Partitioning not present, no action taken", IntegrationTestTag) {
 
     val inputADToInsert = CustomDBType(
       """

database/src/test/scala/za/co/absa/atum/database/runs/CreatePartitioningIfNotExistsTest.scala

@@ -16,6 +16,7 @@
 
 package za.co.absa.atum.database.runs
 
+import za.co.absa.atum.tags.IntegrationTestTag
 import za.co.absa.balta.DBTestSuite
 import za.co.absa.balta.classes.JsonBString
 
@@ -51,7 +52,7 @@ class CreatePartitioningIfNotExistsTest extends DBTestSuite{
       |""".stripMargin
   )
 
-  test("Partitioning created") {
+  test("Partitioning created", IntegrationTestTag) {
     val partitioningID = function(fncCreatePartitioningIfNotExists)
       .setParam("i_partitioning", partitioning)
       .setParam("i_by_user", "Fantômas")
@@ -91,7 +92,7 @@ class CreatePartitioningIfNotExistsTest extends DBTestSuite{
       assert(!flowsResult.hasNext)
     }
   }
-  test("Partitioning created with parent partitioning that already exists") {
+  test("Partitioning created with parent partitioning that already exists", IntegrationTestTag) {
     val parentPartitioningID = function(fncCreatePartitioningIfNotExists)
       .setParam("i_partitioning", parentPartitioning)
       .setParam("i_by_user", "Albert Einstein")
@@ -126,7 +127,7 @@ class CreatePartitioningIfNotExistsTest extends DBTestSuite{
     )
   }
 
-  test("Partitioning already exists") {
+  test("Partitioning already exists", IntegrationTestTag) {
     val partitioningID = function(fncCreatePartitioningIfNotExists)
       .setParam("i_partitioning", partitioning)
       .setParam("i_by_user", "Fantômas")
@@ -156,7 +157,7 @@ class CreatePartitioningIfNotExistsTest extends DBTestSuite{
     )
   }
 
-  test("Partitioning exists, but parent is added") {
+  test("Partitioning exists, but parent is added", IntegrationTestTag) {
     val partitioningID = function(fncCreatePartitioningIfNotExists)
       .setParam("i_partitioning", partitioning)
       .setParam("i_by_user", "Fantômas")

database/src/test/scala/za/co/absa/atum/database/runs/GetPartitioningAdditionalDataTest.scala

@@ -16,6 +16,7 @@
 
 package za.co.absa.atum.database.runs
 
+import za.co.absa.atum.tags.IntegrationTestTag
 import za.co.absa.balta.DBTestSuite
 import za.co.absa.balta.classes.JsonBString
 
@@ -52,7 +53,7 @@ class GetPartitioningAdditionalDataTest extends DBTestSuite{
       |""".stripMargin
   )
 
-  test("Get partitioning additional data returns additional data for partitioning with additional data") {
+  test("Get partitioning additional data returns additional data for partitioning with additional data", IntegrationTestTag) {
     table("runs.partitionings").insert(
       add("partitioning", partitioning1)
         .add("created_by", "Joseph")
@@ -119,7 +120,7 @@ class GetPartitioningAdditionalDataTest extends DBTestSuite{
 
   }
 
-  test("Get partitioning additional data should return no records for partitioning without additional data") {
+  test("Get partitioning additional data should return no records for partitioning without additional data", IntegrationTestTag) {
     table("runs.partitionings").insert(
       add("partitioning", partitioning2)
         .add("created_by", "Joseph")
@@ -142,7 +143,7 @@ class GetPartitioningAdditionalDataTest extends DBTestSuite{
     }
   }
 
-  test("Get partitioning additional data should return error status code on non existing partitioning") {
+  test("Get partitioning additional data should return error status code on non existing partitioning", IntegrationTestTag) {
     val partitioning = JsonBString(
       """
         |{

database/src/test/scala/za/co/absa/atum/database/runs/GetPartitioningMeasuresTest.scala

@@ -16,14 +16,15 @@
 
 package za.co.absa.atum.database.runs
 
+import za.co.absa.atum.tags.IntegrationTestTag
 import za.co.absa.balta.DBTestSuite
 import za.co.absa.balta.classes.JsonBString
 import za.co.absa.balta.classes.setter.CustomDBType
 
 class GetPartitioningMeasuresTest extends DBTestSuite {
   private val fncGetPartitioningMeasures = "runs.get_partitioning_measures"
 
-  test("Get partitioning measures should return partitioning measures for partitioning with measures") {
+  test("Get partitioning measures should return partitioning measures for partitioning with measures", IntegrationTestTag) {
     val partitioning = JsonBString(
       """
         |{
@@ -85,7 +86,7 @@ class GetPartitioningMeasuresTest extends DBTestSuite {
     }
   }
 
-  test("Get partitioning measures should return error status code on non existing partitioning") {
+  test("Get partitioning measures should return error status code on non existing partitioning", IntegrationTestTag) {
     val partitioning = JsonBString(
       """
         |{
@@ -108,7 +109,7 @@ class GetPartitioningMeasuresTest extends DBTestSuite {
       }
   }
 
-  test("Get partitioning measures should return no data status code on partitioning without measures") {
+  test("Get partitioning measures should return no data status code on partitioning without measures", IntegrationTestTag) {
     val partitioning = JsonBString(
       """
         |{

database/src/test/scala/za/co/absa/atum/database/runs/IsPartitioningValidTest.scala

@@ -17,6 +17,7 @@
 package za.co.absa.atum.database.runs
 
 import org.postgresql.util.PSQLException
+import za.co.absa.atum.tags.IntegrationTestTag
 import za.co.absa.balta.DBTestSuite
 import za.co.absa.balta.classes.JsonBString
 
@@ -69,7 +70,7 @@ class IsPartitioningValidTest extends DBTestSuite {
       |""".stripMargin
   )
 
-  test("Partitioning is valid (strict check)") {
+  test("Partitioning is valid (strict check)", IntegrationTestTag) {
    function(fncIsPartitioningValid)
       .setParam("i_partitioning", partitioningValid)
       .execute { queryResult =>
@@ -82,7 +83,7 @@ class IsPartitioningValidTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is valid but has null values (strict check)") {
+  test("Partitioning is valid but has null values (strict check)", IntegrationTestTag) {
     val caught = intercept[PSQLException](
       function(fncIsPartitioningValid)
         .setParam("i_partitioning", partitioningValidWithNullValues)
@@ -94,7 +95,7 @@ class IsPartitioningValidTest extends DBTestSuite {
     )
   }
 
-  test("Partitioning is valid but has null values (non-strict check)") {
+  test("Partitioning is valid but has null values (non-strict check)", IntegrationTestTag) {
     function(fncIsPartitioningValid)
       .setParam("i_partitioning", partitioningValidWithNullValues)
       .setParam("i_strict_check", false)
@@ -108,7 +109,7 @@ class IsPartitioningValidTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is invalid") {
+  test("Partitioning is invalid", IntegrationTestTag) {
     val caught = intercept[PSQLException](
       function(fncIsPartitioningValid)
         .setParam("i_partitioning", partitioningInvalid)

database/src/test/scala/za/co/absa/atum/database/runs/UpdateExistingAdditionalDataTest.scala

@@ -16,6 +16,7 @@
 
 package za.co.absa.atum.database.runs
 
+import za.co.absa.atum.tags.IntegrationTestTag
 import za.co.absa.balta.DBTestSuite
 import za.co.absa.balta.classes.JsonBString
 import za.co.absa.balta.classes.setter.CustomDBType
@@ -38,7 +39,7 @@ class UpdateExistingAdditionalDataTest extends DBTestSuite{
     |""".stripMargin
   )
 
-  test("Partitioning and AD present, multiple AD records backed up") {
+  test("Partitioning and AD present, multiple AD records backed up", IntegrationTestTag) {
 
     table("runs.partitionings").insert(
       add("partitioning", partitioning)
@@ -121,7 +122,7 @@ class UpdateExistingAdditionalDataTest extends DBTestSuite{
 
   }
 
-  test("Partitioning and AD present, but the input AD are the same as in DB, no backup") {
+  test("Partitioning and AD present, but the input AD are the same as in DB, no backup", IntegrationTestTag) {
 
     table("runs.partitionings").insert(
       add("partitioning", partitioning)

database/src/test/scala/za/co/absa/atum/database/runs/ValidatePartitioningTest.scala

@@ -16,6 +16,7 @@
 
 package za.co.absa.atum.database.runs
 
+import za.co.absa.atum.tags.IntegrationTestTag
 import za.co.absa.balta.DBTestSuite
 import za.co.absa.balta.classes.JsonBString
 
@@ -164,23 +165,23 @@ class ValidatePartitioningTest extends DBTestSuite {
       |""".stripMargin
   )
 
-  test("Partitioning is valid (strict check)") {
+  test("Partitioning is valid (strict check)", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningValid)
       .execute { queryResult =>
         assert(!queryResult.hasNext)
       }
   }
 
-  test("Partitioning is valid, even when keys have whitespaces (without them they would be duplicated)") {
+  test("Partitioning is valid, even when keys have whitespaces (without them they would be duplicated)", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningValidWhitespacesInKeys)
       .execute { queryResult =>
         assert(!queryResult.hasNext)
       }
   }
 
-  test("Partitioning is valid but has null values (strict check)") {
+  test("Partitioning is valid but has null values (strict check)", IntegrationTestTag) {
       function(fncValidatePartitioning)
         .setParam("i_partitioning", partitioningValidWithNullValues)
         .execute { queryResult =>
@@ -194,7 +195,7 @@ class ValidatePartitioningTest extends DBTestSuite {
         }
   }
 
-  test("Partitioning is valid, but one key doesn't have a value (strict check)") {
+  test("Partitioning is valid, but one key doesn't have a value (strict check)", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningValidMissingValue)
       .execute { queryResult =>
@@ -212,7 +213,7 @@ class ValidatePartitioningTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is valid, but one key doesn't have a value (non-strict check)") {
+  test("Partitioning is valid, but one key doesn't have a value (non-strict check)", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningValidMissingValue)
       .setParam("i_strict_check", false)
@@ -221,7 +222,7 @@ class ValidatePartitioningTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is valid, but keys don't correspond to values (non-strict check)") {
+  test("Partitioning is valid, but keys don't correspond to values (non-strict check)", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningValidValuesNotCorrespondToKeys)
       .setParam("i_strict_check", false)
@@ -230,7 +231,7 @@ class ValidatePartitioningTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is valid, but keys don't correspond to values (strict check)") {
+  test("Partitioning is valid, but keys don't correspond to values (strict check)", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningValidValuesNotCorrespondToKeys)
       .execute { queryResult =>
@@ -248,7 +249,7 @@ class ValidatePartitioningTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is invalid, incompatible version") {
+  test("Partitioning is invalid, incompatible version", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningInvalidIncompatibleVersion)
       .execute { queryResult =>
@@ -262,15 +263,15 @@ class ValidatePartitioningTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is valid, but it has redundant attribute") {
+  test("Partitioning is valid, but it has redundant attribute", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningValidRedundantAttribute)
       .execute { queryResult =>
         assert(!queryResult.hasNext)
       }
   }
 
-  test("Partitioning is invalid, valid JSON but incorrect structure (attribute missing)") {
+  test("Partitioning is invalid, valid JSON but incorrect structure (attribute missing)", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningInvalidBadJSONStructure1)
       .execute { queryResult =>
@@ -284,7 +285,7 @@ class ValidatePartitioningTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is invalid, duplicated partition keys") {
+  test("Partitioning is invalid, duplicated partition keys", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningInvalidDuplicatedKeys)
       .execute { queryResult =>
@@ -300,7 +301,7 @@ class ValidatePartitioningTest extends DBTestSuite {
       }
   }
 
-  test("Partitioning is invalid, multiple problems") {
+  test("Partitioning is invalid, multiple problems", IntegrationTestTag) {
     function(fncValidatePartitioning)
       .setParam("i_partitioning", partitioningInvalidMultipleProblems)
       .execute { queryResult =>