add more concise unit test

apache · Dec 17, 2014 · e7a72e9 · e7a72e9
1 parent 853de51
commit e7a72e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/json/JsonSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/json/JsonSuite.scala
@@ -200,14 +200,15 @@ class JsonSuite extends QueryTest {
         StructField("Charset", StringType, true) ::
           StructField("Host", StringType, true) :: Nil)
         , true) ::
-        StructField("ip", StringType, true) :: Nil)
+        StructField("ip", StringType, true) ::
+        StructField("nullstr", StringType, true):: Nil)
 
     assert(expectedSchema === jsonSchemaRDD.schema)
     jsonSchemaRDD.registerTempTable("jsonTable")
 
     checkAnswer(
-      sql("select headers.Host from jsonTable"),
-      Seq(Row("1.abc.com"), Row(null), Row(null))
+      sql("select nullstr, headers.Host from jsonTable"),
+      Seq(Row("", "1.abc.com"), Row("", null), Row("", null), Row(null, null))
     )
   }
 

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/json/TestJsonData.scala b/sql/core/src/test/scala/org/apache/spark/sql/json/TestJsonData.scala
@@ -45,9 +45,10 @@ object TestJsonData {
 
   val jsonNullStruct =
     TestSQLContext.sparkContext.parallelize(
-      """{"ip":"27.31.100.29","headers":{"Host":"1.abc.com","Charset":"UTF-8"}}""" ::
-        """{"ip":"27.31.100.29","headers":{}}""" ::
-        """{"ip":"27.31.100.29","headers":""}""" :: Nil)
+      """{"nullstr":"","ip":"27.31.100.29","headers":{"Host":"1.abc.com","Charset":"UTF-8"}}""" ::
+        """{"nullstr":"","ip":"27.31.100.29","headers":{}}""" ::
+        """{"nullstr":"","ip":"27.31.100.29","headers":""}""" ::
+        """{"nullstr":null,"ip":"27.31.100.29","headers":null}""" :: Nil)
 
   val complexFieldValueTypeConflict =
     TestSQLContext.sparkContext.parallelize(