OLD | NEW |
---|---|
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/strings/nullable_string16.h" | |
5 #include "base/strings/string16.h" | 6 #include "base/strings/string16.h" |
6 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
7 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/webshare/share_target_pref_helper.h" | 9 #include "chrome/browser/webshare/share_target_pref_helper.h" |
9 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
10 #include "chrome/test/base/testing_profile.h" | 11 #include "chrome/test/base/testing_profile.h" |
11 #include "components/prefs/pref_registry_simple.h" | 12 #include "components/prefs/pref_registry_simple.h" |
12 #include "components/prefs/testing_pref_service.h" | 13 #include "components/prefs/testing_pref_service.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
14 | 15 |
(...skipping 15 matching lines...) Expand all Loading... | |
30 PrefService* pref_service() { return pref_service_.get(); } | 31 PrefService* pref_service() { return pref_service_.get(); } |
31 | 32 |
32 private: | 33 private: |
33 std::unique_ptr<TestingPrefServiceSimple> pref_service_; | 34 std::unique_ptr<TestingPrefServiceSimple> pref_service_; |
34 }; | 35 }; |
35 | 36 |
36 constexpr char kUrlTemplateKey[] = "url_template"; | 37 constexpr char kUrlTemplateKey[] = "url_template"; |
37 | 38 |
38 TEST_F(ShareTargetPrefHelperUnittest, AddMultipleShareTargets) { | 39 TEST_F(ShareTargetPrefHelperUnittest, AddMultipleShareTargets) { |
39 // Add a share target to prefs that wasn't previously stored. | 40 // Add a share target to prefs that wasn't previously stored. |
40 std::string manifest_url = "https://www.sharetarget.com/manifest.json"; | 41 GURL manifest_url("https://www.sharetarget.com/manifest.json"); |
41 base::Optional<std::string> url_template = | 42 content::Manifest::ShareTarget share_target; |
42 base::Optional<std::string>("share/?title={title}"); | 43 std::string url_template = "share/?title={title}"; |
Matt Giuca
2017/02/06 00:40:12
Just make this a base::string16 and do the convers
constantina
2017/02/07 05:16:25
If I do that, I have to convert back for the compa
| |
44 share_target.url_template = | |
45 base::NullableString16(base::UTF8ToUTF16(url_template), false); | |
46 content::Manifest manifest; | |
47 manifest.share_target = | |
48 base::Optional<content::Manifest::ShareTarget>(share_target); | |
Matt Giuca
2017/02/06 00:40:12
There is no name set, or tested, in any of these m
constantina
2017/02/07 05:16:25
Done.
| |
43 | 49 |
44 UpdateShareTargetInPrefs(manifest_url, url_template, pref_service()); | 50 UpdateShareTargetInPrefs(manifest_url, manifest, pref_service()); |
45 | 51 |
46 const base::DictionaryValue* share_target_dict = | 52 const base::DictionaryValue* share_target_dict = |
47 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 53 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
48 EXPECT_EQ(1UL, share_target_dict->size()); | 54 EXPECT_EQ(1UL, share_target_dict->size()); |
49 const base::DictionaryValue* share_target_info_dict = nullptr; | 55 const base::DictionaryValue* share_target_info_dict = nullptr; |
50 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( | 56 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( |
51 manifest_url, &share_target_info_dict)); | 57 manifest_url.spec(), &share_target_info_dict)); |
52 EXPECT_EQ(1UL, share_target_info_dict->size()); | 58 EXPECT_EQ(1UL, share_target_info_dict->size()); |
53 std::string url_template_in_dict; | 59 std::string url_template_in_dict; |
54 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, | 60 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, |
55 &url_template_in_dict)); | 61 &url_template_in_dict)); |
56 EXPECT_EQ(url_template_in_dict, url_template); | 62 EXPECT_EQ(url_template, url_template_in_dict); |
Matt Giuca
2017/02/06 00:40:11
Good catch.
constantina
2017/02/07 05:16:25
Ty
| |
57 | 63 |
58 // Add second share target to prefs that wasn't previously stored. | 64 // Add second share target to prefs that wasn't previously stored. |
59 manifest_url = "https://www.sharetarget2.com/manifest.json"; | 65 manifest_url = GURL("https://www.sharetarget2.com/manifest.json"); |
60 url_template = base::Optional<std::string>("share/?title={title}"); | |
61 | 66 |
62 UpdateShareTargetInPrefs(manifest_url, url_template, pref_service()); | 67 UpdateShareTargetInPrefs(manifest_url, manifest, pref_service()); |
63 | 68 |
64 share_target_dict = | 69 share_target_dict = |
65 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 70 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
66 EXPECT_EQ(2UL, share_target_dict->size()); | 71 EXPECT_EQ(2UL, share_target_dict->size()); |
67 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( | 72 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( |
68 manifest_url, &share_target_info_dict)); | 73 manifest_url.spec(), &share_target_info_dict)); |
69 EXPECT_EQ(1UL, share_target_info_dict->size()); | 74 EXPECT_EQ(1UL, share_target_info_dict->size()); |
70 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, | 75 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, |
71 &url_template_in_dict)); | 76 &url_template_in_dict)); |
72 EXPECT_EQ(url_template_in_dict, url_template); | 77 EXPECT_EQ(url_template, url_template_in_dict); |
73 } | 78 } |
74 | 79 |
75 TEST_F(ShareTargetPrefHelperUnittest, AddShareTargetTwice) { | 80 TEST_F(ShareTargetPrefHelperUnittest, AddShareTargetTwice) { |
76 const char kManifestUrl[] = "https://www.sharetarget.com/manifest.json"; | 81 const char kManifestUrl[] = "https://www.sharetarget.com/manifest.json"; |
77 const base::Optional<std::string> kUrlTemplate = | 82 const char kUrlTemplate[] = "share/?title={title}"; |
78 base::Optional<std::string>("share/?title={title}"); | |
79 | 83 |
80 // Add a share target to prefs that wasn't previously stored. | 84 // Add a share target to prefs that wasn't previously stored. |
81 UpdateShareTargetInPrefs(kManifestUrl, kUrlTemplate, pref_service()); | 85 GURL manifest_url(kManifestUrl); |
86 content::Manifest::ShareTarget share_target; | |
87 share_target.url_template = | |
88 base::NullableString16(base::UTF8ToUTF16(kUrlTemplate), false); | |
89 content::Manifest manifest; | |
90 manifest.share_target = | |
91 base::Optional<content::Manifest::ShareTarget>(share_target); | |
92 | |
93 UpdateShareTargetInPrefs(manifest_url, manifest, pref_service()); | |
82 | 94 |
83 const base::DictionaryValue* share_target_dict = | 95 const base::DictionaryValue* share_target_dict = |
84 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 96 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
85 EXPECT_EQ(1UL, share_target_dict->size()); | 97 EXPECT_EQ(1UL, share_target_dict->size()); |
86 const base::DictionaryValue* share_target_info_dict = nullptr; | 98 const base::DictionaryValue* share_target_info_dict = nullptr; |
87 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( | 99 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( |
88 kManifestUrl, &share_target_info_dict)); | 100 kManifestUrl, &share_target_info_dict)); |
89 EXPECT_EQ(1UL, share_target_info_dict->size()); | 101 EXPECT_EQ(1UL, share_target_info_dict->size()); |
90 std::string url_template_in_dict; | 102 std::string url_template_in_dict; |
91 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, | 103 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, |
92 &url_template_in_dict)); | 104 &url_template_in_dict)); |
93 EXPECT_EQ(url_template_in_dict, kUrlTemplate); | 105 EXPECT_EQ(kUrlTemplate, url_template_in_dict); |
94 | 106 |
95 // Add same share target to prefs that was previously stored; shouldn't | 107 // Add same share target to prefs that was previously stored; shouldn't |
96 // duplicate it. | 108 // duplicate it. |
97 UpdateShareTargetInPrefs(kManifestUrl, kUrlTemplate, pref_service()); | 109 UpdateShareTargetInPrefs(manifest_url, manifest, pref_service()); |
98 | 110 |
99 share_target_dict = | 111 share_target_dict = |
100 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 112 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
101 EXPECT_EQ(1UL, share_target_dict->size()); | 113 EXPECT_EQ(1UL, share_target_dict->size()); |
102 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( | 114 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( |
103 kManifestUrl, &share_target_info_dict)); | 115 kManifestUrl, &share_target_info_dict)); |
104 EXPECT_EQ(1UL, share_target_info_dict->size()); | 116 EXPECT_EQ(1UL, share_target_info_dict->size()); |
105 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, | 117 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, |
106 &url_template_in_dict)); | 118 &url_template_in_dict)); |
107 EXPECT_EQ(url_template_in_dict, kUrlTemplate); | 119 EXPECT_EQ(kUrlTemplate, url_template_in_dict); |
108 } | 120 } |
109 | 121 |
110 TEST_F(ShareTargetPrefHelperUnittest, UpdateShareTarget) { | 122 TEST_F(ShareTargetPrefHelperUnittest, UpdateShareTarget) { |
111 // Add a share target to prefs that wasn't previously stored. | 123 // Add a share target to prefs that wasn't previously stored. |
112 std::string manifest_url = "https://www.sharetarget.com/manifest.json"; | 124 GURL manifest_url("https://www.sharetarget.com/manifest.json"); |
113 base::Optional<std::string> url_template = | 125 content::Manifest::ShareTarget share_target; |
114 base::Optional<std::string>("share/?title={title}"); | 126 std::string url_template = "share/?title={title}"; |
127 share_target.url_template = | |
128 base::NullableString16(base::UTF8ToUTF16(url_template), false); | |
129 content::Manifest manifest; | |
130 manifest.share_target = | |
131 base::Optional<content::Manifest::ShareTarget>(share_target); | |
115 | 132 |
116 UpdateShareTargetInPrefs(manifest_url, url_template, pref_service()); | 133 UpdateShareTargetInPrefs(manifest_url, manifest, pref_service()); |
117 | 134 |
118 const base::DictionaryValue* share_target_dict = | 135 const base::DictionaryValue* share_target_dict = |
119 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 136 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
120 EXPECT_EQ(1UL, share_target_dict->size()); | 137 EXPECT_EQ(1UL, share_target_dict->size()); |
121 const base::DictionaryValue* share_target_info_dict = nullptr; | 138 const base::DictionaryValue* share_target_info_dict = nullptr; |
122 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( | 139 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( |
123 manifest_url, &share_target_info_dict)); | 140 manifest_url.spec(), &share_target_info_dict)); |
124 EXPECT_EQ(1UL, share_target_info_dict->size()); | 141 EXPECT_EQ(1UL, share_target_info_dict->size()); |
125 std::string url_template_in_dict; | 142 std::string url_template_in_dict; |
126 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, | 143 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, |
127 &url_template_in_dict)); | 144 &url_template_in_dict)); |
128 EXPECT_EQ(url_template_in_dict, url_template); | 145 EXPECT_EQ(url_template, url_template_in_dict); |
129 | 146 |
130 // Add same share target to prefs that was previously stored, with new | 147 // Add same share target to prefs that was previously stored, with new |
131 // url_template_in_dict; should update the value. | 148 // url_template_in_dict; should update the value. |
132 manifest_url = "https://www.sharetarget.com/manifest.json"; | 149 url_template = "share/?title={title}&text={text}"; |
133 url_template = | 150 manifest.share_target.value().url_template = |
134 base::Optional<std::string>("share/?title={title}&text={text}"); | 151 base::NullableString16(base::UTF8ToUTF16(url_template), false); |
135 | 152 |
136 UpdateShareTargetInPrefs(manifest_url, url_template, pref_service()); | 153 UpdateShareTargetInPrefs(manifest_url, manifest, pref_service()); |
137 | 154 |
138 share_target_dict = | 155 share_target_dict = |
139 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 156 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
140 EXPECT_EQ(1UL, share_target_dict->size()); | 157 EXPECT_EQ(1UL, share_target_dict->size()); |
141 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( | 158 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( |
142 manifest_url, &share_target_info_dict)); | 159 manifest_url.spec(), &share_target_info_dict)); |
143 EXPECT_EQ(1UL, share_target_info_dict->size()); | 160 EXPECT_EQ(1UL, share_target_info_dict->size()); |
144 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, | 161 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, |
145 &url_template_in_dict)); | 162 &url_template_in_dict)); |
146 EXPECT_EQ(url_template_in_dict, url_template); | 163 EXPECT_EQ(url_template, url_template_in_dict); |
147 } | 164 } |
148 | 165 |
149 TEST_F(ShareTargetPrefHelperUnittest, DontAddNonShareTarget) { | 166 TEST_F(ShareTargetPrefHelperUnittest, DontAddNonShareTarget) { |
150 const char kManifestUrl[] = "https://www.dudsharetarget.com/manifest.json"; | 167 const char kManifestUrl[] = "https://www.dudsharetarget.com/manifest.json"; |
151 const base::Optional<std::string> kUrlTemplate; | 168 const base::Optional<std::string> kUrlTemplate; |
152 | 169 |
153 // Don't add a site that has a null template. | 170 // Don't add a site that has a null template. |
154 UpdateShareTargetInPrefs(kManifestUrl, kUrlTemplate, pref_service()); | 171 UpdateShareTargetInPrefs(GURL(kManifestUrl), content::Manifest(), |
172 pref_service()); | |
155 | 173 |
156 const base::DictionaryValue* share_target_dict = | 174 const base::DictionaryValue* share_target_dict = |
157 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 175 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
158 EXPECT_EQ(0UL, share_target_dict->size()); | 176 EXPECT_EQ(0UL, share_target_dict->size()); |
159 const base::DictionaryValue* share_target_info_dict = nullptr; | 177 const base::DictionaryValue* share_target_info_dict = nullptr; |
160 ASSERT_FALSE(share_target_dict->GetDictionaryWithoutPathExpansion( | 178 ASSERT_FALSE(share_target_dict->GetDictionaryWithoutPathExpansion( |
161 kManifestUrl, &share_target_info_dict)); | 179 kManifestUrl, &share_target_info_dict)); |
162 } | 180 } |
163 | 181 |
164 TEST_F(ShareTargetPrefHelperUnittest, RemoveShareTarget) { | 182 TEST_F(ShareTargetPrefHelperUnittest, RemoveShareTarget) { |
165 // Add a share target to prefs that wasn't previously stored. | 183 // Add a share target to prefs that wasn't previously stored. |
166 std::string manifest_url = "https://www.sharetarget.com/manifest.json"; | 184 GURL manifest_url("https://www.sharetarget.com/manifest.json"); |
167 base::Optional<std::string> url_template = | 185 content::Manifest::ShareTarget share_target; |
168 base::Optional<std::string>("share/?title={title}"); | 186 std::string url_template = "share/?title={title}"; |
187 share_target.url_template = | |
188 base::NullableString16(base::UTF8ToUTF16(url_template), false); | |
189 content::Manifest manifest; | |
190 manifest.share_target = | |
191 base::Optional<content::Manifest::ShareTarget>(share_target); | |
169 | 192 |
170 UpdateShareTargetInPrefs(manifest_url, url_template, pref_service()); | 193 UpdateShareTargetInPrefs(manifest_url, manifest, pref_service()); |
171 | 194 |
172 const base::DictionaryValue* share_target_dict = | 195 const base::DictionaryValue* share_target_dict = |
173 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 196 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
174 EXPECT_EQ(1UL, share_target_dict->size()); | 197 EXPECT_EQ(1UL, share_target_dict->size()); |
175 const base::DictionaryValue* share_target_info_dict = nullptr; | 198 const base::DictionaryValue* share_target_info_dict = nullptr; |
176 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( | 199 ASSERT_TRUE(share_target_dict->GetDictionaryWithoutPathExpansion( |
177 manifest_url, &share_target_info_dict)); | 200 manifest_url.spec(), &share_target_info_dict)); |
178 EXPECT_EQ(1UL, share_target_info_dict->size()); | 201 EXPECT_EQ(1UL, share_target_info_dict->size()); |
179 std::string url_template_in_dict; | 202 std::string url_template_in_dict; |
180 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, | 203 EXPECT_TRUE(share_target_info_dict->GetString(kUrlTemplateKey, |
181 &url_template_in_dict)); | 204 &url_template_in_dict)); |
182 EXPECT_EQ(url_template_in_dict, url_template); | 205 EXPECT_EQ(url_template, url_template_in_dict); |
183 | 206 |
184 // Share target already added now has null template. Remove from prefs. | 207 // Share target already added now has null template. Remove from prefs. |
185 manifest_url = "https://www.sharetarget.com/manifest.json"; | 208 manifest_url = GURL("https://www.sharetarget.com/manifest.json"); |
186 url_template = base::nullopt; | |
187 | 209 |
188 UpdateShareTargetInPrefs(manifest_url, url_template, pref_service()); | 210 UpdateShareTargetInPrefs(manifest_url, content::Manifest(), pref_service()); |
189 | 211 |
190 share_target_dict = | 212 share_target_dict = |
191 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); | 213 pref_service()->GetDictionary(prefs::kWebShareVisitedTargets); |
192 EXPECT_EQ(0UL, share_target_dict->size()); | 214 EXPECT_EQ(0UL, share_target_dict->size()); |
193 } | 215 } |
194 | 216 |
195 } // namespace | 217 } // namespace |
OLD | NEW |