chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc - Issue 2698473007: Convert path usage in NetworkListViewBase subclasses to use guids.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

Issue 2698473007: Convert path usage in NetworkListViewBase subclasses to use guids. (Closed)

Patch Set: Tweak NetworkPortalNotificationControllerTest to create GUIDs for new NetworkStates. Created 3 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/net/network_portal_notification_controller.cc ('k') | chrome/browser/ui/ash/networking_config_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

index 464d03c14865193715078493f0d74ca3173538d1..6b770880fd43b420ecadd7312d6a564a49303b96 100644

--- a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

+++ b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

@@ -100,6 +100,7 @@ class NetworkPortalNotificationControllerTest : public testing::Test {

TEST_F(NetworkPortalNotificationControllerTest, NetworkStateChanged) {

NetworkState wifi("wifi");

+ wifi.SetGuid("wifi");

NetworkPortalDetector::CaptivePortalState wifi_state;

// Notification is not displayed for online state.

@@ -123,6 +124,7 @@ TEST_F(NetworkPortalNotificationControllerTest, NetworkStateChanged) {

TEST_F(NetworkPortalNotificationControllerTest, NetworkChanged) {

NetworkState wifi1("wifi1");

+ wifi1.SetGuid("wifi1");

NetworkPortalDetector::CaptivePortalState wifi1_state;

wifi1_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;

wifi1_state.response_code = 200;

@@ -138,6 +140,7 @@ TEST_F(NetworkPortalNotificationControllerTest, NetworkChanged) {

ASSERT_FALSE(HasNotification());

NetworkState wifi2("wifi2");

+ wifi2.SetGuid("wifi2");

NetworkPortalDetector::CaptivePortalState wifi2_state;

wifi2_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;

wifi2_state.response_code = 204;

@@ -161,6 +164,7 @@ TEST_F(NetworkPortalNotificationControllerTest, NotificationUpdated) {

// First network is behind a captive portal, so notification should

// be displayed.

NetworkState wifi1("wifi1");

+ wifi1.SetGuid("wifi1");

OnPortalDetectionCompleted(&wifi1, portal_state);

ASSERT_TRUE(HasNotification());

EXPECT_EQ(1u, observer().add_count());

@@ -170,6 +174,7 @@ TEST_F(NetworkPortalNotificationControllerTest, NotificationUpdated) {

// Second network is also behind a captive portal, so notification

// should be updated.

NetworkState wifi2("wifi2");

+ wifi2.SetGuid("wifi2");

OnPortalDetectionCompleted(&wifi2, portal_state);

ASSERT_TRUE(HasNotification());

EXPECT_EQ(1u, observer().add_count());