From a84a1fde0209b17cb9ffca4d2ee3e2180e7b970e Mon Sep 17 00:00:00 2001 From: Emil Ejbyfeldt Date: Thu, 20 Apr 2023 16:16:56 +0200 Subject: [PATCH] [jvm-packages] Update scalatest to 3.2.15 (#8925) --------- Co-authored-by: Jiaming Yuan --- jvm-packages/pom.xml | 4 ++-- jvm-packages/xgboost4j-gpu/pom.xml | 2 +- .../ml/dmlc/xgboost4j/scala/QuantileDMatrixSuite.scala | 4 ++-- .../dmlc/xgboost4j/scala/rapids/spark/GpuTestSuite.scala | 7 ++++--- .../scala/spark/CommunicatorRobustnessSuite.scala | 4 ++-- .../scala/spark/DeterministicPartitioningSuite.scala | 4 ++-- .../scala/spark/ExternalCheckpointManagerSuite.scala | 4 ++-- .../xgboost4j/scala/spark/FeatureSizeValidatingSuite.scala | 4 ++-- .../xgboost4j/scala/spark/MissingValueHandlingSuite.scala | 4 ++-- .../ml/dmlc/xgboost4j/scala/spark/ParameterSuite.scala | 5 +++-- .../test/scala/ml/dmlc/xgboost4j/scala/spark/PerTest.scala | 5 +++-- .../ml/dmlc/xgboost4j/scala/spark/PersistenceSuite.scala | 4 ++-- .../ml/dmlc/xgboost4j/scala/spark/TmpFolderPerSuite.scala | 5 +++-- .../xgboost4j/scala/spark/XGBoostClassifierSuite.scala | 4 ++-- .../scala/spark/XGBoostCommunicatorRegressionSuite.scala | 4 ++-- .../dmlc/xgboost4j/scala/spark/XGBoostConfigureSuite.scala | 4 ++-- .../dmlc/xgboost4j/scala/spark/XGBoostGeneralSuite.scala | 4 ++-- .../dmlc/xgboost4j/scala/spark/XGBoostRegressorSuite.scala | 4 ++-- jvm-packages/xgboost4j-tester/generate_pom.py | 2 +- jvm-packages/xgboost4j/pom.xml | 2 +- .../test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala | 4 ++-- .../ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala | 4 ++-- 22 files changed, 46 insertions(+), 42 deletions(-) diff --git a/jvm-packages/pom.xml b/jvm-packages/pom.xml index facb955ce..9d7e41651 100644 --- a/jvm-packages/pom.xml +++ b/jvm-packages/pom.xml @@ -495,13 +495,13 @@ org.scalatest scalatest_${scala.binary.version} - 3.0.8 + 3.2.15 test org.scalactic scalactic_${scala.binary.version} - 3.0.8 + 3.2.15 test diff --git a/jvm-packages/xgboost4j-gpu/pom.xml b/jvm-packages/xgboost4j-gpu/pom.xml index 167635209..5ffe0588c 100644 --- a/jvm-packages/xgboost4j-gpu/pom.xml +++ b/jvm-packages/xgboost4j-gpu/pom.xml @@ -53,7 +53,7 @@ org.scalatest scalatest_${scala.binary.version} - 3.0.5 + 3.2.15 provided diff --git a/jvm-packages/xgboost4j-gpu/src/test/scala/ml/dmlc/xgboost4j/scala/QuantileDMatrixSuite.scala b/jvm-packages/xgboost4j-gpu/src/test/scala/ml/dmlc/xgboost4j/scala/QuantileDMatrixSuite.scala index ba8c5fa9a..28ac2207a 100644 --- a/jvm-packages/xgboost4j-gpu/src/test/scala/ml/dmlc/xgboost4j/scala/QuantileDMatrixSuite.scala +++ b/jvm-packages/xgboost4j-gpu/src/test/scala/ml/dmlc/xgboost4j/scala/QuantileDMatrixSuite.scala @@ -19,10 +19,10 @@ package ml.dmlc.xgboost4j.scala import scala.collection.mutable.ArrayBuffer import ai.rapids.cudf.Table -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import ml.dmlc.xgboost4j.gpu.java.CudfColumnBatch -class QuantileDMatrixSuite extends FunSuite { +class QuantileDMatrixSuite extends AnyFunSuite { test("QuantileDMatrix test") { diff --git a/jvm-packages/xgboost4j-spark-gpu/src/test/scala/ml/dmlc/xgboost4j/scala/rapids/spark/GpuTestSuite.scala b/jvm-packages/xgboost4j-spark-gpu/src/test/scala/ml/dmlc/xgboost4j/scala/rapids/spark/GpuTestSuite.scala index 175e00b39..2a355e160 100644 --- a/jvm-packages/xgboost4j-spark-gpu/src/test/scala/ml/dmlc/xgboost4j/scala/rapids/spark/GpuTestSuite.scala +++ b/jvm-packages/xgboost4j-spark-gpu/src/test/scala/ml/dmlc/xgboost4j/scala/rapids/spark/GpuTestSuite.scala @@ -20,14 +20,15 @@ import java.nio.file.{Files, Path} import java.sql.{Date, Timestamp} import java.util.{Locale, TimeZone} -import org.scalatest.{BeforeAndAfterAll, FunSuite} +import org.scalatest.BeforeAndAfterAll +import org.scalatest.funsuite.AnyFunSuite import org.apache.spark.{GpuTestUtils, SparkConf} import org.apache.spark.internal.Logging import org.apache.spark.network.util.JavaUtils import org.apache.spark.sql.{Row, SparkSession} -trait GpuTestSuite extends FunSuite with TmpFolderSuite { +trait GpuTestSuite extends AnyFunSuite with TmpFolderSuite { import SparkSessionHolder.withSparkSession protected def getResourcePath(resource: String): String = { @@ -200,7 +201,7 @@ trait GpuTestSuite extends FunSuite with TmpFolderSuite { } -trait TmpFolderSuite extends BeforeAndAfterAll { self: FunSuite => +trait TmpFolderSuite extends BeforeAndAfterAll { self: AnyFunSuite => protected var tempDir: Path = _ override def beforeAll(): Unit = { diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/CommunicatorRobustnessSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/CommunicatorRobustnessSuite.scala index 04081c3fe..5445cd1bf 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/CommunicatorRobustnessSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/CommunicatorRobustnessSuite.scala @@ -23,9 +23,9 @@ import scala.util.Random import ml.dmlc.xgboost4j.java.{Communicator, RabitTracker => PyRabitTracker} import ml.dmlc.xgboost4j.java.IRabitTracker.TrackerStatus import ml.dmlc.xgboost4j.scala.DMatrix -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite -class CommunicatorRobustnessSuite extends FunSuite with PerTest { +class CommunicatorRobustnessSuite extends AnyFunSuite with PerTest { private def getXGBoostExecutionParams(paramMap: Map[String, Any]): XGBoostExecutionParams = { val classifier = new XGBoostClassifier(paramMap) diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/DeterministicPartitioningSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/DeterministicPartitioningSuite.scala index 61766b755..8d9723bb6 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/DeterministicPartitioningSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/DeterministicPartitioningSuite.scala @@ -17,13 +17,13 @@ package ml.dmlc.xgboost4j.scala.spark import org.apache.spark.ml.linalg.Vectors -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import ml.dmlc.xgboost4j.scala.spark.util.DataUtils import ml.dmlc.xgboost4j.scala.spark.util.DataUtils.PackedParams import org.apache.spark.sql.functions._ -class DeterministicPartitioningSuite extends FunSuite with TmpFolderPerSuite with PerTest { +class DeterministicPartitioningSuite extends AnyFunSuite with TmpFolderPerSuite with PerTest { test("perform deterministic partitioning when checkpointInternal and" + " checkpointPath is set (Classifier)") { diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/ExternalCheckpointManagerSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/ExternalCheckpointManagerSuite.scala index cdcfd76f5..adc9c1068 100755 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/ExternalCheckpointManagerSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/ExternalCheckpointManagerSuite.scala @@ -19,10 +19,10 @@ package ml.dmlc.xgboost4j.scala.spark import java.io.File import ml.dmlc.xgboost4j.scala.{Booster, DMatrix, ExternalCheckpointManager, XGBoost => SXGBoost} -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import org.apache.hadoop.fs.{FileSystem, Path} -class ExternalCheckpointManagerSuite extends FunSuite with TmpFolderPerSuite with PerTest { +class ExternalCheckpointManagerSuite extends AnyFunSuite with TmpFolderPerSuite with PerTest { private def produceParamMap(checkpointPath: String, checkpointInterval: Int): Map[String, Any] = { diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/FeatureSizeValidatingSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/FeatureSizeValidatingSuite.scala index e0151dde3..789fd162b 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/FeatureSizeValidatingSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/FeatureSizeValidatingSuite.scala @@ -18,12 +18,12 @@ package ml.dmlc.xgboost4j.scala.spark import org.apache.spark.Partitioner import org.apache.spark.ml.feature.VectorAssembler -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import org.apache.spark.sql.functions._ import scala.util.Random -class FeatureSizeValidatingSuite extends FunSuite with PerTest { +class FeatureSizeValidatingSuite extends AnyFunSuite with PerTest { test("transform throwing exception if feature size of dataset is greater than model's") { val modelPath = getClass.getResource("/model/0.82/model").getPath diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/MissingValueHandlingSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/MissingValueHandlingSuite.scala index 5863e2ace..6a7f7129d 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/MissingValueHandlingSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/MissingValueHandlingSuite.scala @@ -19,12 +19,12 @@ package ml.dmlc.xgboost4j.scala.spark import org.apache.spark.ml.feature.VectorAssembler import org.apache.spark.ml.linalg.Vectors import org.apache.spark.sql.DataFrame -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import scala.util.Random import org.apache.spark.SparkException -class MissingValueHandlingSuite extends FunSuite with PerTest { +class MissingValueHandlingSuite extends AnyFunSuite with PerTest { test("dense vectors containing missing value") { def buildDenseDataFrame(): DataFrame = { val numRows = 100 diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/ParameterSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/ParameterSuite.scala index e3468b811..11b60e74d 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/ParameterSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/ParameterSuite.scala @@ -16,12 +16,13 @@ package ml.dmlc.xgboost4j.scala.spark -import org.scalatest.{BeforeAndAfterAll, FunSuite} +import org.scalatest.BeforeAndAfterAll +import org.scalatest.funsuite.AnyFunSuite import org.apache.spark.SparkException import org.apache.spark.ml.param.ParamMap -class ParameterSuite extends FunSuite with PerTest with BeforeAndAfterAll { +class ParameterSuite extends AnyFunSuite with PerTest with BeforeAndAfterAll { test("XGBoost and Spark parameters synchronize correctly") { val xgbParamMap = Map("eta" -> "1", "objective" -> "binary:logistic", diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/PerTest.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/PerTest.scala index e96618c51..24bc00e18 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/PerTest.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/PerTest.scala @@ -22,13 +22,14 @@ import ml.dmlc.xgboost4j.{LabeledPoint => XGBLabeledPoint} import org.apache.spark.SparkContext import org.apache.spark.sql._ -import org.scalatest.{BeforeAndAfterEach, FunSuite} +import org.scalatest.BeforeAndAfterEach +import org.scalatest.funsuite.AnyFunSuite import scala.math.min import scala.util.Random import org.apache.commons.io.IOUtils -trait PerTest extends BeforeAndAfterEach { self: FunSuite => +trait PerTest extends BeforeAndAfterEach { self: AnyFunSuite => protected val numWorkers: Int = min(Runtime.getRuntime.availableProcessors(), 4) diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/PersistenceSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/PersistenceSuite.scala index cf8dcca57..5425b8647 100755 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/PersistenceSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/PersistenceSuite.scala @@ -25,9 +25,9 @@ import scala.util.Random import org.apache.spark.ml.feature._ import org.apache.spark.ml.{Pipeline, PipelineModel} import org.apache.spark.sql.functions._ -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite -class PersistenceSuite extends FunSuite with TmpFolderPerSuite with PerTest { +class PersistenceSuite extends AnyFunSuite with TmpFolderPerSuite with PerTest { test("test persistence of XGBoostClassifier and XGBoostClassificationModel") { val eval = new EvalError() diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/TmpFolderPerSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/TmpFolderPerSuite.scala index 96b74d679..bb523ffdf 100755 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/TmpFolderPerSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/TmpFolderPerSuite.scala @@ -19,9 +19,10 @@ package ml.dmlc.xgboost4j.scala.spark import java.nio.file.{Files, Path} import org.apache.spark.network.util.JavaUtils -import org.scalatest.{BeforeAndAfterAll, FunSuite} +import org.scalatest.BeforeAndAfterAll +import org.scalatest.funsuite.AnyFunSuite -trait TmpFolderPerSuite extends BeforeAndAfterAll { self: FunSuite => +trait TmpFolderPerSuite extends BeforeAndAfterAll { self: AnyFunSuite => protected var tempDir: Path = _ override def beforeAll(): Unit = { diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostClassifierSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostClassifierSuite.scala index f31207b9f..0031be9c7 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostClassifierSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostClassifierSuite.scala @@ -22,13 +22,13 @@ import ml.dmlc.xgboost4j.scala.{DMatrix, XGBoost => ScalaXGBoost} import org.apache.spark.ml.linalg._ import org.apache.spark.sql._ -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import org.apache.commons.io.IOUtils import org.apache.spark.Partitioner import org.apache.spark.ml.feature.VectorAssembler -class XGBoostClassifierSuite extends FunSuite with PerTest with TmpFolderPerSuite { +class XGBoostClassifierSuite extends AnyFunSuite with PerTest with TmpFolderPerSuite { protected val treeMethod: String = "auto" diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostCommunicatorRegressionSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostCommunicatorRegressionSuite.scala index a7310f1ab..86b82e63c 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostCommunicatorRegressionSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostCommunicatorRegressionSuite.scala @@ -21,11 +21,11 @@ import ml.dmlc.xgboost4j.scala.Booster import scala.collection.JavaConverters._ import org.apache.spark.sql._ -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import org.apache.spark.SparkException -class XGBoostCommunicatorRegressionSuite extends FunSuite with PerTest { +class XGBoostCommunicatorRegressionSuite extends AnyFunSuite with PerTest { val predictionErrorMin = 0.00001f val maxFailure = 2; diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostConfigureSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostConfigureSuite.scala index 7d588d97c..086fda2d7 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostConfigureSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostConfigureSuite.scala @@ -19,9 +19,9 @@ package ml.dmlc.xgboost4j.scala.spark import ml.dmlc.xgboost4j.scala.{Booster, DMatrix} import org.apache.spark.sql._ -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite -class XGBoostConfigureSuite extends FunSuite with PerTest { +class XGBoostConfigureSuite extends AnyFunSuite with PerTest { override def sparkSessionBuilder: SparkSession.Builder = super.sparkSessionBuilder .config("spark.serializer", "org.apache.spark.serializer.KryoSerializer") diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostGeneralSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostGeneralSuite.scala index 0bf8c2fbb..c1e34224c 100755 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostGeneralSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostGeneralSuite.scala @@ -22,12 +22,12 @@ import ml.dmlc.xgboost4j.{LabeledPoint => XGBLabeledPoint} import ml.dmlc.xgboost4j.scala.DMatrix import org.apache.spark.{SparkException, TaskContext} -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import org.apache.spark.ml.feature.VectorAssembler import org.apache.spark.sql.functions.lit -class XGBoostGeneralSuite extends FunSuite with TmpFolderPerSuite with PerTest { +class XGBoostGeneralSuite extends AnyFunSuite with TmpFolderPerSuite with PerTest { test("distributed training with the specified worker number") { val trainingRDD = sc.parallelize(Classification.train) diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostRegressorSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostRegressorSuite.scala index 4e3d59b25..efcb38cf6 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostRegressorSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostRegressorSuite.scala @@ -23,11 +23,11 @@ import ml.dmlc.xgboost4j.scala.{DMatrix, XGBoost => ScalaXGBoost} import org.apache.spark.ml.linalg.{Vector, Vectors} import org.apache.spark.sql.functions._ import org.apache.spark.sql.{DataFrame, Row} -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import org.apache.spark.ml.feature.VectorAssembler -class XGBoostRegressorSuite extends FunSuite with PerTest with TmpFolderPerSuite { +class XGBoostRegressorSuite extends AnyFunSuite with PerTest with TmpFolderPerSuite { protected val treeMethod: String = "auto" test("XGBoost-Spark XGBoostRegressor output should match XGBoost4j") { diff --git a/jvm-packages/xgboost4j-tester/generate_pom.py b/jvm-packages/xgboost4j-tester/generate_pom.py index edc9759bd..06372e9b2 100644 --- a/jvm-packages/xgboost4j-tester/generate_pom.py +++ b/jvm-packages/xgboost4j-tester/generate_pom.py @@ -69,7 +69,7 @@ pom_template = """ org.scalactic scalactic_${{scala.binary.version}} - 3.0.8 + 3.2.15 test diff --git a/jvm-packages/xgboost4j/pom.xml b/jvm-packages/xgboost4j/pom.xml index aa8694751..7c5c33e87 100644 --- a/jvm-packages/xgboost4j/pom.xml +++ b/jvm-packages/xgboost4j/pom.xml @@ -46,7 +46,7 @@ org.scalatest scalatest_${scala.binary.version} - 3.0.5 + 3.2.15 provided diff --git a/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala b/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala index 05200f49e..05c6856f7 100644 --- a/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala +++ b/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala @@ -20,10 +20,10 @@ import java.util.Arrays import scala.util.Random -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import ml.dmlc.xgboost4j.java.{DMatrix => JDMatrix} -class DMatrixSuite extends FunSuite { +class DMatrixSuite extends AnyFunSuite { test("create DMatrix from File") { val dmat = new DMatrix("../../demo/data/agaricus.txt.test") // get label diff --git a/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala b/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala index 157971f82..8cac9fe4f 100644 --- a/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala +++ b/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala @@ -20,11 +20,11 @@ import java.io.{FileOutputStream, FileInputStream, File} import junit.framework.TestCase import org.apache.commons.logging.LogFactory -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import ml.dmlc.xgboost4j.java.XGBoostError -class ScalaBoosterImplSuite extends FunSuite { +class ScalaBoosterImplSuite extends AnyFunSuite { private class EvalError extends EvalTrait {