diff --git a/transportable-udfs-test/transportable-udfs-test-api/build.gradle b/transportable-udfs-test/transportable-udfs-test-api/build.gradle index 3ecf7605..a39695c6 100644 --- a/transportable-udfs-test/transportable-udfs-test-api/build.gradle +++ b/transportable-udfs-test/transportable-udfs-test-api/build.gradle @@ -4,6 +4,8 @@ dependencies { api project(":transportable-udfs-test:transportable-udfs-test-spi") implementation project(":transportable-udfs-api") - api 'org.testng:testng:6.11' + api 'org.junit.jupiter:junit-jupiter-api:5.10.2' + api 'org.junit.jupiter:junit-jupiter-engine:5.10.2' + api 'org.junit.jupiter:junit-jupiter-params:5.10.2' implementation 'com.google.guava:guava:24.1-jre' } \ No newline at end of file diff --git a/transportable-udfs-test/transportable-udfs-test-hive/src/main/java/com/linkedin/transport/test/hive/HiveTester.java b/transportable-udfs-test/transportable-udfs-test-hive/src/main/java/com/linkedin/transport/test/hive/HiveTester.java index e2b447e6..b68523aa 100644 --- a/transportable-udfs-test/transportable-udfs-test-hive/src/main/java/com/linkedin/transport/test/hive/HiveTester.java +++ b/transportable-udfs-test/transportable-udfs-test-hive/src/main/java/com/linkedin/transport/test/hive/HiveTester.java @@ -35,7 +35,8 @@ import org.apache.hive.service.cli.RowSet; import org.apache.hive.service.cli.SessionHandle; import org.apache.hive.service.server.HiveServer2; -import org.testng.Assert; + +import static org.junit.jupiter.api.Assertions.*; public class HiveTester implements SqlStdTester { @@ -129,10 +130,10 @@ public void assertFunctionCall(String functionCallString, Object expectedOutputD Object[] row = rowSet.iterator().next(); Object result = row[0]; - Assert.assertEquals(result, expectedOutputData, "UDF output does not match"); + assertEquals(result, expectedOutputData, "UDF output does not match"); // Get the output data type and convert them to TypeInfo to compare ColumnDescriptor outputColumnDescriptor = _client.getResultSetMetadata(handle).getColumnDescriptors().get(0); - Assert.assertEquals(TypeInfoUtils.getTypeInfoFromTypeString(outputColumnDescriptor.getTypeName().toLowerCase()), + assertEquals(TypeInfoUtils.getTypeInfoFromTypeString(outputColumnDescriptor.getTypeName().toLowerCase()), TypeInfoUtils.getTypeInfoFromObjectInspector((ObjectInspector) expectedOutputType), "UDF output type does not match"); } else { diff --git a/transportable-udfs-test/transportable-udfs-test-spark_2.11/src/main/scala/com/linkedin/transport/test/spark/SparkTester.scala b/transportable-udfs-test/transportable-udfs-test-spark_2.11/src/main/scala/com/linkedin/transport/test/spark/SparkTester.scala index 8c18b21f..9f792267 100644 --- a/transportable-udfs-test/transportable-udfs-test-spark_2.11/src/main/scala/com/linkedin/transport/test/spark/SparkTester.scala +++ b/transportable-udfs-test/transportable-udfs-test-spark_2.11/src/main/scala/com/linkedin/transport/test/spark/SparkTester.scala @@ -15,7 +15,7 @@ import com.linkedin.transport.test.spi.{SqlFunctionCallGenerator, SqlStdTester, import org.apache.spark.SparkException import org.apache.spark.sql.types._ import org.apache.spark.sql.{SparkSession, StdUDFTestUtils} -import org.testng.Assert +import org.junit.jupiter.api.Assertions._ import scala.collection.JavaConversions._ @@ -41,8 +41,8 @@ class SparkTester extends SqlStdTester { } catch { case e: SparkException => throw e.getCause() } - Assert.assertEquals(result.get(0), expectedOutputData) - Assert.assertEquals(getModifiedResultType(result.schema.head.dataType), expectedOutputType) + assertEquals(result.get(0), expectedOutputData) + assertEquals(getModifiedResultType(result.schema.head.dataType), expectedOutputType) } override def setup(topLevelStdUDFClassesAndImplementations: util.Map[Class[_ <: TopLevelStdUDF],