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

Side by Side Diff: net/cert/crl_set_unittest.cc

Issue 503163002: Remove implicit conversions from scoped_refptr to T* in net/cert/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « net/cert/crl_set_storage.cc ('k') | net/cert/ct_log_verifier_unittest.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 "net/cert/crl_set.h" 5 #include "net/cert/crl_set.h"
6 #include "net/cert/crl_set_storage.h" 6 #include "net/cert/crl_set_storage.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 // These data blocks were generated using a lot of code that is still in 9 // These data blocks were generated using a lot of code that is still in
10 // development. For now, if you need to update them, you have to contact agl. 10 // development. For now, if you need to update them, you have to contact agl.
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 TEST(CRLSetTest, NoOpDeltaUpdate) { 216 TEST(CRLSetTest, NoOpDeltaUpdate) {
217 base::StringPiece s(reinterpret_cast<const char*>(kGIACRLSet), 217 base::StringPiece s(reinterpret_cast<const char*>(kGIACRLSet),
218 sizeof(kGIACRLSet)); 218 sizeof(kGIACRLSet));
219 scoped_refptr<net::CRLSet> set; 219 scoped_refptr<net::CRLSet> set;
220 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set)); 220 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set));
221 ASSERT_TRUE(set.get() != NULL); 221 ASSERT_TRUE(set.get() != NULL);
222 222
223 scoped_refptr<net::CRLSet> delta_set; 223 scoped_refptr<net::CRLSet> delta_set;
224 base::StringPiece delta(reinterpret_cast<const char*>(kNoopDeltaCRL), 224 base::StringPiece delta(reinterpret_cast<const char*>(kNoopDeltaCRL),
225 sizeof(kNoopDeltaCRL)); 225 sizeof(kNoopDeltaCRL));
226 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set)); 226 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
227 ASSERT_TRUE(delta_set.get() != NULL); 227 ASSERT_TRUE(delta_set.get() != NULL);
228 228
229 std::string out = net::CRLSetStorage::Serialize(delta_set); 229 std::string out = net::CRLSetStorage::Serialize(delta_set.get());
230 EXPECT_EQ(s.as_string(), out); 230 EXPECT_EQ(s.as_string(), out);
231 } 231 }
232 232
233 TEST(CRLSetTest, AddCRLDelta) { 233 TEST(CRLSetTest, AddCRLDelta) {
234 base::StringPiece s(reinterpret_cast<const char*>(kGIACRLSet), 234 base::StringPiece s(reinterpret_cast<const char*>(kGIACRLSet),
235 sizeof(kGIACRLSet)); 235 sizeof(kGIACRLSet));
236 scoped_refptr<net::CRLSet> set; 236 scoped_refptr<net::CRLSet> set;
237 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set)); 237 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set));
238 ASSERT_TRUE(set.get() != NULL); 238 ASSERT_TRUE(set.get() != NULL);
239 239
240 scoped_refptr<net::CRLSet> delta_set; 240 scoped_refptr<net::CRLSet> delta_set;
241 base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta), 241 base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta),
242 sizeof(kAddCRLDelta)); 242 sizeof(kAddCRLDelta));
243 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set)); 243 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
244 ASSERT_TRUE(delta_set.get() != NULL); 244 ASSERT_TRUE(delta_set.get() != NULL);
245 245
246 const net::CRLSet::CRLList& crls = delta_set->crls(); 246 const net::CRLSet::CRLList& crls = delta_set->crls();
247 ASSERT_EQ(2u, crls.size()); 247 ASSERT_EQ(2u, crls.size());
248 const std::vector<std::string>& serials = crls[1].second; 248 const std::vector<std::string>& serials = crls[1].second;
249 ASSERT_EQ(12u, serials.size()); 249 ASSERT_EQ(12u, serials.size());
250 EXPECT_EQ(std::string("\x02", 1), serials[0]); 250 EXPECT_EQ(std::string("\x02", 1), serials[0]);
251 EXPECT_EQ(std::string("\x03", 1), serials[1]); 251 EXPECT_EQ(std::string("\x03", 1), serials[1]);
252 EXPECT_EQ(std::string("\x04", 1), serials[2]); 252 EXPECT_EQ(std::string("\x04", 1), serials[2]);
253 } 253 }
254 254
255 TEST(CRLSetTest, AddRemoveCRLDelta) { 255 TEST(CRLSetTest, AddRemoveCRLDelta) {
256 base::StringPiece s(reinterpret_cast<const char*>(kGIACRLSet), 256 base::StringPiece s(reinterpret_cast<const char*>(kGIACRLSet),
257 sizeof(kGIACRLSet)); 257 sizeof(kGIACRLSet));
258 scoped_refptr<net::CRLSet> set; 258 scoped_refptr<net::CRLSet> set;
259 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set)); 259 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set));
260 ASSERT_TRUE(set.get() != NULL); 260 ASSERT_TRUE(set.get() != NULL);
261 261
262 scoped_refptr<net::CRLSet> delta_set; 262 scoped_refptr<net::CRLSet> delta_set;
263 base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta), 263 base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta),
264 sizeof(kAddCRLDelta)); 264 sizeof(kAddCRLDelta));
265 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set)); 265 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
266 ASSERT_TRUE(delta_set.get() != NULL); 266 ASSERT_TRUE(delta_set.get() != NULL);
267 267
268 scoped_refptr<net::CRLSet> delta2_set; 268 scoped_refptr<net::CRLSet> delta2_set;
269 base::StringPiece delta2(reinterpret_cast<const char*>(kRemoveCRLDelta), 269 base::StringPiece delta2(reinterpret_cast<const char*>(kRemoveCRLDelta),
270 sizeof(kRemoveCRLDelta)); 270 sizeof(kRemoveCRLDelta));
271 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(delta_set, delta2, &delta2_set)); 271 EXPECT_TRUE(
272 net::CRLSetStorage::ApplyDelta(delta_set.get(), delta2, &delta2_set));
272 ASSERT_TRUE(delta2_set.get() != NULL); 273 ASSERT_TRUE(delta2_set.get() != NULL);
273 274
274 const net::CRLSet::CRLList& crls = delta2_set->crls(); 275 const net::CRLSet::CRLList& crls = delta2_set->crls();
275 ASSERT_EQ(1u, crls.size()); 276 ASSERT_EQ(1u, crls.size());
276 const std::vector<std::string>& serials = crls[0].second; 277 const std::vector<std::string>& serials = crls[0].second;
277 ASSERT_EQ(13u, serials.size()); 278 ASSERT_EQ(13u, serials.size());
278 } 279 }
279 280
280 TEST(CRLSetTest, UpdateSerialsDelta) { 281 TEST(CRLSetTest, UpdateSerialsDelta) {
281 base::StringPiece s(reinterpret_cast<const char*>(kGIACRLSet), 282 base::StringPiece s(reinterpret_cast<const char*>(kGIACRLSet),
282 sizeof(kGIACRLSet)); 283 sizeof(kGIACRLSet));
283 scoped_refptr<net::CRLSet> set; 284 scoped_refptr<net::CRLSet> set;
284 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set)); 285 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set));
285 ASSERT_TRUE(set.get() != NULL); 286 ASSERT_TRUE(set.get() != NULL);
286 287
287 scoped_refptr<net::CRLSet> delta_set; 288 scoped_refptr<net::CRLSet> delta_set;
288 base::StringPiece delta(reinterpret_cast<const char*>(kUpdateSerialsDelta), 289 base::StringPiece delta(reinterpret_cast<const char*>(kUpdateSerialsDelta),
289 sizeof(kUpdateSerialsDelta)); 290 sizeof(kUpdateSerialsDelta));
290 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set)); 291 EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
291 ASSERT_TRUE(delta_set.get() != NULL); 292 ASSERT_TRUE(delta_set.get() != NULL);
292 293
293 const net::CRLSet::CRLList& crls = delta_set->crls(); 294 const net::CRLSet::CRLList& crls = delta_set->crls();
294 ASSERT_EQ(1u, crls.size()); 295 ASSERT_EQ(1u, crls.size());
295 const std::vector<std::string>& serials = crls[0].second; 296 const std::vector<std::string>& serials = crls[0].second;
296 EXPECT_EQ(45u, serials.size()); 297 EXPECT_EQ(45u, serials.size());
297 } 298 }
298 299
299 TEST(CRLSetTest, BlockedSPKIs) { 300 TEST(CRLSetTest, BlockedSPKIs) {
300 base::StringPiece s(reinterpret_cast<const char*>(kBlockedSPKICRLSet), 301 base::StringPiece s(reinterpret_cast<const char*>(kBlockedSPKICRLSet),
(...skipping 17 matching lines...) Expand all
318 // This CRLSet has an expiry value set to one second past midnight, 1st Jan, 319 // This CRLSet has an expiry value set to one second past midnight, 1st Jan,
319 // 1970. 320 // 1970.
320 base::StringPiece s(reinterpret_cast<const char*>(kExpiredCRLSet), 321 base::StringPiece s(reinterpret_cast<const char*>(kExpiredCRLSet),
321 sizeof(kExpiredCRLSet)); 322 sizeof(kExpiredCRLSet));
322 scoped_refptr<net::CRLSet> set; 323 scoped_refptr<net::CRLSet> set;
323 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set)); 324 EXPECT_TRUE(net::CRLSetStorage::Parse(s, &set));
324 ASSERT_TRUE(set.get() != NULL); 325 ASSERT_TRUE(set.get() != NULL);
325 326
326 EXPECT_TRUE(set->IsExpired()); 327 EXPECT_TRUE(set->IsExpired());
327 } 328 }
OLDNEW
« no previous file with comments | « net/cert/crl_set_storage.cc ('k') | net/cert/ct_log_verifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698