Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Side by Side Diff: base/json/json_value_serializer_unittest.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/json/json_reader_unittest.cc ('k') | base/json/json_writer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 7
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/json/json_file_value_serializer.h" 10 #include "base/json/json_file_value_serializer.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 static const char kOriginalSerialization[] = 217 static const char kOriginalSerialization[] =
218 "{\"bool\":true,\"double\":3.14,\"int\":42,\"list\":[1,2],\"null\":null}"; 218 "{\"bool\":true,\"double\":3.14,\"int\":42,\"list\":[1,2],\"null\":null}";
219 JSONStringValueDeserializer deserializer(kOriginalSerialization); 219 JSONStringValueDeserializer deserializer(kOriginalSerialization);
220 std::unique_ptr<DictionaryValue> root_dict = 220 std::unique_ptr<DictionaryValue> root_dict =
221 DictionaryValue::From(deserializer.Deserialize(nullptr, nullptr)); 221 DictionaryValue::From(deserializer.Deserialize(nullptr, nullptr));
222 ASSERT_TRUE(root_dict); 222 ASSERT_TRUE(root_dict);
223 223
224 Value* null_value = nullptr; 224 Value* null_value = nullptr;
225 ASSERT_TRUE(root_dict->Get("null", &null_value)); 225 ASSERT_TRUE(root_dict->Get("null", &null_value));
226 ASSERT_TRUE(null_value); 226 ASSERT_TRUE(null_value);
227 ASSERT_TRUE(null_value->IsType(Value::TYPE_NULL)); 227 ASSERT_TRUE(null_value->IsType(Value::Type::NONE));
228 228
229 bool bool_value = false; 229 bool bool_value = false;
230 ASSERT_TRUE(root_dict->GetBoolean("bool", &bool_value)); 230 ASSERT_TRUE(root_dict->GetBoolean("bool", &bool_value));
231 ASSERT_TRUE(bool_value); 231 ASSERT_TRUE(bool_value);
232 232
233 int int_value = 0; 233 int int_value = 0;
234 ASSERT_TRUE(root_dict->GetInteger("int", &int_value)); 234 ASSERT_TRUE(root_dict->GetInteger("int", &int_value));
235 ASSERT_EQ(42, int_value); 235 ASSERT_EQ(42, int_value);
236 236
237 double double_value = 0.0; 237 double double_value = 0.0;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 ASSERT_TRUE(PathExists(original_file_path)); 410 ASSERT_TRUE(PathExists(original_file_path));
411 411
412 JSONFileValueDeserializer deserializer(original_file_path); 412 JSONFileValueDeserializer deserializer(original_file_path);
413 std::unique_ptr<DictionaryValue> root_dict = 413 std::unique_ptr<DictionaryValue> root_dict =
414 DictionaryValue::From(deserializer.Deserialize(nullptr, nullptr)); 414 DictionaryValue::From(deserializer.Deserialize(nullptr, nullptr));
415 ASSERT_TRUE(root_dict); 415 ASSERT_TRUE(root_dict);
416 416
417 Value* null_value = nullptr; 417 Value* null_value = nullptr;
418 ASSERT_TRUE(root_dict->Get("null", &null_value)); 418 ASSERT_TRUE(root_dict->Get("null", &null_value));
419 ASSERT_TRUE(null_value); 419 ASSERT_TRUE(null_value);
420 ASSERT_TRUE(null_value->IsType(Value::TYPE_NULL)); 420 ASSERT_TRUE(null_value->IsType(Value::Type::NONE));
421 421
422 bool bool_value = false; 422 bool bool_value = false;
423 ASSERT_TRUE(root_dict->GetBoolean("bool", &bool_value)); 423 ASSERT_TRUE(root_dict->GetBoolean("bool", &bool_value));
424 ASSERT_TRUE(bool_value); 424 ASSERT_TRUE(bool_value);
425 425
426 int int_value = 0; 426 int int_value = 0;
427 ASSERT_TRUE(root_dict->GetInteger("int", &int_value)); 427 ASSERT_TRUE(root_dict->GetInteger("int", &int_value));
428 ASSERT_EQ(42, int_value); 428 ASSERT_EQ(42, int_value);
429 429
430 std::string string_value; 430 std::string string_value;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 source_file_path.AppendASCII("serializer_test_nowhitespace.json"); 478 source_file_path.AppendASCII("serializer_test_nowhitespace.json");
479 ASSERT_TRUE(PathExists(source_file_path)); 479 ASSERT_TRUE(PathExists(source_file_path));
480 JSONFileValueDeserializer deserializer(source_file_path); 480 JSONFileValueDeserializer deserializer(source_file_path);
481 std::unique_ptr<Value> root = deserializer.Deserialize(nullptr, nullptr); 481 std::unique_ptr<Value> root = deserializer.Deserialize(nullptr, nullptr);
482 ASSERT_TRUE(root); 482 ASSERT_TRUE(root);
483 } 483 }
484 484
485 } // namespace 485 } // namespace
486 486
487 } // namespace base 487 } // namespace base
OLDNEW
« no previous file with comments | « base/json/json_reader_unittest.cc ('k') | base/json/json_writer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698