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

Side by Side Diff: chromeos/network/network_connection_handler_unittest.cc

Issue 2828713002: Enable client certificate patterns in device ONC policy (Closed)
Patch Set: Addressed comments - more DCHECKs, use PostTask..WithReply in client_cert_resolver.cc. Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « chromeos/network/network_connection_handler.cc ('k') | chromeos/network/onc/onc_validator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/files/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/json/json_reader.h" 13 #include "base/json/json_reader.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/run_loop.h" 16 #include "base/run_loop.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/test/scoped_task_scheduler.h"
18 #include "chromeos/cert_loader.h" 19 #include "chromeos/cert_loader.h"
19 #include "chromeos/dbus/dbus_thread_manager.h" 20 #include "chromeos/dbus/dbus_thread_manager.h"
20 #include "chromeos/network/managed_network_configuration_handler_impl.h" 21 #include "chromeos/network/managed_network_configuration_handler_impl.h"
21 #include "chromeos/network/network_configuration_handler.h" 22 #include "chromeos/network/network_configuration_handler.h"
22 #include "chromeos/network/network_connection_observer.h" 23 #include "chromeos/network/network_connection_observer.h"
23 #include "chromeos/network/network_profile_handler.h" 24 #include "chromeos/network/network_profile_handler.h"
24 #include "chromeos/network/network_state_handler.h" 25 #include "chromeos/network/network_state_handler.h"
25 #include "chromeos/network/network_state_test.h" 26 #include "chromeos/network/network_state_test.h"
26 #include "chromeos/network/onc/onc_utils.h" 27 #include "chromeos/network/onc/onc_utils.h"
27 #include "components/onc/onc_constants.h" 28 #include "components/onc/onc_constants.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 std::set<std::string> requests_; 80 std::set<std::string> requests_;
80 std::map<std::string, std::string> results_; 81 std::map<std::string, std::string> results_;
81 82
82 DISALLOW_COPY_AND_ASSIGN(TestNetworkConnectionObserver); 83 DISALLOW_COPY_AND_ASSIGN(TestNetworkConnectionObserver);
83 }; 84 };
84 85
85 } // namespace 86 } // namespace
86 87
87 class NetworkConnectionHandlerTest : public NetworkStateTest { 88 class NetworkConnectionHandlerTest : public NetworkStateTest {
88 public: 89 public:
89 NetworkConnectionHandlerTest() {} 90 NetworkConnectionHandlerTest() : scoped_task_scheduler_(&message_loop_) {}
90 91
91 ~NetworkConnectionHandlerTest() override {} 92 ~NetworkConnectionHandlerTest() override {}
92 93
93 void SetUp() override { 94 void SetUp() override {
94 ASSERT_TRUE(test_nssdb_.is_open()); 95 ASSERT_TRUE(test_nssdb_.is_open());
95 96
96 // Use the same DB for public and private slot. 97 // Use the same DB for public and private slot.
97 test_nsscertdb_.reset(new net::NSSCertDatabaseChromeOS( 98 test_nsscertdb_.reset(new net::NSSCertDatabaseChromeOS(
98 crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())), 99 crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())),
99 crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())))); 100 crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot()))));
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 std::unique_ptr<TestNetworkConnectionObserver> network_connection_observer_; 258 std::unique_ptr<TestNetworkConnectionObserver> network_connection_observer_;
258 std::unique_ptr<ManagedNetworkConfigurationHandlerImpl> 259 std::unique_ptr<ManagedNetworkConfigurationHandlerImpl>
259 managed_config_handler_; 260 managed_config_handler_;
260 std::unique_ptr<NetworkProfileHandler> network_profile_handler_; 261 std::unique_ptr<NetworkProfileHandler> network_profile_handler_;
261 crypto::ScopedTestNSSDB test_nssdb_; 262 crypto::ScopedTestNSSDB test_nssdb_;
262 std::unique_ptr<net::NSSCertDatabaseChromeOS> test_nsscertdb_; 263 std::unique_ptr<net::NSSCertDatabaseChromeOS> test_nsscertdb_;
263 base::MessageLoopForUI message_loop_; 264 base::MessageLoopForUI message_loop_;
264 std::string result_; 265 std::string result_;
265 266
266 private: 267 private:
268 base::test::ScopedTaskScheduler scoped_task_scheduler_;
269
267 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandlerTest); 270 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandlerTest);
268 }; 271 };
269 272
270 namespace { 273 namespace {
271 274
272 const char* kNoNetwork = "no-network"; 275 const char* kNoNetwork = "no-network";
273 const char* kWifi0 = "wifi0"; 276 const char* kWifi0 = "wifi0";
274 const char* kWifi1 = "wifi1"; 277 const char* kWifi1 = "wifi1";
275 const char* kWifi2 = "wifi2"; 278 const char* kWifi2 = "wifi2";
276 const char* kWifi3 = "wifi3"; 279 const char* kWifi3 = "wifi3";
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 Connect(kNoNetwork); 444 Connect(kNoNetwork);
442 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed, 445 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed,
443 GetResultAndReset()); 446 GetResultAndReset());
444 447
445 EXPECT_FALSE(ConfigureService(kConfigConnectable).empty()); 448 EXPECT_FALSE(ConfigureService(kConfigConnectable).empty());
446 Disconnect(kWifi0); 449 Disconnect(kWifi0);
447 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset()); 450 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset());
448 } 451 }
449 452
450 } // namespace chromeos 453 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/network_connection_handler.cc ('k') | chromeos/network/onc/onc_validator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698