revert change of HiveQuerySuite

scwf · scwf · commit 93bc0c5d1da6 · 2014-08-19T12:50:09.000+08:00
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
@@ -473,7 +473,7 @@ class HiveQuerySuite extends HiveComparisonTest {
 
     sql(s"SET ${testKey + testKey}=${testVal + testVal}")
     assert(hiveconf.get(testKey + testKey, "") == testVal + testVal)
-    assertResult(Array(s"${testKey + testKey}=${testVal + testVal}", s"$testKey=$testVal")) {
+    assertResult(Array(s"$testKey=$testVal", s"${testKey + testKey}=${testVal + testVal}")) {
       sql(s"SET").collect().map(_.getString(0))
     }
 
@@ -501,7 +501,7 @@ class HiveQuerySuite extends HiveComparisonTest {
 
     sql(s"SET ${testKey + testKey}=${testVal + testVal}")
     assert(hiveconf.get(testKey + testKey, "") == testVal + testVal)
-    assertResult(Array(s"${testKey + testKey}=${testVal + testVal}", s"$testKey=$testVal")) {
+    assertResult(Array(s"$testKey=$testVal", s"${testKey + testKey}=${testVal + testVal}")) {
       sql("SET").collect().map(_.getString(0))
     }
 

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ class HiveQuerySuite extends HiveComparisonTest {`
`473`	`473`
`474`	`474`	`sql(s"SET ${testKey + testKey}=${testVal + testVal}")`
`475`	`475`	`assert(hiveconf.get(testKey + testKey, "") == testVal + testVal)`
`476`		`- assertResult(Array(s"${testKey + testKey}=${testVal + testVal}", s"$testKey=$testVal")) {`
	`476`	`+ assertResult(Array(s"$testKey=$testVal", s"${testKey + testKey}=${testVal + testVal}")) {`
`477`	`477`	`sql(s"SET").collect().map(_.getString(0))`
`478`	`478`	`}`
`479`	`479`
`@@ -501,7 +501,7 @@ class HiveQuerySuite extends HiveComparisonTest {`
`501`	`501`
`502`	`502`	`sql(s"SET ${testKey + testKey}=${testVal + testVal}")`
`503`	`503`	`assert(hiveconf.get(testKey + testKey, "") == testVal + testVal)`
`504`		`- assertResult(Array(s"${testKey + testKey}=${testVal + testVal}", s"$testKey=$testVal")) {`
	`504`	`+ assertResult(Array(s"$testKey=$testVal", s"${testKey + testKey}=${testVal + testVal}")) {`
`505`	`505`	`sql("SET").collect().map(_.getString(0))`
`506`	`506`	`}`
`507`	`507`