Feature/296 upgrade scalatest from 3.0.5 to 3.2.15 (#302)

Closes #296

Author: AnilPinarOzdemir

api/src/test/scala/za/co/absa/hyperdrive/ingestor/api/context/TestHyperdriveContext.scala

@@ -15,9 +15,11 @@
 
 package za.co.absa.hyperdrive.ingestor.api.context
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class TestHyperdriveContext extends FlatSpec with Matchers {
+
+class TestHyperdriveContext extends AnyFlatSpec with Matchers {
   behavior of HyperdriveContext.getClass.getName
 
   "put" should "overwrite the value for the same key" in {

api/src/test/scala/za/co/absa/hyperdrive/ingestor/api/utils/TestComponentFactoryUtil.scala

@@ -16,10 +16,11 @@
 package za.co.absa.hyperdrive.ingestor.api.utils
 
 import org.apache.commons.configuration2.BaseConfiguration
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 import za.co.absa.hyperdrive.ingestor.api.PropertyMetadata
 
-class TestComponentFactoryUtil extends FlatSpec with Matchers {
+class TestComponentFactoryUtil extends AnyFlatSpec with Matchers {
   behavior of ComponentFactoryUtil.getClass.getName
 
   "validateConfiguration" should "not throw an error if the configuration is valid" in {

api/src/test/scala/za/co/absa/hyperdrive/ingestor/api/utils/TestConfigUtils.scala

@@ -17,11 +17,12 @@ package za.co.absa.hyperdrive.ingestor.api.utils
 
 import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler
 import org.apache.commons.configuration2.{BaseConfiguration, Configuration, ConfigurationConverter}
-import org.scalatest.mockito.MockitoSugar
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+import org.scalatestplus.mockito.MockitoSugar
 import za.co.absa.hyperdrive.ingestor.api.transformer.StreamTransformerFactory
 
-class TestConfigUtils extends FlatSpec with Matchers with MockitoSugar {
+class TestConfigUtils extends AnyFlatSpec with Matchers with MockitoSugar {
 
   behavior of s"ConfigUtils"
 

api/src/test/scala/za/co/absa/hyperdrive/ingestor/api/utils/TestStreamWriterUtil.scala

@@ -17,11 +17,12 @@ package za.co.absa.hyperdrive.ingestor.api.utils
 
 import org.apache.commons.configuration2.BaseConfiguration
 import org.apache.spark.sql.streaming.Trigger
-import org.scalatest.mockito.MockitoSugar
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+import org.scalatestplus.mockito.MockitoSugar
 import za.co.absa.hyperdrive.ingestor.api.writer.StreamWriterCommonAttributes.{keyTriggerProcessingTime, keyTriggerType}
 
-class TestStreamWriterUtil extends FlatSpec with Matchers with MockitoSugar {
+class TestStreamWriterUtil extends AnyFlatSpec with Matchers with MockitoSugar {
 
   behavior of s"StreamWriterUtil"
 

compatibility_spark-3/src/test/scala/za/co/absa/hyperdrive/compatibility/impl/writer/cdc/CDCTestBase.scala

@@ -17,11 +17,12 @@ package za.co.absa.hyperdrive.compatibility.impl.writer.cdc
 
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.execution.streaming.MemoryStream
-import org.scalatest.{BeforeAndAfterEach, FlatSpec}
+import org.scalatest.BeforeAndAfterEach
+import org.scalatest.flatspec.AnyFlatSpec
 import za.co.absa.commons.io.TempDirectory
 
 trait CDCTestBase extends BeforeAndAfterEach {
-  this: FlatSpec =>
+  this: AnyFlatSpec =>
 
   implicit val spark: SparkSession = SparkSession.builder()
     .master("local[*]")

compatibility_spark-3/src/test/scala/za/co/absa/hyperdrive/compatibility/impl/writer/cdc/TestCDCUtil.scala

@@ -16,13 +16,14 @@
 package za.co.absa.hyperdrive.compatibility.impl.writer.cdc
 
 import org.apache.spark.sql.{DataFrame, Row}
-import org.scalatest.mockito.MockitoSugar
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatestplus.mockito.MockitoSugar
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import java.io.File
 import java.sql.Timestamp
 
-class TestCDCUtil extends FlatSpec with MockitoSugar with Matchers with CDCTestBase {
+class TestCDCUtil extends AnyFlatSpec with MockitoSugar with Matchers with CDCTestBase {
 
   import spark.implicits._
 

compatibility_spark-3/src/test/scala/za/co/absa/hyperdrive/compatibility/impl/writer/cdc/delta/TestDeltaUtil.scala

@@ -16,13 +16,14 @@
 package za.co.absa.hyperdrive.compatibility.impl.writer.cdc.delta
 
 import org.apache.spark.sql.types.{StringType, StructField, StructType}
-import org.scalatest.{FlatSpec, Matchers}
-import org.scalatest.mockito.MockitoSugar
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+import org.scalatestplus.mockito.MockitoSugar
 import za.co.absa.hyperdrive.compatibility.impl.writer.cdc.{CDCTestBase, FileUtils}
 
 import java.io.File
 
-class TestDeltaUtil extends FlatSpec with MockitoSugar with Matchers with CDCTestBase {
+class TestDeltaUtil extends AnyFlatSpec with MockitoSugar with Matchers with CDCTestBase {
   behavior of "DeltaUtil"
 
   "createDeltaTableIfNotExists" should "create delta table if destination directory is empty" in {

compatibility_spark-3/src/test/scala/za/co/absa/hyperdrive/compatibility/impl/writer/cdc/delta/scd2/TestDeltaCDCToSCD2Writer.scala

@@ -14,13 +14,13 @@
  */
 
 package za.co.absa.hyperdrive.compatibility.impl.writer.cdc.delta.scd2
-
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 import org.apache.spark.sql.streaming.Trigger
-import org.scalatest.mockito.MockitoSugar
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatestplus.mockito.MockitoSugar
 import za.co.absa.hyperdrive.compatibility.impl.writer.cdc.{CDCEvent, CDCTestBase, SCD2Event}
 
-class TestDeltaCDCToSCD2Writer extends FlatSpec with MockitoSugar with Matchers with CDCTestBase {
+class TestDeltaCDCToSCD2Writer extends AnyFlatSpec with MockitoSugar with Matchers with CDCTestBase {
   behavior of "DeltaCDCToSCD2Writer"
 
   it should "merge unique by timestamp scd2 rows into empty delta table" in {

compatibility_spark-3/src/test/scala/za/co/absa/hyperdrive/compatibility/impl/writer/cdc/delta/snapshot/TestDeltaCDCToSnapshotWriter.scala

@@ -16,11 +16,12 @@
 package za.co.absa.hyperdrive.compatibility.impl.writer.cdc.delta.snapshot
 
 import org.apache.spark.sql.streaming.Trigger
-import org.scalatest.mockito.MockitoSugar
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatestplus.mockito.MockitoSugar
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 import za.co.absa.hyperdrive.compatibility.impl.writer.cdc.{CDCEvent, CDCTestBase}
 
-class TestDeltaCDCToSnapshotWriter extends FlatSpec with MockitoSugar with Matchers with CDCTestBase {
+class TestDeltaCDCToSnapshotWriter extends AnyFlatSpec with MockitoSugar with Matchers with CDCTestBase {
   behavior of "DeltaCDCToSnapshotWriter"
 
   it should "merge cdc events and create latest snapshot table" in {

compatibility_spark-3/src/test/scala/za/co/absa/hyperdrive/compatibility/impl/writer/cdc/hudi/scd2/TestHudiCDCToSCD2Writer.scala

@@ -16,11 +16,12 @@
 package za.co.absa.hyperdrive.compatibility.impl.writer.cdc.hudi.scd2
 
 import org.apache.spark.sql.streaming.Trigger
-import org.scalatest.mockito.MockitoSugar
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatestplus.mockito.MockitoSugar
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 import za.co.absa.hyperdrive.compatibility.impl.writer.cdc.{CDCEvent, CDCTestBase, SCD2Event}
 
-class TestHudiCDCToSCD2Writer extends FlatSpec with MockitoSugar with Matchers with CDCTestBase {
+class TestHudiCDCToSCD2Writer extends AnyFlatSpec with MockitoSugar with Matchers with CDCTestBase {
   behavior of "HudiCDCToSCD2Writer"
 
   it should "merge unique by timestamp scd2 rows into empty hudi table" in {