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

Side by Side Diff: net/cert/internal/trust_store_collection_unittest.cc

Issue 2346663002: Generalize rebase-errors.py so it works for other files. (Closed)
Patch Set: moar comment wording Created 4 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/internal/test_helpers.cc ('k') | net/cert/internal/trust_store_nss_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/internal/trust_store_collection.h" 5 #include "net/cert/internal/trust_store_collection.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "net/cert/internal/test_helpers.h" 8 #include "net/cert/internal/test_helpers.h"
9 #include "net/cert/internal/trust_store_test_helpers.h" 9 #include "net/cert/internal/trust_store_test_helpers.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 21 matching lines...) Expand all
32 }; 32 };
33 33
34 class TrustStoreCollectionTest : public testing::Test { 34 class TrustStoreCollectionTest : public testing::Test {
35 public: 35 public:
36 void SetUp() override { 36 void SetUp() override {
37 ParsedCertificateList chain; 37 ParsedCertificateList chain;
38 bool unused_verify_result; 38 bool unused_verify_result;
39 der::GeneralizedTime unused_time; 39 der::GeneralizedTime unused_time;
40 std::string unused_errors; 40 std::string unused_errors;
41 41
42 ReadVerifyCertChainTestFromFile("key-rollover-oldchain.pem", &chain, 42 ReadVerifyCertChainTestFromFile(
43 &oldroot_, &unused_time, 43 "net/data/verify_certificate_chain_unittest/key-rollover-oldchain.pem",
44 &unused_verify_result, &unused_errors); 44 &chain, &oldroot_, &unused_time, &unused_verify_result, &unused_errors);
45 ASSERT_EQ(2U, chain.size()); 45 ASSERT_EQ(2U, chain.size());
46 target_ = chain[0]; 46 target_ = chain[0];
47 oldintermediate_ = chain[1]; 47 oldintermediate_ = chain[1];
48 ASSERT_TRUE(target_); 48 ASSERT_TRUE(target_);
49 ASSERT_TRUE(oldintermediate_); 49 ASSERT_TRUE(oldintermediate_);
50 ASSERT_TRUE(oldroot_); 50 ASSERT_TRUE(oldroot_);
51 51
52 scoped_refptr<TrustAnchor> unused_root; 52 scoped_refptr<TrustAnchor> unused_root;
53 ReadVerifyCertChainTestFromFile("key-rollover-longrolloverchain.pem", 53 ReadVerifyCertChainTestFromFile(
54 &chain, &unused_root, &unused_time, 54 "net/data/verify_certificate_chain_unittest/"
55 &unused_verify_result, &unused_errors); 55 "key-rollover-longrolloverchain.pem",
56 &chain, &unused_root, &unused_time, &unused_verify_result,
57 &unused_errors);
56 ASSERT_EQ(4U, chain.size()); 58 ASSERT_EQ(4U, chain.size());
57 newintermediate_ = chain[1]; 59 newintermediate_ = chain[1];
58 newroot_ = TrustAnchor::CreateFromCertificateNoConstraints(chain[2]); 60 newroot_ = TrustAnchor::CreateFromCertificateNoConstraints(chain[2]);
59 newrootrollover_ = 61 newrootrollover_ =
60 TrustAnchor::CreateFromCertificateNoConstraints(chain[3]); 62 TrustAnchor::CreateFromCertificateNoConstraints(chain[3]);
61 ASSERT_TRUE(newintermediate_); 63 ASSERT_TRUE(newintermediate_);
62 ASSERT_TRUE(newroot_); 64 ASSERT_TRUE(newroot_);
63 ASSERT_TRUE(newrootrollover_); 65 ASSERT_TRUE(newrootrollover_);
64 } 66 }
65 67
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 EXPECT_EQ(oldroot_, sync_matches[1]); 222 EXPECT_EQ(oldroot_, sync_matches[1]);
221 223
222 anchor_results.Run(); 224 anchor_results.Run();
223 ASSERT_EQ(1U, anchor_results.matches().size()); 225 ASSERT_EQ(1U, anchor_results.matches().size());
224 EXPECT_EQ(newroot_, anchor_results.matches()[0]); 226 EXPECT_EQ(newroot_, anchor_results.matches()[0]);
225 } 227 }
226 228
227 } // namespace 229 } // namespace
228 230
229 } // namespace net 231 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/internal/test_helpers.cc ('k') | net/cert/internal/trust_store_nss_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698