From dca7272267ed4b1aa5992a3da46c4c0b84383200 Mon Sep 17 00:00:00 2001 From: Yuhao Yang Date: Mon, 24 Jul 2017 15:49:33 -0700 Subject: [PATCH 1/2] fix temp dir --- .../org/apache/spark/ml/tuning/CrossValidatorSuite.scala | 2 +- .../apache/spark/ml/tuning/TrainValidationSplitSuite.scala | 2 +- .../apache/spark/ml/tuning/ValidatorParamsSuiteHelpers.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 2791ea715ace..dc6043ef19fe 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 71a1776a2cdd..7c97865e4520 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 1df673cf4016..d63b90020758 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 @@ -24,7 +24,7 @@ import org.apache.spark.SparkFunSuite import org.apache.spark.ml.param.{ParamMap, ParamPair, Params} import org.apache.spark.ml.util.{DefaultReadWriteTest, Identifiable, MLReader, MLWritable} -object ValidatorParamsSuiteHelpers extends SparkFunSuite with DefaultReadWriteTest { +object ValidatorParamsSuiteHelpers extends SparkFunSuite { /** * Assert sequences of estimatorParamMaps are identical. * If the values for a parameter are not directly comparable with === @@ -62,7 +62,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") From 4da71ce4692fc9f0d866743e7a46228e8c60f295 Mon Sep 17 00:00:00 2001 From: Yuhao Yang Date: Tue, 25 Jul 2017 12:13:23 -0700 Subject: [PATCH 2/2] replace SparkFunSuite --- .../spark/ml/tuning/ValidatorParamsSuiteHelpers.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 d63b90020758..eae1f5adc884 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 { +object ValidatorParamsSuiteHelpers extends Assertions { /** * Assert sequences of estimatorParamMaps are identical. * If the values for a parameter are not directly comparable with ===