Manually bind references

Author: JoshRosen

sql/core/src/test/scala/org/apache/spark/sql/execution/SortSuite.scala

@@ -17,8 +17,8 @@
 
 package org.apache.spark.sql.execution
 
-import org.apache.spark.sql.catalyst.dsl.expressions._
-import org.apache.spark.sql.catalyst.expressions.{Ascending, SortOrder}
+import org.apache.spark.sql.catalyst.expressions.{BoundReference, Ascending, SortOrder}
+import org.apache.spark.sql.types.{IntegerType, StringType}
 
 class SortSuite extends SparkPlanTest {
 
@@ -31,8 +31,8 @@ class SortSuite extends SparkPlanTest {
     )
 
     val sortOrder = Seq(
-      SortOrder('_1, Ascending),
-      SortOrder('_2, Ascending)
+      SortOrder(BoundReference(0, StringType, nullable = false), Ascending),
+      SortOrder(BoundReference(1, IntegerType, nullable = false), Ascending)
     )
 
     checkAnswer(

sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala

@@ -60,7 +60,7 @@ class SparkPlanTest extends SparkFunSuite {
       planFunction: SparkPlan => SparkPlan,
       expectedAnswer: Seq[A]): Unit = {
     val inputDf = TestSQLContext.createDataFrame(input)
-    val expectedRows = expectedAnswer.map(t => Row.apply(t))
+    val expectedRows = expectedAnswer.map(Row.fromTuple)
     SparkPlanTest.checkAnswer(inputDf, planFunction, expectedRows) match {
       case Some(errorMessage) => fail(errorMessage)
       case None =>