resolve conflict

mllib/src/test/scala/org/apache/spark/ml/fpm/FPGrowthSuite.scala

@@ -86,26 +86,6 @@ class FPGrowthSuite extends SparkFunSuite with MLlibTestSparkContext with Defaul
     assert(prediction.select("prediction").where("id=3").first().getSeq[String](0).isEmpty)
   }
 
-  test("FPGrowth parameter check") {
-    val fpGrowth = new FPGrowth().setMinSupport(0.4567)
-    val model = fpGrowth.fit(dataset)
-      .setMinConfidence(0.5678)
-    assert(fpGrowth.getMinSupport === 0.4567)
-    assert(model.getMinConfidence === 0.5678)
-    // numPartitions should not have default value.
-    assert(fpGrowth.isDefined(fpGrowth.numPartitions) === false)
-  }
-
-  test("read/write") {
-    def checkModelData(model: FPGrowthModel, model2: FPGrowthModel): Unit = {
-      assert(model.freqItemsets.sort("items").collect() ===
-        model2.freqItemsets.sort("items").collect())
-    }
-    val fPGrowth = new FPGrowth()
-    testEstimatorAndModelReadWrite(fPGrowth, dataset, FPGrowthSuite.allParamSettings,
-      FPGrowthSuite.allParamSettings, checkModelData)
-  }
-
   test("FPGrowth prediction should not contain duplicates") {
     // This should generate rule 1 -> 3, 2 -> 3
     val dataset = spark.createDataFrame(Seq(
@@ -142,6 +122,8 @@ class FPGrowthSuite extends SparkFunSuite with MLlibTestSparkContext with Defaul
       .setMinConfidence(0.5678)
     assert(fpGrowth.getMinSupport === 0.4567)
     assert(model.getMinConfidence === 0.5678)
+    // numPartitions should not have default value.
+    assert(fpGrowth.isDefined(fpGrowth.numPartitions) === false)
     MLTestingUtils.checkCopyAndUids(fpGrowth, model)
     ParamsSuite.checkParams(fpGrowth)
     ParamsSuite.checkParams(model)