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

Unified Diff: chrome/browser/ssl/ssl_error_handler_unittest.cc

Issue 318213002: Add custom interstitial for captive portals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix android tests, add more uma, address mmenke's comments Created 6 years, 6 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: chrome/browser/ssl/ssl_error_handler_unittest.cc
diff --git a/chrome/browser/ssl/ssl_error_handler_unittest.cc b/chrome/browser/ssl/ssl_error_handler_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..483a1bc5acad3828530492b0431ff9ee9c8f4a56
--- /dev/null
+++ b/chrome/browser/ssl/ssl_error_handler_unittest.cc
@@ -0,0 +1,154 @@
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ssl/ssl_error_handler.h"
+
+#include "base/callback.h"
+#include "base/message_loop/message_loop.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "net/ssl/ssl_info.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+
+class TestSSLErrorHandler : public SSLErrorHandler {
+ public:
+ TestSSLErrorHandler(content::WebContents* web_contents,
+ const net::SSLInfo& ssl_info,
+ bool overridable)
+ : SSLErrorHandler(web_contents,
+ -1,
+ ssl_info,
+ GURL(),
+ overridable,
+ false,
+ base::Callback<void(bool)>()) {
+ }
+
+ virtual ~TestSSLErrorHandler() {
+ }
+
+ void set_ssl_interstitial_display_delay(base::TimeDelta delay) {
+ EXPECT_FALSE(TimerRunning());
+ SSLErrorHandler::set_ssl_interstitial_display_delay(delay);
+ }
+
+ bool TimerRunning() {
+ return timer_.IsRunning();
+ }
+
+ MOCK_METHOD0(CheckForCaptivePortal, void());
+ MOCK_METHOD0(ShowCaptivePortalInterstitial, void());
+ MOCK_METHOD0(ShowSSLInterstitial, void());
+ private:
+ DISALLOW_COPY_AND_ASSIGN(TestSSLErrorHandler);
+};
+
+class SSLErrorHandlerTest : public ChromeRenderViewHostTestHarness {
+ public:
+ // testing::Test:
+ virtual void SetUp() OVERRIDE {
+ ChromeRenderViewHostTestHarness::SetUp();
+ ssl_info_.reset(new net::SSLInfo);
+ error_handler_.reset(
+ new testing::StrictMock<TestSSLErrorHandler>(web_contents(),
+ *ssl_info_.get(),
+ false));
+ error_handler_->set_ssl_interstitial_display_delay(base::TimeDelta());
+ }
+
+ virtual void TearDown() OVERRIDE {
+ EXPECT_FALSE(error_handler().TimerRunning());
+ error_handler_.reset(NULL);
+ ssl_info_.reset(NULL);
+ ChromeRenderViewHostTestHarness::TearDown();
+ }
+
+ TestSSLErrorHandler& error_handler() { return *error_handler_.get(); }
+
+ private:
+ scoped_ptr<net::SSLInfo> ssl_info_;
+ scoped_ptr<TestSSLErrorHandler> error_handler_;
+};
+
+#ifdef ENABLE_CAPTIVE_PORTAL_DETECTION
+
+TEST_F(SSLErrorHandlerTest,
+ ShouldShowSSLInterstitialOnTimerExpired) {
+ EXPECT_FALSE(error_handler().TimerRunning());
+ EXPECT_CALL(error_handler(), CheckForCaptivePortal()).Times(1);
+ error_handler().Handle();
+
+ EXPECT_TRUE(error_handler().TimerRunning());
+ EXPECT_FALSE(error_handler().handled());
+ EXPECT_CALL(error_handler(), ShowSSLInterstitial()).Times(1);
+ EXPECT_CALL(error_handler(), ShowCaptivePortalInterstitial()).Times(0);
+ base::MessageLoop::current()->RunUntilIdle();
+
+ EXPECT_FALSE(error_handler().TimerRunning());
+ EXPECT_TRUE(error_handler().handled());
+
+ // Any captive portal result after the timer expired should be ignored.
+ error_handler().OnCaptivePortalResult();
+ EXPECT_CALL(error_handler(), ShowSSLInterstitial()).Times(0);
+ EXPECT_CALL(error_handler(), ShowCaptivePortalInterstitial()).Times(0);
+}
+
+TEST_F(SSLErrorHandlerTest,
+ ShouldShowCustomInterstitialOnCaptivePortalResult) {
+ EXPECT_FALSE(error_handler().TimerRunning());
+ EXPECT_CALL(error_handler(), CheckForCaptivePortal()).Times(1);
+ error_handler().Handle();
+
+ EXPECT_TRUE(error_handler().TimerRunning());
+ EXPECT_FALSE(error_handler().handled());
+ EXPECT_CALL(error_handler(), ShowSSLInterstitial()).Times(0);
+ EXPECT_CALL(error_handler(), ShowCaptivePortalInterstitial()).Times(1);
+ // Fake a captive portal result.
+ error_handler().OnCaptivePortalResult();
+ base::MessageLoop::current()->RunUntilIdle();
+
+ EXPECT_FALSE(error_handler().TimerRunning());
+ EXPECT_TRUE(error_handler().handled());
+
+ // Any captive portal result after the timer expired should be ignored.
+ error_handler().OnCaptivePortalResult();
+ EXPECT_CALL(error_handler(), ShowSSLInterstitial()).Times(0);
+ EXPECT_CALL(error_handler(), ShowCaptivePortalInterstitial()).Times(0);
+}
+
+TEST_F(SSLErrorHandlerTest,
+ ShouldShowSSLInterstitialOnTooEarlyCaptivePortalResult) {
+ EXPECT_FALSE(error_handler().TimerRunning());
+ EXPECT_CALL(error_handler(), CheckForCaptivePortal()).Times(1);
+
+ EXPECT_CALL(error_handler(), ShowSSLInterstitial()).Times(0);
+ EXPECT_CALL(error_handler(), ShowCaptivePortalInterstitial()).Times(0);
+ // A captive portal result arrives before error handler starts.
+ error_handler().OnCaptivePortalResult();
+
+ EXPECT_FALSE(error_handler().handled());
+ EXPECT_FALSE(error_handler().TimerRunning());
+
+ error_handler().Handle();
+
+ EXPECT_TRUE(error_handler().TimerRunning());
+ EXPECT_FALSE(error_handler().handled());
+ EXPECT_CALL(error_handler(), ShowSSLInterstitial()).Times(1);
+ EXPECT_CALL(error_handler(), ShowCaptivePortalInterstitial()).Times(0);
+ base::MessageLoop::current()->RunUntilIdle();
+}
+
+#else
+
+TEST_F(SSLErrorHandlerTest,
+ ShouldShowSSLInterstitialOnCaptivePortalDetectionDisabled) {
+ EXPECT_FALSE(error_handler().TimerRunning());
+ EXPECT_CALL(error_handler(), ShowSSLInterstitial()).Times(1);
+ EXPECT_CALL(error_handler(), CheckForCaptivePortal()).Times(0);
+ EXPECT_CALL(error_handler(), ShowCaptivePortalInterstitial()).Times(0);
+ error_handler().Handle();
+}
+
+#endif

Powered by Google App Engine
This is Rietveld 408576698