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

Side by Side Diff: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Issue 1059033002: Implement networkingPrivate.getDeviceStates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test Created 5 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <map> 5 #include <map>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // Synchronous methods 139 // Synchronous methods
140 scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override { 140 scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override {
141 scoped_ptr<base::ListValue> result; 141 scoped_ptr<base::ListValue> result;
142 if (!fail_) { 142 if (!fail_) {
143 result.reset(new base::ListValue); 143 result.reset(new base::ListValue);
144 result->AppendString(::onc::network_config::kEthernet); 144 result->AppendString(::onc::network_config::kEthernet);
145 } 145 }
146 return result.Pass(); 146 return result.Pass();
147 } 147 }
148 148
149 scoped_ptr<DeviceStateList> GetDeviceStateList() override {
150 scoped_ptr<DeviceStateList> result;
151 if (fail_)
152 return result.Pass();
153 result.reset(new DeviceStateList);
154 scoped_ptr<core_api::networking_private::DeviceStateProperties> properties(
155 new core_api::networking_private::DeviceStateProperties);
156 properties->type = core_api::networking_private::NETWORK_TYPE_ETHERNET;
157 properties->state = core_api::networking_private::DEVICE_STATE_TYPE_ENABLED;
158 result->push_back(properties.Pass());
159 return result.Pass();
160 }
161
149 bool EnableNetworkType(const std::string& type) override { 162 bool EnableNetworkType(const std::string& type) override {
150 enabled_[type] = true; 163 enabled_[type] = true;
151 return !fail_; 164 return !fail_;
152 } 165 }
153 166
154 bool DisableNetworkType(const std::string& type) override { 167 bool DisableNetworkType(const std::string& type) override {
155 disabled_[type] = true; 168 disabled_[type] = true;
156 return !fail_; 169 return !fail_;
157 } 170 }
158 171
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 } 368 }
356 369
357 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetVisibleNetworks) { 370 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetVisibleNetworks) {
358 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; 371 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_;
359 } 372 }
360 373
361 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetEnabledNetworkTypes) { 374 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetEnabledNetworkTypes) {
362 EXPECT_TRUE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; 375 EXPECT_TRUE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_;
363 } 376 }
364 377
378 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetDeviceStates) {
379 EXPECT_TRUE(RunNetworkingSubtest("getDeviceStates")) << message_;
380 }
381
365 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, EnableNetworkType) { 382 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, EnableNetworkType) {
366 EXPECT_TRUE(RunNetworkingSubtest("enableNetworkType")) << message_; 383 EXPECT_TRUE(RunNetworkingSubtest("enableNetworkType")) << message_;
367 EXPECT_TRUE(GetEnabled(::onc::network_config::kEthernet)); 384 EXPECT_TRUE(GetEnabled(::onc::network_config::kEthernet));
368 } 385 }
369 386
370 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, DisableNetworkType) { 387 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, DisableNetworkType) {
371 EXPECT_TRUE(RunNetworkingSubtest("disableNetworkType")) << message_; 388 EXPECT_TRUE(RunNetworkingSubtest("disableNetworkType")) << message_;
372 EXPECT_TRUE(GetDisabled(::onc::network_config::kEthernet)); 389 EXPECT_TRUE(GetDisabled(::onc::network_config::kEthernet));
373 } 390 }
374 391
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 } 469 }
453 470
454 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetVisibleNetworks) { 471 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetVisibleNetworks) {
455 EXPECT_FALSE(RunNetworkingSubtest("getVisibleNetworks")) << message_; 472 EXPECT_FALSE(RunNetworkingSubtest("getVisibleNetworks")) << message_;
456 } 473 }
457 474
458 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetEnabledNetworkTypes) { 475 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetEnabledNetworkTypes) {
459 EXPECT_FALSE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; 476 EXPECT_FALSE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_;
460 } 477 }
461 478
479 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetDeviceStates) {
480 EXPECT_FALSE(RunNetworkingSubtest("getDeviceStates")) << message_;
481 }
482
462 // Note: Synchronous methods never fail: 483 // Note: Synchronous methods never fail:
463 // * disableNetworkType 484 // * disableNetworkType
464 // * enableNetworkType 485 // * enableNetworkType
465 // * requestNetworkScan 486 // * requestNetworkScan
466 487
467 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, StartConnect) { 488 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, StartConnect) {
468 EXPECT_FALSE(RunNetworkingSubtest("startConnect")) << message_; 489 EXPECT_FALSE(RunNetworkingSubtest("startConnect")) << message_;
469 } 490 }
470 491
471 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, StartDisconnect) { 492 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, StartDisconnect) {
(...skipping 25 matching lines...) Expand all
497 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; 518 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_;
498 } 519 }
499 520
500 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { 521 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) {
501 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; 522 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_;
502 } 523 }
503 524
504 #endif // defined(OS_WIN) 525 #endif // defined(OS_WIN)
505 526
506 } // namespace extensions 527 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698