Add TYPE_INTEGER64 type to base::Value.

base/json/json_reader_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "base/basictypes.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 TEST(JSONReaderTest, Reading) {
   // some whitespace checking
   scoped_ptr<Value> root;
   root.reset(JSONReader().JsonToValue("   null   ", false, false));
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_NULL));
 
@@ skipping 24 matching lines @@
   ASSERT_TRUE(root->GetAsString(&value));
   ASSERT_EQ("sample string", value);
 
   // Test number formats
   root.reset(JSONReader().JsonToValue("43", false, false));
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_INTEGER));
   int int_val = 0;
   ASSERT_TRUE(root->GetAsInteger(&int_val));
   ASSERT_EQ(43, int_val);
+  root.reset(JSONReader().JsonToValue("2147483648", false, false));
+  ASSERT_TRUE(root.get());
+  ASSERT_TRUE(root->IsType(Value::TYPE_INTEGER64));
+  int64 int64_val = 0;
+  ASSERT_TRUE(root->GetAsInteger64(&int64_val));
+  ASSERT_EQ(2147483648, int64_val);
 
   // According to RFC4627, oct, hex, and leading zeros are invalid JSON.
   root.reset(JSONReader().JsonToValue("043", false, false));
   ASSERT_FALSE(root.get());
   root.reset(JSONReader().JsonToValue("0x43", false, false));
   ASSERT_FALSE(root.get());
   root.reset(JSONReader().JsonToValue("00", false, false));
   ASSERT_FALSE(root.get());
 
   // Test 0 (which needs to be special cased because of the leading zero
   // clause).
   root.reset(JSONReader().JsonToValue("0", false, false));
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_INTEGER));
   int_val = 1;
   ASSERT_TRUE(root->GetAsInteger(&int_val));
   ASSERT_EQ(0, int_val);
 
-  // Numbers that overflow ints should succeed, being internally promoted to
+  // Numbers that overflow int64s should succeed, being internally promoted to
   // storage as doubles
-  root.reset(JSONReader().JsonToValue("2147483648", false, false));
+  root.reset(JSONReader().JsonToValue("9223372036854775808", false, false));
   ASSERT_TRUE(root.get());
   double double_val;
   ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
   double_val = 0.0;
   ASSERT_TRUE(root->GetAsDouble(&double_val));
-  ASSERT_DOUBLE_EQ(2147483648.0, double_val);
-  root.reset(JSONReader().JsonToValue("-2147483649", false, false));
+  ASSERT_DOUBLE_EQ(9223372036854775808.0, double_val);
+  root.reset(JSONReader().JsonToValue("-9223372036854775809", false, false));
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
   double_val = 0.0;
   ASSERT_TRUE(root->GetAsDouble(&double_val));
-  ASSERT_DOUBLE_EQ(-2147483649.0, double_val);
+  ASSERT_DOUBLE_EQ(-9223372036854775809.0, double_val);
 
   // Parse a double
   root.reset(JSONReader().JsonToValue("43.1", false, false));
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
   double_val = 0.0;
   ASSERT_TRUE(root->GetAsDouble(&double_val));
   ASSERT_DOUBLE_EQ(43.1, double_val);
 
   root.reset(JSONReader().JsonToValue("4.3e-1", false, false));
@@ skipping 458 matching lines @@
 
   root.reset(JSONReader::ReadAndReturnError("[\"xxx\\q\"]", false,
                                             &error_code, &error_message));
   EXPECT_FALSE(root.get());
   EXPECT_EQ(JSONReader::FormatErrorMessage(1, 7, JSONReader::kInvalidEscape),
             error_message);
   EXPECT_EQ(JSONReader::JSON_INVALID_ESCAPE, error_code);
 }
 
 }  // namespace base