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

Unified Diff: net/cert/internal/trust_store_nss_unittest.cc

Issue 2801813004: Refactor VerifyCertificateChain test data to include a key purpose (Closed)
Patch Set: Address mattm's comment Created 3 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 side-by-side diff with in-line comments
Download patch
Index: net/cert/internal/trust_store_nss_unittest.cc
diff --git a/net/cert/internal/trust_store_nss_unittest.cc b/net/cert/internal/trust_store_nss_unittest.cc
index f9d1f272d746bc0f3e5ea19e2efcc9bcf26ce7fc..e83ba67286501f8b350e7685dac566ea5dbbea15 100644
--- a/net/cert/internal/trust_store_nss_unittest.cc
+++ b/net/cert/internal/trust_store_nss_unittest.cc
@@ -24,14 +24,14 @@ class TrustStoreNSSTest : public testing::Test {
void SetUp() override {
ASSERT_TRUE(test_nssdb_.is_open());
+ VerifyCertChainTest test;
ParsedCertificateList chain;
- bool unused_verify_result;
- der::GeneralizedTime unused_time;
- std::string unused_errors;
-
ReadVerifyCertChainTestFromFile(
"net/data/verify_certificate_chain_unittest/key-rollover-oldchain.pem",
- &chain, &oldroot_, &unused_time, &unused_verify_result, &unused_errors);
+ &test);
+ chain = test.chain;
+ oldroot_ = test.trust_anchor;
+
ASSERT_EQ(2U, chain.size());
target_ = chain[0];
oldintermediate_ = chain[1];
@@ -39,12 +39,12 @@ class TrustStoreNSSTest : public testing::Test {
ASSERT_TRUE(oldintermediate_);
ASSERT_TRUE(oldroot_);
- scoped_refptr<TrustAnchor> unused_root;
ReadVerifyCertChainTestFromFile(
"net/data/verify_certificate_chain_unittest/"
"key-rollover-longrolloverchain.pem",
- &chain, &unused_root, &unused_time, &unused_verify_result,
- &unused_errors);
+ &test);
+ chain = test.chain;
+
ASSERT_EQ(4U, chain.size());
newintermediate_ = chain[1];
newroot_ = TrustAnchor::CreateFromCertificateNoConstraints(chain[2]);
« no previous file with comments | « net/cert/internal/trust_store_collection_unittest.cc ('k') | net/cert/internal/verify_certificate_chain_typed_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698