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

Unified Diff: net/test/embedded_test_server/embedded_test_server_unittest.cc

Issue 2758803003: Make X509Certificate creation fail if X509Certificate::Initialize fails. (Closed)
Patch Set: test updatess 2 Created 3 years, 9 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
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/embedded_test_server/embedded_test_server_unittest.cc
diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc
index 8542edac60ca081c4a9b2ac398aef550ca114101..0794a78352c117af17f89754130687f0cee4e22c 100644
--- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
+++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
@@ -479,7 +479,7 @@ const CertificateValuesEntry kCertificateValuesEntry[] = {
"Test Root CA"},
{EmbeddedTestServer::CERT_EXPIRED, true, "127.0.0.1", "Test Root CA"},
{EmbeddedTestServer::CERT_CHAIN_WRONG_ROOT, false, "127.0.0.1", "B CA"},
-#if !defined(OS_WIN)
+#if !defined(OS_WIN) && !defined(OS_ANDROID)
{EmbeddedTestServer::CERT_BAD_VALIDITY, true, "Leaf Certificate",
"Test Root CA"},
#endif
@@ -490,9 +490,10 @@ TEST_P(EmbeddedTestServerTest, GetCertificate) {
return;
for (const auto& certEntry : kCertificateValuesEntry) {
+ SCOPED_TRACE(certEntry.server_cert);
server_->SetSSLConfig(certEntry.server_cert);
scoped_refptr<X509Certificate> cert = server_->GetCertificate();
- DCHECK(cert.get());
+ ASSERT_TRUE(cert);
EXPECT_EQ(cert->HasExpired(), certEntry.is_expired);
EXPECT_EQ(cert->subject().common_name, certEntry.common_name);
EXPECT_EQ(cert->issuer().common_name, certEntry.root);
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698