chromeos/network/onc/onc_merger_unittest.cc - Issue 540333002: ONC: Fix Static-/Saved-/IPConfig.

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: chromeos/network/onc/onc_merger_unittest.cc

Issue 540333002: ONC: Fix Static-/Saved-/IPConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased. Created 6 years, 3 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:

Index: chromeos/network/onc/onc_merger_unittest.cc

diff --git a/chromeos/network/onc/onc_merger_unittest.cc b/chromeos/network/onc/onc_merger_unittest.cc

index 64ba338696d62d47cb00aaa90074efefeedfce0a..3c9b8f00293991401ff7524ab2a333f0a43cd4b3 100644

--- a/chromeos/network/onc/onc_merger_unittest.cc

+++ b/chromeos/network/onc/onc_merger_unittest.cc

@@ -69,7 +69,7 @@ TEST_F(ONCMergerTest, MandatoryValueOverwritesUserValue) {

scoped_ptr<base::DictionaryValue> merged(MergeSettingsAndPoliciesToEffective(

policy_.get(), NULL, user_.get(), NULL));

EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "Type"));

- EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "IPConfigs"));

+ EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "StaticIPConfig"));

}

TEST_F(ONCMergerTest, MandatoryValueAndNoUserValue) {