Index: ios/web/net/crw_cert_verification_controller_unittest.mm |
diff --git a/ios/web/net/crw_cert_verification_controller_unittest.mm b/ios/web/net/crw_cert_verification_controller_unittest.mm |
index ad3a7f3eb9c6311e11650e2e855eccbf099e54bb..fde2de001131a2cf74d1b04e0c1fa7034a54d30f 100644 |
--- a/ios/web/net/crw_cert_verification_controller_unittest.mm |
+++ b/ios/web/net/crw_cert_verification_controller_unittest.mm |
@@ -74,7 +74,7 @@ class CRWCertVerificationControllerTest : public web::WebTest { |
}; |
// Tests cert policy with a valid cert. |
-TEST_F(CRWCertVerificationControllerTest, ValidCert) { |
+TEST_F(CRWCertVerificationControllerTest, PolicyForValidCert) { |
net::CertVerifyResult verify_result; |
verify_result.cert_status = net::CERT_STATUS_NO_REVOCATION_MECHANISM; |
verify_result.verified_cert = cert_; |
@@ -88,7 +88,7 @@ TEST_F(CRWCertVerificationControllerTest, ValidCert) { |
} |
// Tests cert policy with an invalid cert. |
-TEST_F(CRWCertVerificationControllerTest, InvalidCert) { |
+TEST_F(CRWCertVerificationControllerTest, PolicyForInvalidCert) { |
web::CertAcceptPolicy policy = CERT_ACCEPT_POLICY_NON_RECOVERABLE_ERROR; |
net::CertStatus status; |
DecidePolicy(cert_, kHostName, &policy, &status); |
@@ -96,7 +96,7 @@ TEST_F(CRWCertVerificationControllerTest, InvalidCert) { |
} |
// Tests cert policy with null cert. |
-TEST_F(CRWCertVerificationControllerTest, NullCert) { |
+TEST_F(CRWCertVerificationControllerTest, PolicyForNullCert) { |
web::CertAcceptPolicy policy = CERT_ACCEPT_POLICY_NON_RECOVERABLE_ERROR; |
net::CertStatus status; |
DecidePolicy(nullptr, kHostName, &policy, &status); |
@@ -104,11 +104,28 @@ TEST_F(CRWCertVerificationControllerTest, NullCert) { |
} |
// Tests cert policy with null cert and null host. |
-TEST_F(CRWCertVerificationControllerTest, NullHost) { |
+TEST_F(CRWCertVerificationControllerTest, PolicyForNullHost) { |
web::CertAcceptPolicy policy = CERT_ACCEPT_POLICY_NON_RECOVERABLE_ERROR; |
net::CertStatus status; |
DecidePolicy(cert_, nil, &policy, &status); |
EXPECT_EQ(CERT_ACCEPT_POLICY_NON_RECOVERABLE_ERROR, policy); |
} |
+// Tests SSL status with invalid cert. |
+TEST_F(CRWCertVerificationControllerTest, SSLStatusForInvalidCert) { |
+ __block bool completion_handler_called = false; |
+ [controller_ |
+ querySSLStatusForCertChain:@[ static_cast<id>(cert_->os_cert_handle()) ] |
+ host:kHostName |
+ completionHandler:^(SecurityStyle style, |
+ net::CertStatus status) { |
+ EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN, style); |
+ EXPECT_TRUE(status && net::CERT_STATUS_INVALID); |
+ completion_handler_called = true; |
+ }]; |
+ base::test::ios::WaitUntilCondition(^{ |
+ return completion_handler_called; |
+ }, base::MessageLoop::current(), base::TimeDelta()); |
+} |
+ |
} // namespace web |