Unit test should have similar styles.

Author: hvanhovell

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/RemoveRedundantAliasAndProjectSuite.scala

@@ -45,9 +45,10 @@ class RemoveRedundantAliasAndProjectSuite extends PlanTest with PredicateHelper
 
   test("all expressions in project list are aliased child output but with different order") {
     val relation = LocalRelation('a.int, 'b.int)
-    val query = relation.select('b, 'a).analyze
-    val optimized = Optimize.execute(relation.select('b as 'b, 'a as 'a).analyze)
-    comparePlans(optimized, query)
+    val query = relation.select('b as 'b, 'a as 'a).analyze
+    val optimized = Optimize.execute(query)
+    val expected = relation.select('b, 'a).analyze
+    comparePlans(optimized, expected)
   }
 
   test("some expressions in project list are aliased child output") {
@@ -59,16 +60,18 @@ class RemoveRedundantAliasAndProjectSuite extends PlanTest with PredicateHelper
 
   test("some expressions in project list are aliased child output but with different order") {
     val relation = LocalRelation('a.int, 'b.int)
-    val query = relation.select('b, 'a).analyze
-    val optimized = Optimize.execute(relation.select('b as 'b, 'a).analyze)
-    comparePlans(optimized, query)
+    val query = relation.select('b as 'b, 'a).analyze
+    val optimized = Optimize.execute(query)
+    val expected = relation.select('b, 'a).analyze
+    comparePlans(optimized, expected)
   }
 
   test("some expressions in project list are not Alias or Attribute") {
     val relation = LocalRelation('a.int, 'b.int)
-    val query = relation.select('a, 'b + 1).analyze
-    val optimized = Optimize.execute(relation.select('a as 'a, 'b + 1).analyze)
-    comparePlans(optimized, query)
+    val query = relation.select('a as 'a, 'b + 1).analyze
+    val optimized = Optimize.execute(query)
+    val expected = relation.select('a, 'b + 1).analyze
+    comparePlans(optimized, expected)
   }
 
   test("some expressions in project list are aliased child output but with metadata") {
@@ -83,32 +86,34 @@ class RemoveRedundantAliasAndProjectSuite extends PlanTest with PredicateHelper
   test("retain deduplicating alias in self-join") {
     val relation = LocalRelation('a.int)
     val fragment = relation.select('a as 'a)
-    val query = relation.join(relation.select('a as 'a)).analyze
-    val optimized = Optimize.execute(
-      fragment.select('a as 'a).join(fragment.select('a as 'a)).analyze)
-    comparePlans(optimized, query)
+    val query = fragment.select('a as 'a).join(fragment.select('a as 'a)).analyze
+    val optimized = Optimize.execute(query)
+    val expected = relation.join(relation.select('a as 'a)).analyze
+    comparePlans(optimized, expected)
   }
 
   test("alias removal should not break after push project through union") {
     val r1 = LocalRelation('a.int)
     val r2 = LocalRelation('b.int)
-    val optimized = Optimize.execute(
-      r1.select('a as 'a).union(r2.select('b as 'b)).select('a).analyze)
-    val query = r1.union(r2)
-    comparePlans(optimized, query)
+    val query = r1.select('a as 'a).union(r2.select('b as 'b)).select('a).analyze
+    val optimized = Optimize.execute(query)
+    val expected = r1.union(r2)
+    comparePlans(optimized, expected)
   }
 
   test("remove redundant alias from aggregate") {
     val relation = LocalRelation('a.int, 'b.int)
-    val optimized = Optimize.execute(relation.groupBy('a as 'a)('a as 'a, sum('b)).analyze)
-    val query = relation.groupBy('a)('a, sum('b)).analyze
-    comparePlans(optimized, query)
+    val query = relation.groupBy('a as 'a)('a as 'a, sum('b)).analyze
+    val optimized = Optimize.execute(query)
+    val expected = relation.groupBy('a)('a, sum('b)).analyze
+    comparePlans(optimized, expected)
   }
 
   test("remove redundant alias from window") {
     val relation = LocalRelation('a.int, 'b.int)
-    val optimized = Optimize.execute(relation.window(Seq('b as 'b), Seq('a as 'a), Seq()).analyze)
-    val query = relation.window(Seq('b), Seq('a), Seq()).analyze
-    comparePlans(optimized, query)
+    val query = relation.window(Seq('b as 'b), Seq('a as 'a), Seq()).analyze
+    val optimized = Optimize.execute(query)
+    val expected = relation.window(Seq('b), Seq('a), Seq()).analyze
+    comparePlans(optimized, expected)
   }
 }