| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chromeos/network/network_connection_handler.h" | 5 #include "chromeos/network/network_connection_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "chromeos/dbus/dbus_thread_manager.h" | 10 #include "chromeos/dbus/dbus_thread_manager.h" |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 EXPECT_TRUE(Configure(kConfigConnectable)); | 160 EXPECT_TRUE(Configure(kConfigConnectable)); |
| 161 Connect("wifi0"); | 161 Connect("wifi0"); |
| 162 EXPECT_EQ(kSuccessResult, GetResultAndReset()); | 162 EXPECT_EQ(kSuccessResult, GetResultAndReset()); |
| 163 EXPECT_EQ(flimflam::kStateOnline, | 163 EXPECT_EQ(flimflam::kStateOnline, |
| 164 GetServiceStringProperty("wifi0", flimflam::kStateProperty)); | 164 GetServiceStringProperty("wifi0", flimflam::kStateProperty)); |
| 165 } | 165 } |
| 166 | 166 |
| 167 // Handles basic failure cases. | 167 // Handles basic failure cases. |
| 168 TEST_F(NetworkConnectionHandlerTest, NetworkConnectionHandlerConnectFailure) { | 168 TEST_F(NetworkConnectionHandlerTest, NetworkConnectionHandlerConnectFailure) { |
| 169 Connect("no-network"); | 169 Connect("no-network"); |
| 170 EXPECT_EQ(NetworkConnectionHandler::kErrorNotFound, GetResultAndReset()); | 170 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed, |
| 171 GetResultAndReset()); |
| 171 | 172 |
| 172 EXPECT_TRUE(Configure(kConfigConnected)); | 173 EXPECT_TRUE(Configure(kConfigConnected)); |
| 173 Connect("wifi1"); | 174 Connect("wifi1"); |
| 174 EXPECT_EQ(NetworkConnectionHandler::kErrorConnected, GetResultAndReset()); | 175 EXPECT_EQ(NetworkConnectionHandler::kErrorConnected, GetResultAndReset()); |
| 175 | 176 |
| 176 EXPECT_TRUE(Configure(kConfigConnecting)); | 177 EXPECT_TRUE(Configure(kConfigConnecting)); |
| 177 Connect("wifi2"); | 178 Connect("wifi2"); |
| 178 EXPECT_EQ(NetworkConnectionHandler::kErrorConnecting, GetResultAndReset()); | 179 EXPECT_EQ(NetworkConnectionHandler::kErrorConnecting, GetResultAndReset()); |
| 179 | 180 |
| 180 EXPECT_TRUE(Configure(kConfigRequiresPassphrase)); | 181 EXPECT_TRUE(Configure(kConfigRequiresPassphrase)); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 TEST_F(NetworkConnectionHandlerTest, | 215 TEST_F(NetworkConnectionHandlerTest, |
| 215 NetworkConnectionHandlerDisconnectSuccess) { | 216 NetworkConnectionHandlerDisconnectSuccess) { |
| 216 EXPECT_TRUE(Configure(kConfigConnected)); | 217 EXPECT_TRUE(Configure(kConfigConnected)); |
| 217 Disconnect("wifi1"); | 218 Disconnect("wifi1"); |
| 218 EXPECT_EQ(kSuccessResult, GetResultAndReset()); | 219 EXPECT_EQ(kSuccessResult, GetResultAndReset()); |
| 219 } | 220 } |
| 220 | 221 |
| 221 TEST_F(NetworkConnectionHandlerTest, | 222 TEST_F(NetworkConnectionHandlerTest, |
| 222 NetworkConnectionHandlerDisconnectFailure) { | 223 NetworkConnectionHandlerDisconnectFailure) { |
| 223 Connect("no-network"); | 224 Connect("no-network"); |
| 224 EXPECT_EQ(NetworkConnectionHandler::kErrorNotFound, GetResultAndReset()); | 225 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed, |
| 226 GetResultAndReset()); |
| 225 | 227 |
| 226 EXPECT_TRUE(Configure(kConfigConnectable)); | 228 EXPECT_TRUE(Configure(kConfigConnectable)); |
| 227 Disconnect("wifi0"); | 229 Disconnect("wifi0"); |
| 228 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset()); | 230 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset()); |
| 229 } | 231 } |
| 230 | 232 |
| 231 } // namespace chromeos | 233 } // namespace chromeos |
| OLD | NEW |