From 27b08c9021f7ea9c595d276a9b7c6d6dd4ae2411 Mon Sep 17 00:00:00 2001 From: Reynold Xin Date: Sun, 18 Jan 2015 00:54:02 -0800 Subject: [PATCH] Fixed test. --- .../src/test/scala/org/apache/spark/sql/json/JsonSuite.scala | 4 ++-- .../test/scala/org/apache/spark/sql/json/TestJsonData.scala | 2 +- 2 files changed, 3 insertions(+), 3 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 index 52e69be7bf538..2bc9aede32f2a 100644 --- 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 @@ -375,7 +375,7 @@ class JsonSuite extends QueryTest { ("true", 11L, null, 1.1, "13.1", "str1") :: ("12", null, new java.math.BigDecimal("21474836470.9"), null, null, "true") :: ("false", 21474836470L, new java.math.BigDecimal("92233720368547758070"), 100, "str1", "false") :: - (null, 21474836570L, new java.math.BigDecimal(1.2), 21474836470L, "92233720368547758070", null) :: Nil + (null, 21474836570L, new java.math.BigDecimal("1.1"), 21474836470L, "92233720368547758070", null) :: Nil ) // Number and Boolean conflict: resolve the type as number in this query. @@ -903,7 +903,7 @@ class JsonSuite extends QueryTest { checkAnswer( sql("select struct, struct.field1, struct.field2 from complexTable"), Row( - Row(true, BigDecimal("92233720368547758070")), + Row(true, new java.math.BigDecimal("92233720368547758070")), true, new java.math.BigDecimal("92233720368547758070")) :: Nil ) 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 index 94b16f0e627d1..3370b3c98b4be 100644 --- 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 @@ -40,7 +40,7 @@ object TestJsonData { "num_bool":12, "num_str":null, "str_bool":true}""" :: """{"num_num_1":21474836470, "num_num_2":92233720368547758070, "num_num_3": 100, "num_bool":false, "num_str":"str1", "str_bool":false}""" :: - """{"num_num_1":21474836570, "num_num_2":1.2, "num_num_3": 21474836470, + """{"num_num_1":21474836570, "num_num_2":1.1, "num_num_3": 21474836470, "num_bool":null, "num_str":92233720368547758070, "str_bool":null}""" :: Nil) val jsonNullStruct =