Make suite more readable

Author: yucai

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala

@@ -316,35 +316,46 @@ class ParquetFilterSuite extends QueryTest with ParquetTest with SharedSQLContex
   }
 
   test("filter pushdown - date") {
-    implicit class IntToDate(int: Int) {
-      def date: Date =
-        new Date(Date.valueOf("2018-03-01").getTime + 24 * 60 * 60 * 1000 * (int - 1))
+    implicit class StringToDate(s: String) {
+      def date: Date = Date.valueOf(s)
     }
 
-    withParquetDataFrame((1 to 4).map(i => Tuple1(i.date))) { implicit df =>
-      checkFilterPredicate('_1.isNull, classOf[Eq[_]], Seq.empty[Row])
-      checkFilterPredicate('_1.isNotNull, classOf[NotEq[_]], (1 to 4).map(i => Row.apply(i.date)))
-
-      checkFilterPredicate('_1 === 1.date, classOf[Eq[_]], 1.date)
-      checkFilterPredicate('_1 <=> 1.date, classOf[Eq[_]], 1.date)
-      checkFilterPredicate('_1 =!= 1.date, classOf[NotEq[_]], (2 to 4).map(i => Row.apply(i.date)))
-
-      checkFilterPredicate('_1 < 2.date, classOf[Lt[_]], 1.date)
-      checkFilterPredicate('_1 > 3.date, classOf[Gt[_]], 4.date)
-      checkFilterPredicate('_1 <= 1.date, classOf[LtEq[_]], 1.date)
-      checkFilterPredicate('_1 >= 4.date, classOf[GtEq[_]], 4.date)
-
-      checkFilterPredicate(Literal(1.date) === '_1, classOf[Eq[_]], 1.date)
-      checkFilterPredicate(Literal(1.date) <=> '_1, classOf[Eq[_]], 1.date)
-      checkFilterPredicate(Literal(2.date) > '_1, classOf[Lt[_]], 1.date)
-      checkFilterPredicate(Literal(3.date) < '_1, classOf[Gt[_]], 4.date)
-      checkFilterPredicate(Literal(1.date) >= '_1, classOf[LtEq[_]], 1.date)
-      checkFilterPredicate(Literal(4.date) <= '_1, classOf[GtEq[_]], 4.date)
-
-      checkFilterPredicate(!('_1 < 4.date), classOf[GtEq[_]], 4.date)
-      checkFilterPredicate('_1 < 2.date || '_1 > 3.date, classOf[Operators.Or],
-        Seq(Row(1.date), Row(4.date)))
-    }
+    withParquetDataFrame(
+      Seq("2018-03-18", "2018-03-19", "2018-03-20", "2018-03-21").map(i => Tuple1(i.date))) {
+        implicit df =>
+          checkFilterPredicate('_1.isNull, classOf[Eq[_]], Seq.empty[Row])
+          checkFilterPredicate('_1.isNotNull, classOf[NotEq[_]],
+            Seq("2018-03-18", "2018-03-19", "2018-03-20", "2018-03-21").map(i => Row.apply(i.date)))
+
+          checkFilterPredicate('_1 === "2018-03-18".date, classOf[Eq[_]], "2018-03-18".date)
+          checkFilterPredicate('_1 <=> "2018-03-18".date, classOf[Eq[_]], "2018-03-18".date)
+          checkFilterPredicate('_1 =!= "2018-03-18".date, classOf[NotEq[_]],
+            Seq("2018-03-19", "2018-03-20", "2018-03-21").map(i => Row.apply(i.date)))
+
+          checkFilterPredicate('_1 < "2018-03-19".date, classOf[Lt[_]], "2018-03-18".date)
+          checkFilterPredicate('_1 > "2018-03-20".date, classOf[Gt[_]], "2018-03-21".date)
+          checkFilterPredicate('_1 <= "2018-03-18".date, classOf[LtEq[_]], "2018-03-18".date)
+          checkFilterPredicate('_1 >= "2018-03-21".date, classOf[GtEq[_]], "2018-03-21".date)
+
+          checkFilterPredicate(
+            Literal("2018-03-18".date) === '_1, classOf[Eq[_]], "2018-03-18".date)
+          checkFilterPredicate(
+            Literal("2018-03-18".date) <=> '_1, classOf[Eq[_]], "2018-03-18".date)
+          checkFilterPredicate(
+            Literal("2018-03-19".date) > '_1, classOf[Lt[_]], "2018-03-18".date)
+          checkFilterPredicate(
+            Literal("2018-03-20".date) < '_1, classOf[Gt[_]], "2018-03-21".date)
+          checkFilterPredicate(
+            Literal("2018-03-18".date) >= '_1, classOf[LtEq[_]], "2018-03-18".date)
+          checkFilterPredicate(
+            Literal("2018-03-21".date) <= '_1, classOf[GtEq[_]], "2018-03-21".date)
+
+          checkFilterPredicate(!('_1 < "2018-03-21".date), classOf[GtEq[_]], "2018-03-21".date)
+          checkFilterPredicate(
+            '_1 < "2018-03-19".date || '_1 > "2018-03-20".date,
+            classOf[Operators.Or],
+            Seq(Row("2018-03-18".date), Row("2018-03-21".date)))
+        }
   }
 
   test("SPARK-6554: don't push down predicates which reference partition columns") {