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

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

Issue 614103004: replace 'virtual ... OVERRIDE' with '... override' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: process base/ Created 6 years, 2 months 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
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 <string> 5 #include <string>
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 root.reset(JSONReader::Read("/* /* inner */ outer */ [ 1 ]")); 365 root.reset(JSONReader::Read("/* /* inner */ outer */ [ 1 ]"));
366 ASSERT_FALSE(root.get()); 366 ASSERT_FALSE(root.get());
367 367
368 // Not a open comment token. 368 // Not a open comment token.
369 root.reset(JSONReader::Read("/ * * / [1]")); 369 root.reset(JSONReader::Read("/ * * / [1]"));
370 ASSERT_FALSE(root.get()); 370 ASSERT_FALSE(root.get());
371 } 371 }
372 372
373 class JSONFileValueSerializerTest : public testing::Test { 373 class JSONFileValueSerializerTest : public testing::Test {
374 protected: 374 protected:
375 virtual void SetUp() OVERRIDE { 375 void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
376 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
377 }
378 376
379 base::ScopedTempDir temp_dir_; 377 base::ScopedTempDir temp_dir_;
380 }; 378 };
381 379
382 TEST_F(JSONFileValueSerializerTest, Roundtrip) { 380 TEST_F(JSONFileValueSerializerTest, Roundtrip) {
383 base::FilePath original_file_path; 381 base::FilePath original_file_path;
384 ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &original_file_path)); 382 ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &original_file_path));
385 original_file_path = 383 original_file_path =
386 original_file_path.Append(FILE_PATH_LITERAL("serializer_test.json")); 384 original_file_path.Append(FILE_PATH_LITERAL("serializer_test.json"));
387 385
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 ASSERT_TRUE(PathExists(source_file_path)); 460 ASSERT_TRUE(PathExists(source_file_path));
463 JSONFileValueSerializer serializer(source_file_path); 461 JSONFileValueSerializer serializer(source_file_path);
464 scoped_ptr<Value> root; 462 scoped_ptr<Value> root;
465 root.reset(serializer.Deserialize(NULL, NULL)); 463 root.reset(serializer.Deserialize(NULL, NULL));
466 ASSERT_TRUE(root.get()); 464 ASSERT_TRUE(root.get());
467 } 465 }
468 466
469 } // namespace 467 } // namespace
470 468
471 } // namespace base 469 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698