diff --git a/mllib/src/test/scala/org/apache/spark/ml/tuning/CrossValidatorSuite.scala b/mllib/src/test/scala/org/apache/spark/ml/tuning/CrossValidatorSuite.scala index 2791ea715ace68fad1c21390155af51f66d2d21d..dc6043ef19fe2f0e0cac036f6d79d66040547918 100644 --- a/mllib/src/test/scala/org/apache/spark/ml/tuning/CrossValidatorSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/ml/tuning/CrossValidatorSuite.scala @@ -222,7 +222,7 @@ class CrossValidatorSuite .setNumFolds(20) .setEstimatorParamMaps(paramMaps) - ValidatorParamsSuiteHelpers.testFileMove(cv) + ValidatorParamsSuiteHelpers.testFileMove(cv, tempDir) } test("read/write: CrossValidator with complex estimator") { diff --git a/mllib/src/test/scala/org/apache/spark/ml/tuning/TrainValidationSplitSuite.scala b/mllib/src/test/scala/org/apache/spark/ml/tuning/TrainValidationSplitSuite.scala index 71a1776a2cdd0db7007c2c6de76a037b9044fe7a..7c97865e4520219ebe7fab7c8f3db8e68792e569 100644 --- a/mllib/src/test/scala/org/apache/spark/ml/tuning/TrainValidationSplitSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/ml/tuning/TrainValidationSplitSuite.scala @@ -209,7 +209,7 @@ class TrainValidationSplitSuite .setEstimatorParamMaps(paramMaps) .setSeed(42L) - ValidatorParamsSuiteHelpers.testFileMove(tvs) + ValidatorParamsSuiteHelpers.testFileMove(tvs, tempDir) } test("read/write: TrainValidationSplitModel") { diff --git a/mllib/src/test/scala/org/apache/spark/ml/tuning/ValidatorParamsSuiteHelpers.scala b/mllib/src/test/scala/org/apache/spark/ml/tuning/ValidatorParamsSuiteHelpers.scala index 1df673cf40162f1691af1fd9c9a5c1f84790684e..eae1f5adc88424017c5579ff1dee4e538dc8ec7c 100644 --- a/mllib/src/test/scala/org/apache/spark/ml/tuning/ValidatorParamsSuiteHelpers.scala +++ b/mllib/src/test/scala/org/apache/spark/ml/tuning/ValidatorParamsSuiteHelpers.scala @@ -20,11 +20,12 @@ package org.apache.spark.ml.tuning import java.io.File import java.nio.file.{Files, StandardCopyOption} -import org.apache.spark.SparkFunSuite +import org.scalatest.Assertions + import org.apache.spark.ml.param.{ParamMap, ParamPair, Params} -import org.apache.spark.ml.util.{DefaultReadWriteTest, Identifiable, MLReader, MLWritable} +import org.apache.spark.ml.util.{Identifiable, MLReader, MLWritable} -object ValidatorParamsSuiteHelpers extends SparkFunSuite with DefaultReadWriteTest { +object ValidatorParamsSuiteHelpers extends Assertions { /** * Assert sequences of estimatorParamMaps are identical. * If the values for a parameter are not directly comparable with === @@ -62,7 +63,7 @@ object ValidatorParamsSuiteHelpers extends SparkFunSuite with DefaultReadWriteTe * the path of the estimator so that if the parent directory changes, loading the * model still works. */ - def testFileMove[T <: Params with MLWritable](instance: T): Unit = { + def testFileMove[T <: Params with MLWritable](instance: T, tempDir: File): Unit = { val uid = instance.uid val subdirName = Identifiable.randomUID("test")