Introduce NetworkState::is_captive_portal()

chromeos/network/network_state_unittest.cc

 // Copyright (c) 2013 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 "chromeos/network/network_state.h"
 
 #include "base/basictypes.h"
 #include "base/i18n/streaming_utf8_validator.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 153 matching lines @@
 TEST_F(NetworkStateTest, SsidHexMultipleUpdates) {
   EXPECT_TRUE(SetStringProperty(shill::kTypeProperty, shill::kTypeWifi));
 
   std::string wifi_hex_result = "This is HEX SSID!";
   std::string wifi_hex =
       base::HexEncode(wifi_hex_result.c_str(), wifi_hex_result.length());
   EXPECT_TRUE(SetStringProperty(shill::kWifiHexSsid, wifi_hex));
   EXPECT_TRUE(SetStringProperty(shill::kWifiHexSsid, wifi_hex));
 }
 
+TEST_F(NetworkStateTest, CaptivePortalState) {
+  std::string network_name = "test";
+  EXPECT_TRUE(SetStringProperty(shill::kTypeProperty, shill::kTypeWifi));
+  EXPECT_TRUE(SetStringProperty(shill::kNameProperty, network_name));
+  std::string hex_ssid =
+      base::HexEncode(network_name.c_str(), network_name.length());
+  EXPECT_TRUE(SetStringProperty(shill::kWifiHexSsid, hex_ssid));
+
+  // State != portal -> is_captive_portal == false
+  EXPECT_TRUE(SetStringProperty(shill::kStateProperty, shill::kStateReady));
+  SignalInitialPropertiesReceived();
+  EXPECT_FALSE(network_state_.is_captive_portal());
+
+  // State == portal, kPortalDetection* not set -> is_captive_portal = true
+  EXPECT_TRUE(SetStringProperty(shill::kStateProperty, shill::kStatePortal));
+  SignalInitialPropertiesReceived();
+  EXPECT_TRUE(network_state_.is_captive_portal());
+
+  // Set kPortalDetectionFailed* properties to states that should not trigger
+  // is_captive_portal.
+  SetStringProperty(shill::kPortalDetectionFailedPhaseProperty,
+                    shill::kPortalDetectionPhaseUnknown);
+  SetStringProperty(shill::kPortalDetectionFailedStatusProperty,
+                    shill::kPortalDetectionStatusTimeout);
+  SignalInitialPropertiesReceived();
+  EXPECT_FALSE(network_state_.is_captive_portal());
+
+  // Set just the phase property to the expected captive portal state.
+  // is_captive_portal should still be false.
+  SetStringProperty(shill::kPortalDetectionFailedPhaseProperty,
+                    shill::kPortalDetectionPhaseContent);
+  SignalInitialPropertiesReceived();
+  EXPECT_FALSE(network_state_.is_captive_portal());
+
+  // Set the status property to the expected captive portal state property.
+  // is_captive_portal should now be true.
+  SetStringProperty(shill::kPortalDetectionFailedStatusProperty,
+                    shill::kPortalDetectionStatusFailure);
+  SignalInitialPropertiesReceived();
+  EXPECT_TRUE(network_state_.is_captive_portal());
+}
+
 }  // namespace chromeos