Commit 1554a331 authored by wtc@chromium.org's avatar wtc@chromium.org

Tweak the tests to match the original intention.

R=rsleevi@chromium.org
BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10830272

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151355 0039d316-1c4b-4281-b951-d872f2087c98
parent be458116
...@@ -50,6 +50,7 @@ class MockSSLConfigServiceObserver : public SSLConfigService::Observer { ...@@ -50,6 +50,7 @@ class MockSSLConfigServiceObserver : public SSLConfigService::Observer {
TEST(SSLConfigServiceTest, NoChangesWontNotifyObservers) { TEST(SSLConfigServiceTest, NoChangesWontNotifyObservers) {
SSLConfig initial_config; SSLConfig initial_config;
initial_config.rev_checking_enabled = true; initial_config.rev_checking_enabled = true;
initial_config.false_start_enabled = false;
initial_config.version_min = SSL_PROTOCOL_VERSION_SSL3; initial_config.version_min = SSL_PROTOCOL_VERSION_SSL3;
initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1; initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1;
...@@ -67,6 +68,7 @@ TEST(SSLConfigServiceTest, NoChangesWontNotifyObservers) { ...@@ -67,6 +68,7 @@ TEST(SSLConfigServiceTest, NoChangesWontNotifyObservers) {
TEST(SSLConfigServiceTest, ConfigUpdatesNotifyObservers) { TEST(SSLConfigServiceTest, ConfigUpdatesNotifyObservers) {
SSLConfig initial_config; SSLConfig initial_config;
initial_config.rev_checking_enabled = true; initial_config.rev_checking_enabled = true;
initial_config.false_start_enabled = false;
initial_config.version_min = SSL_PROTOCOL_VERSION_SSL3; initial_config.version_min = SSL_PROTOCOL_VERSION_SSL3;
initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1; initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1;
...@@ -80,6 +82,11 @@ TEST(SSLConfigServiceTest, ConfigUpdatesNotifyObservers) { ...@@ -80,6 +82,11 @@ TEST(SSLConfigServiceTest, ConfigUpdatesNotifyObservers) {
EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
mock_service->SetSSLConfig(initial_config); mock_service->SetSSLConfig(initial_config);
initial_config.false_start_enabled = true;
EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
mock_service->SetSSLConfig(initial_config);
// Test that changing the SSL version range triggers updates.
initial_config.version_min = SSL_PROTOCOL_VERSION_TLS1; initial_config.version_min = SSL_PROTOCOL_VERSION_TLS1;
EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
mock_service->SetSSLConfig(initial_config); mock_service->SetSSLConfig(initial_config);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment