refactored ColumnExpressionSuite, rand still failing

sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala

@@ -105,21 +105,11 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
       Row("a") :: Nil)
   }
 
-  case class TestData(key: Int, value: String)
-  val testData = {
-    val df = (1 to 100).map(i => TestData(i, i.toString)).toDF()
-    df.registerTempTable("testData")
-    df
-  }
+  val testData = (1 to 100).map(i => TestData(i, i.toString)).toDF("key", "value")
 
-  case class TestData2(a: Int, b: Int)
-  val testData2 = {
-    val df = (for { a <- 1 to 3; b <- 1 to 2 } yield (a, b))
-      .map(t => TestData2(t._1, t._2))
-      .toDF()
-    df.registerTempTable("testData2")
-    df
-  }
+  val testData2 = (for { a <- 1 to 3; b <- 1 to 2 } yield (a, b))
+      .map(t => (t._1, t._2))
+      .toDF("a", "b")
 
   test("alias") {
     val df = Seq((1, Seq(1, 2, 3))).toDF("a", "intList")
@@ -275,24 +265,19 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
       testData2.collect().toSeq.map(r => Row(-r.getInt(0))))
   }
 
+  case class TestData(key: Int, value: String)
   case class ComplexData(m: Map[String, Int], s: TestData, a: Seq[Int], b: Boolean)
   test("unary !") {
-    val complexData = {
-      val df = Seq(
-        ComplexData(Map("1" -> 1), TestData(1, "1"), Seq(1), true),
-        ComplexData(Map("2" -> 2), TestData(2, "2"), Seq(2), false)
-      ).toDF()
-      df.registerTempTable("complexData")
-      df
-    }
+    val complexData =Seq(
+      ComplexData(Map("1" -> 1), TestData(1, "1"), Seq(1), true),
+      ComplexData(Map("2" -> 2), TestData(2, "2"), Seq(2), false)
+    ).toDF()
     checkAnswer(
       complexData.select(!$"b"),
       complexData.collect().toSeq.map(r => Row(!r.getBoolean(3))))
   }
 
-  case class NullStrings(n: Int, s: String)
-  val nullStrings = Seq(NullStrings(1, "abc"), NullStrings(2, "ABC"), NullStrings(3, null)).toDF()
-
+  val nullStrings = Seq((1, "abc"), (2, "ABC"), (3, null)).toDF("n", "s")
   test("isNull") {
     checkAnswer(
       nullStrings.where($"s".isNull),
@@ -540,11 +525,10 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
     )
   }
 
-  case class LowerCaseData(n: Int, l: String)
   test("upper") {
     val lowerCaseData = ((1 to 4) zip ('a' to 'd'))
-      .map(t => LowerCaseData(t._1, t._2.toString))
-      .toDF()
+      .map(t => (t._1, t._2.toString))
+      .toDF("n", "l")
 
     checkAnswer(
       lowerCaseData.select(upper('l)),
@@ -566,11 +550,10 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
       Row("AB", "CDE"))
   }
 
-  case class UpperCaseData(N: Int, L: String)
   test("lower") {
     val upperCaseData = ((1 to 6) zip ('A' to 'F'))
-      .map(t => UpperCaseData(t._1, t._2.toString))
-      .toDF()
+      .map(t => (t._1, t._2.toString))
+      .toDF("N", "L")
 
     checkAnswer(
       upperCaseData.select(lower('L)),