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

Side by Side Diff: components/prefs/pref_value_map_unittest.cc

Issue 1907043002: Convert //components/prefs from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixes Created 4 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "components/prefs/pref_value_map.h" 5 #include "components/prefs/pref_value_map.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "base/values.h" 8 #include "base/values.h"
8 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
9 10
10 namespace base { 11 namespace base {
11 namespace { 12 namespace {
12 13
13 TEST(PrefValueMapTest, SetValue) { 14 TEST(PrefValueMapTest, SetValue) {
14 PrefValueMap map; 15 PrefValueMap map;
15 const Value* result = NULL; 16 const Value* result = NULL;
16 EXPECT_FALSE(map.GetValue("key", &result)); 17 EXPECT_FALSE(map.GetValue("key", &result));
17 EXPECT_FALSE(result); 18 EXPECT_FALSE(result);
18 19
19 EXPECT_TRUE(map.SetValue("key", make_scoped_ptr(new StringValue("test")))); 20 EXPECT_TRUE(map.SetValue("key", base::WrapUnique(new StringValue("test"))));
20 EXPECT_FALSE(map.SetValue("key", make_scoped_ptr(new StringValue("test")))); 21 EXPECT_FALSE(map.SetValue("key", base::WrapUnique(new StringValue("test"))));
21 EXPECT_TRUE(map.SetValue("key", make_scoped_ptr(new StringValue("hi mom!")))); 22 EXPECT_TRUE(
23 map.SetValue("key", base::WrapUnique(new StringValue("hi mom!"))));
22 24
23 EXPECT_TRUE(map.GetValue("key", &result)); 25 EXPECT_TRUE(map.GetValue("key", &result));
24 EXPECT_TRUE(StringValue("hi mom!").Equals(result)); 26 EXPECT_TRUE(StringValue("hi mom!").Equals(result));
25 } 27 }
26 28
27 TEST(PrefValueMapTest, GetAndSetIntegerValue) { 29 TEST(PrefValueMapTest, GetAndSetIntegerValue) {
28 PrefValueMap map; 30 PrefValueMap map;
29 ASSERT_TRUE(map.SetValue("key", make_scoped_ptr(new FundamentalValue(5)))); 31 ASSERT_TRUE(map.SetValue("key", base::WrapUnique(new FundamentalValue(5))));
30 32
31 int int_value = 0; 33 int int_value = 0;
32 EXPECT_TRUE(map.GetInteger("key", &int_value)); 34 EXPECT_TRUE(map.GetInteger("key", &int_value));
33 EXPECT_EQ(5, int_value); 35 EXPECT_EQ(5, int_value);
34 36
35 map.SetInteger("key", -14); 37 map.SetInteger("key", -14);
36 EXPECT_TRUE(map.GetInteger("key", &int_value)); 38 EXPECT_TRUE(map.GetInteger("key", &int_value));
37 EXPECT_EQ(-14, int_value); 39 EXPECT_EQ(-14, int_value);
38 } 40 }
39 41
40 TEST(PrefValueMapTest, SetDoubleValue) { 42 TEST(PrefValueMapTest, SetDoubleValue) {
41 PrefValueMap map; 43 PrefValueMap map;
42 ASSERT_TRUE(map.SetValue("key", make_scoped_ptr(new FundamentalValue(5.5)))); 44 ASSERT_TRUE(map.SetValue("key", base::WrapUnique(new FundamentalValue(5.5))));
43 45
44 const Value* result = NULL; 46 const Value* result = NULL;
45 ASSERT_TRUE(map.GetValue("key", &result)); 47 ASSERT_TRUE(map.GetValue("key", &result));
46 double double_value = 0.; 48 double double_value = 0.;
47 EXPECT_TRUE(result->GetAsDouble(&double_value)); 49 EXPECT_TRUE(result->GetAsDouble(&double_value));
48 EXPECT_DOUBLE_EQ(5.5, double_value); 50 EXPECT_DOUBLE_EQ(5.5, double_value);
49 } 51 }
50 52
51 TEST(PrefValueMapTest, RemoveValue) { 53 TEST(PrefValueMapTest, RemoveValue) {
52 PrefValueMap map; 54 PrefValueMap map;
53 EXPECT_FALSE(map.RemoveValue("key")); 55 EXPECT_FALSE(map.RemoveValue("key"));
54 56
55 EXPECT_TRUE(map.SetValue("key", make_scoped_ptr(new StringValue("test")))); 57 EXPECT_TRUE(map.SetValue("key", base::WrapUnique(new StringValue("test"))));
56 EXPECT_TRUE(map.GetValue("key", NULL)); 58 EXPECT_TRUE(map.GetValue("key", NULL));
57 59
58 EXPECT_TRUE(map.RemoveValue("key")); 60 EXPECT_TRUE(map.RemoveValue("key"));
59 EXPECT_FALSE(map.GetValue("key", NULL)); 61 EXPECT_FALSE(map.GetValue("key", NULL));
60 62
61 EXPECT_FALSE(map.RemoveValue("key")); 63 EXPECT_FALSE(map.RemoveValue("key"));
62 } 64 }
63 65
64 TEST(PrefValueMapTest, Clear) { 66 TEST(PrefValueMapTest, Clear) {
65 PrefValueMap map; 67 PrefValueMap map;
66 EXPECT_TRUE(map.SetValue("key", make_scoped_ptr(new StringValue("test")))); 68 EXPECT_TRUE(map.SetValue("key", base::WrapUnique(new StringValue("test"))));
67 EXPECT_TRUE(map.GetValue("key", NULL)); 69 EXPECT_TRUE(map.GetValue("key", NULL));
68 70
69 map.Clear(); 71 map.Clear();
70 72
71 EXPECT_FALSE(map.GetValue("key", NULL)); 73 EXPECT_FALSE(map.GetValue("key", NULL));
72 } 74 }
73 75
74 TEST(PrefValueMapTest, GetDifferingKeys) { 76 TEST(PrefValueMapTest, GetDifferingKeys) {
75 PrefValueMap reference; 77 PrefValueMap reference;
76 EXPECT_TRUE( 78 EXPECT_TRUE(
77 reference.SetValue("b", make_scoped_ptr(new StringValue("test")))); 79 reference.SetValue("b", base::WrapUnique(new StringValue("test"))));
78 EXPECT_TRUE( 80 EXPECT_TRUE(
79 reference.SetValue("c", make_scoped_ptr(new StringValue("test")))); 81 reference.SetValue("c", base::WrapUnique(new StringValue("test"))));
80 EXPECT_TRUE( 82 EXPECT_TRUE(
81 reference.SetValue("e", make_scoped_ptr(new StringValue("test")))); 83 reference.SetValue("e", base::WrapUnique(new StringValue("test"))));
82 84
83 PrefValueMap check; 85 PrefValueMap check;
84 std::vector<std::string> differing_paths; 86 std::vector<std::string> differing_paths;
85 std::vector<std::string> expected_differing_paths; 87 std::vector<std::string> expected_differing_paths;
86 88
87 reference.GetDifferingKeys(&check, &differing_paths); 89 reference.GetDifferingKeys(&check, &differing_paths);
88 expected_differing_paths.push_back("b"); 90 expected_differing_paths.push_back("b");
89 expected_differing_paths.push_back("c"); 91 expected_differing_paths.push_back("c");
90 expected_differing_paths.push_back("e"); 92 expected_differing_paths.push_back("e");
91 EXPECT_EQ(expected_differing_paths, differing_paths); 93 EXPECT_EQ(expected_differing_paths, differing_paths);
92 94
93 EXPECT_TRUE(check.SetValue("a", make_scoped_ptr(new StringValue("test")))); 95 EXPECT_TRUE(check.SetValue("a", base::WrapUnique(new StringValue("test"))));
94 EXPECT_TRUE(check.SetValue("c", make_scoped_ptr(new StringValue("test")))); 96 EXPECT_TRUE(check.SetValue("c", base::WrapUnique(new StringValue("test"))));
95 EXPECT_TRUE(check.SetValue("d", make_scoped_ptr(new StringValue("test")))); 97 EXPECT_TRUE(check.SetValue("d", base::WrapUnique(new StringValue("test"))));
96 98
97 reference.GetDifferingKeys(&check, &differing_paths); 99 reference.GetDifferingKeys(&check, &differing_paths);
98 expected_differing_paths.clear(); 100 expected_differing_paths.clear();
99 expected_differing_paths.push_back("a"); 101 expected_differing_paths.push_back("a");
100 expected_differing_paths.push_back("b"); 102 expected_differing_paths.push_back("b");
101 expected_differing_paths.push_back("d"); 103 expected_differing_paths.push_back("d");
102 expected_differing_paths.push_back("e"); 104 expected_differing_paths.push_back("e");
103 EXPECT_EQ(expected_differing_paths, differing_paths); 105 EXPECT_EQ(expected_differing_paths, differing_paths);
104 } 106 }
105 107
106 TEST(PrefValueMapTest, SwapTwoMaps) { 108 TEST(PrefValueMapTest, SwapTwoMaps) {
107 PrefValueMap first_map; 109 PrefValueMap first_map;
108 EXPECT_TRUE( 110 EXPECT_TRUE(
109 first_map.SetValue("a", make_scoped_ptr(new StringValue("test")))); 111 first_map.SetValue("a", base::WrapUnique(new StringValue("test"))));
110 EXPECT_TRUE( 112 EXPECT_TRUE(
111 first_map.SetValue("b", make_scoped_ptr(new StringValue("test")))); 113 first_map.SetValue("b", base::WrapUnique(new StringValue("test"))));
112 EXPECT_TRUE( 114 EXPECT_TRUE(
113 first_map.SetValue("c", make_scoped_ptr(new StringValue("test")))); 115 first_map.SetValue("c", base::WrapUnique(new StringValue("test"))));
114 116
115 PrefValueMap second_map; 117 PrefValueMap second_map;
116 EXPECT_TRUE( 118 EXPECT_TRUE(
117 second_map.SetValue("d", make_scoped_ptr(new StringValue("test")))); 119 second_map.SetValue("d", base::WrapUnique(new StringValue("test"))));
118 EXPECT_TRUE( 120 EXPECT_TRUE(
119 second_map.SetValue("e", make_scoped_ptr(new StringValue("test")))); 121 second_map.SetValue("e", base::WrapUnique(new StringValue("test"))));
120 EXPECT_TRUE( 122 EXPECT_TRUE(
121 second_map.SetValue("f", make_scoped_ptr(new StringValue("test")))); 123 second_map.SetValue("f", base::WrapUnique(new StringValue("test"))));
122 124
123 first_map.Swap(&second_map); 125 first_map.Swap(&second_map);
124 126
125 EXPECT_TRUE(first_map.GetValue("d", NULL)); 127 EXPECT_TRUE(first_map.GetValue("d", NULL));
126 EXPECT_TRUE(first_map.GetValue("e", NULL)); 128 EXPECT_TRUE(first_map.GetValue("e", NULL));
127 EXPECT_TRUE(first_map.GetValue("f", NULL)); 129 EXPECT_TRUE(first_map.GetValue("f", NULL));
128 130
129 EXPECT_TRUE(second_map.GetValue("a", NULL)); 131 EXPECT_TRUE(second_map.GetValue("a", NULL));
130 EXPECT_TRUE(second_map.GetValue("b", NULL)); 132 EXPECT_TRUE(second_map.GetValue("b", NULL));
131 EXPECT_TRUE(second_map.GetValue("c", NULL)); 133 EXPECT_TRUE(second_map.GetValue("c", NULL));
132 } 134 }
133 135
134 } // namespace 136 } // namespace
135 } // namespace base 137 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698