Fixes holdenk#220: modify method assertDataFrameNoOrderEquals to hand…

…le duplicates in dataframe
smadarasmi · Feb 19, 2019 · 44e3b4d · 44e3b4d
1 parent b4c92e5
commit 44e3b4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/main/2.0/scala/com/holdenkarau/spark/testing/DataFrameSuiteBase.scala b/src/main/2.0/scala/com/holdenkarau/spark/testing/DataFrameSuiteBase.scala
@@ -156,12 +156,15 @@ trait DataFrameSuiteBaseLike extends SparkContextProvider
 
   /**
     * Compares if two [[DataFrame]]s are equal without caring about order of rows, by
-    * finding elements in one DataFrame not in the other. The resulting DataFrame
+    * finding elements in one DataFrame that is not in the other. The resulting DataFrame
     * should be empty inferring the two DataFrames have the same elements.
     */
   def assertDataFrameNoOrderEquals(expected: DataFrame, result: DataFrame) {
-    assertEmpty(expected.except(result).rdd.take(maxUnequalRowsToShow))
-    assertEmpty(result.except(expected).rdd.take(maxUnequalRowsToShow))
+    import org.apache.spark.sql.functions.col
+    val expectedElementsCount = expected.groupBy(expected.columns.map(s => col(s)): _*).count()
+    val resultElementsCount = result.groupBy(result.columns.map(s => col(s)): _*).count()
+
+    assertDataFrameEquals(expectedElementsCount, resultElementsCount)
   }
 
   /**

diff --git a/src/test/1.3/scala/com/holdenkarau/spark/testing/SampleDataFrameTest.scala b/src/test/1.3/scala/com/holdenkarau/spark/testing/SampleDataFrameTest.scala
@@ -40,8 +40,9 @@ class SampleDataFrameTest extends FunSuite with DataFrameSuiteBase {
 
   test("dataframe should be equal with different order of rows") {
     import sqlContext.implicits._
-    val input = sc.parallelize(inputList).toDF
-    val reverseInput = sc.parallelize(inputList.reverse).toDF
+    val inputListWithDuplicates = inputList ++ List(inputList.head)
+    val input = sc.parallelize(inputListWithDuplicates).toDF
+    val reverseInput = sc.parallelize(inputListWithDuplicates.reverse).toDF
     assertDataFrameNoOrderEquals(input, reverseInput)
   }
 
@@ -56,8 +57,9 @@ class SampleDataFrameTest extends FunSuite with DataFrameSuiteBase {
 
   test("unequal dataframe with different order should not equal") {
     import sqlContext.implicits._
-    val input = sc.parallelize(inputList).toDF
-    val input2 = sc.parallelize(List(inputList.head)).toDF
+    val inputListWithDuplicates = inputList ++ List(inputList.head)
+    val input = sc.parallelize(inputListWithDuplicates).toDF
+    val input2 = sc.parallelize(inputList).toDF
     intercept[org.scalatest.exceptions.TestFailedException] {
       assertDataFrameNoOrderEquals(input, input2)
     }