[CrOS Tether] Update NetworkState to include tether properties and integrate into NetworkStateHandl…

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 <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/i18n/streaming_utf8_validator.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
+#include "chromeos/network/tether_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 class NetworkStateTest : public testing::Test {
  public:
   NetworkStateTest() : network_state_("test_path") {
@@ skipping 223 matching lines @@
   EXPECT_EQ(network_state_.connection_state(), shill::kStateDisconnect);
   EXPECT_FALSE(network_state_.IsConnectedState());
   EXPECT_FALSE(network_state_.IsReconnecting());
 
   network_state_.set_connection_state(shill::kStateConfiguration);
   EXPECT_EQ(network_state_.connection_state(), shill::kStateDisconnect);
   EXPECT_FALSE(network_state_.IsConnectingState());
   EXPECT_FALSE(network_state_.IsReconnecting());
 }
 
+TEST_F(NetworkStateTest, TetherProperties) {
+  network_state_.set_type(kTypeTether);
+  network_state_.set_carrier("Project Fi");
+  network_state_.set_battery_percentage(85);
+  network_state_.set_signal_strength(75);
+
+  base::DictionaryValue dictionary;
+  network_state_.GetStateProperties(&dictionary);
+
+  int signal_strength;
+  EXPECT_TRUE(dictionary.GetIntegerWithoutPathExpansion(kTetherSignalStrength,
+                                                        &signal_strength));
+  EXPECT_EQ(75, signal_strength);
+
+  int battery_percentage;
+  EXPECT_TRUE(dictionary.GetIntegerWithoutPathExpansion(
+      kTetherBatteryPercentage, &battery_percentage));
+  EXPECT_EQ(85, battery_percentage);
+
+  std::string carrier;
+  EXPECT_TRUE(
+      dictionary.GetStringWithoutPathExpansion(kTetherCarrier, &carrier));
+  EXPECT_EQ("Project Fi", carrier);
+}
+
 }  // namespace chromeos