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

Side by Side Diff: extensions/browser/value_store/value_store_change_unittest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/json/json_reader.h" 5 #include "base/json/json_reader.h"
6 #include "base/json/json_writer.h" 6 #include "base/json/json_writer.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "extensions/browser/value_store/value_store_change.h" 9 #include "extensions/browser/value_store/value_store_change.h"
10 #include "extensions/common/value_builder.h" 10 #include "extensions/common/value_builder.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 using base::DictionaryValue; 13 using base::DictionaryValue;
14 using base::Value; 14 using base::Value;
15 using extensions::DictionaryBuilder; 15 using extensions::DictionaryBuilder;
16 using extensions::ListBuilder; 16 using extensions::ListBuilder;
17 17
18 namespace { 18 namespace {
19 19
20 TEST(ValueStoreChangeTest, NullOldValue) { 20 TEST(ValueStoreChangeTest, NullOldValue) {
21 ValueStoreChange change("key", NULL, new base::StringValue("value")); 21 ValueStoreChange change("key", nullptr, new base::StringValue("value"));
22 22
23 EXPECT_EQ("key", change.key()); 23 EXPECT_EQ("key", change.key());
24 EXPECT_EQ(NULL, change.old_value()); 24 EXPECT_EQ(nullptr, change.old_value());
25 { 25 {
26 scoped_ptr<base::Value> expected(new base::StringValue("value")); 26 scoped_ptr<base::Value> expected(new base::StringValue("value"));
27 EXPECT_TRUE(change.new_value()->Equals(expected.get())); 27 EXPECT_TRUE(change.new_value()->Equals(expected.get()));
28 } 28 }
29 } 29 }
30 30
31 TEST(ValueStoreChangeTest, NullNewValue) { 31 TEST(ValueStoreChangeTest, NullNewValue) {
32 ValueStoreChange change("key", new base::StringValue("value"), NULL); 32 ValueStoreChange change("key", new base::StringValue("value"), nullptr);
33 33
34 EXPECT_EQ("key", change.key()); 34 EXPECT_EQ("key", change.key());
35 { 35 {
36 scoped_ptr<base::Value> expected(new base::StringValue("value")); 36 scoped_ptr<base::Value> expected(new base::StringValue("value"));
37 EXPECT_TRUE(change.old_value()->Equals(expected.get())); 37 EXPECT_TRUE(change.old_value()->Equals(expected.get()));
38 } 38 }
39 EXPECT_EQ(NULL, change.new_value()); 39 EXPECT_EQ(nullptr, change.new_value());
40 } 40 }
41 41
42 TEST(ValueStoreChangeTest, NonNullValues) { 42 TEST(ValueStoreChangeTest, NonNullValues) {
43 ValueStoreChange change("key", 43 ValueStoreChange change("key",
44 new base::StringValue("old_value"), 44 new base::StringValue("old_value"),
45 new base::StringValue("new_value")); 45 new base::StringValue("new_value"));
46 46
47 EXPECT_EQ("key", change.key()); 47 EXPECT_EQ("key", change.key());
48 { 48 {
49 scoped_ptr<base::Value> expected(new base::StringValue("old_value")); 49 scoped_ptr<base::Value> expected(new base::StringValue("old_value"));
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 .Set("newValue", v2)) 85 .Set("newValue", v2))
86 .Set("key.with.dots", DictionaryBuilder() 86 .Set("key.with.dots", DictionaryBuilder()
87 .Set("oldValue", v3) 87 .Set("oldValue", v3)
88 .Set("newValue", v4)) 88 .Set("newValue", v4))
89 .Build(); 89 .Build();
90 90
91 EXPECT_TRUE(from_json->Equals(expected_from_json.get())); 91 EXPECT_TRUE(from_json->Equals(expected_from_json.get()));
92 } 92 }
93 93
94 } // namespace 94 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698