[HUDI-780] Migrate test cases to Junit 5 (#1504)

hudi-spark/src/test/java/DataSourceUtilsTest.java

@@ -21,11 +21,11 @@ import org.apache.hudi.DataSourceUtils;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DataSourceUtilsTest {
 
@@ -34,7 +34,7 @@ public class DataSourceUtilsTest {
     // There are fields event_date1, event_date2, event_date3 with logical type as Date. event_date1 & event_date3 are
     // of UNION schema type, which is a union of null and date type in different orders. event_date2 is non-union
     // date type
-    String avroSchemaString  = "{\"type\": \"record\"," + "\"name\": \"events\"," + "\"fields\": [ "
+    String avroSchemaString = "{\"type\": \"record\"," + "\"name\": \"events\"," + "\"fields\": [ "
         + "{\"name\": \"event_date1\", \"type\" : [{\"type\" : \"int\", \"logicalType\" : \"date\"}, \"null\"]},"
         + "{\"name\": \"event_date2\", \"type\" : {\"type\": \"int\", \"logicalType\" : \"date\"}},"
         + "{\"name\": \"event_date3\", \"type\" : [\"null\", {\"type\" : \"int\", \"logicalType\" : \"date\"}]},"

hudi-spark/src/test/scala/TestDataSource.scala

@@ -21,12 +21,11 @@ import org.apache.hudi.common.fs.FSUtils
 import org.apache.hudi.config.HoodieWriteConfig
 import org.apache.hudi.{DataSourceReadOptions, DataSourceWriteOptions, HoodieDataSourceHelpers}
 import org.apache.spark.sql._
-import org.apache.spark.sql.streaming.{OutputMode, ProcessingTime}
 import org.apache.spark.sql.functions.col
-import org.junit.Assert._
-import org.junit.rules.TemporaryFolder
-import org.junit.{Before, Test}
-import org.scalatest.junit.AssertionsForJUnit
+import org.apache.spark.sql.streaming.{OutputMode, ProcessingTime}
+import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue}
+import org.junit.jupiter.api.io.TempDir
+import org.junit.jupiter.api.{BeforeEach, Test}
 
 import scala.collection.JavaConversions._
 import scala.concurrent.ExecutionContext.Implicits.global
@@ -34,9 +33,9 @@ import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
 
 /**
-  * Basic tests on the spark datasource
-  */
-class TestDataSource extends AssertionsForJUnit {
+ * Basic tests on the spark datasource
+ */
+class TestDataSource {
 
   var spark: SparkSession = null
   var dataGen: HoodieTestDataGenerator = null
@@ -51,16 +50,14 @@ class TestDataSource extends AssertionsForJUnit {
   var basePath: String = null
   var fs: FileSystem = null
 
-  @Before def initialize() {
+  @BeforeEach def initialize(@TempDir tempDir: java.nio.file.Path) {
     spark = SparkSession.builder
       .appName("Hoodie Datasource test")
       .master("local[2]")
       .config("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
       .getOrCreate
     dataGen = new HoodieTestDataGenerator()
-    val folder = new TemporaryFolder
-    folder.create
-    basePath = folder.getRoot.getAbsolutePath
+    basePath = tempDir.toAbsolutePath.toString
     fs = FSUtils.getFs(basePath, spark.sparkContext.hadoopConfiguration)
   }
 

hudi-spark/src/test/scala/TestDataSourceDefaults.scala

@@ -16,25 +16,25 @@
  */
 
 import org.apache.avro.generic.GenericRecord
+import org.apache.hudi.DataSourceWriteOptions
+import org.apache.hudi.common.config.TypedProperties
 import org.apache.hudi.common.model.{EmptyHoodieRecordPayload, OverwriteWithLatestAvroPayload}
 import org.apache.hudi.common.util.{Option, SchemaTestUtil}
 import org.apache.hudi.exception.{HoodieException, HoodieKeyException}
 import org.apache.hudi.keygen.{ComplexKeyGenerator, GlobalDeleteKeyGenerator, SimpleKeyGenerator}
-import org.apache.hudi.DataSourceWriteOptions
-import org.apache.hudi.common.config.TypedProperties
-import org.junit.Assert._
-import org.junit.{Before, Test}
-import org.scalatest.junit.AssertionsForJUnit
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.{BeforeEach, Test}
+import org.scalatest.Assertions.fail
 
 /**
-  * Tests on the default key generator, payload classes.
-  */
-class TestDataSourceDefaults extends AssertionsForJUnit {
+ * Tests on the default key generator, payload classes.
+ */
+class TestDataSourceDefaults {
 
   val schema = SchemaTestUtil.getComplexEvolvedSchema
   var baseRecord: GenericRecord = _
 
-  @Before def initialize(): Unit = {
+  @BeforeEach def initialize(): Unit = {
     baseRecord = SchemaTestUtil
       .generateAvroRecordFromJson(schema, 1, "001", "f1")
   }