diff options
| author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 18:20:44 +0000 |
|---|---|---|
| committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 18:20:44 +0000 |
| commit | 5c0a0f762fa1d1491a41b468d481970596c532e7 (patch) | |
| tree | 3ab10e071adea02438458c296e073d43f6194f5a /chrome | |
| parent | 98093f06f0995b367a6e9cf5a21c355386474e95 (diff) | |
| download | chromium_src-5c0a0f762fa1d1491a41b468d481970596c532e7.zip chromium_src-5c0a0f762fa1d1491a41b468d481970596c532e7.tar.gz chromium_src-5c0a0f762fa1d1491a41b468d481970596c532e7.tar.bz2 | |
Re-enable pref service's PreservedWindowPlacementIsLoaded ui test.
Alter the test to use EXPECT_ instead of ASSERT_ when checking the window placement to not abort the test on data mismatch.
Review URL: http://codereview.chromium.org/115027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/pref_service_uitest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/common/pref_service_uitest.cc b/chrome/common/pref_service_uitest.cc index 875f430..a357af6 100644 --- a/chrome/common/pref_service_uitest.cc +++ b/chrome/common/pref_service_uitest.cc @@ -76,7 +76,7 @@ public: // Also, not sure what should happen on the mac. In any case, the code below // (minus the Windows bits) compiles fine on my Linux box now. // TODO(port): revisit this. -TEST_F(PreferenceServiceTest, DISABLED_PreservedWindowPlacementIsLoaded) { +TEST_F(PreferenceServiceTest, PreservedWindowPlacementIsLoaded) { // The window should open with the reference profile ASSERT_TRUE(LaunchAppWithProfile()); @@ -104,31 +104,31 @@ TEST_F(PreferenceServiceTest, DISABLED_PreservedWindowPlacementIsLoaded) { // Retrieve the expected rect values from "Preferences" int bottom = 0; std::wstring kBrowserWindowPlacement(prefs::kBrowserWindowPlacement); - ASSERT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + L".bottom", + EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + L".bottom", &bottom)); - ASSERT_EQ(bottom, window_placement.rcNormalPosition.bottom); + EXPECT_EQ(bottom, window_placement.rcNormalPosition.bottom); int top = 0; - ASSERT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + L".top", + EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + L".top", &top)); - ASSERT_EQ(top, window_placement.rcNormalPosition.top); + EXPECT_EQ(top, window_placement.rcNormalPosition.top); int left = 0; - ASSERT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + L".left", + EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + L".left", &left)); - ASSERT_EQ(left, window_placement.rcNormalPosition.left); + EXPECT_EQ(left, window_placement.rcNormalPosition.left); int right = 0; - ASSERT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + L".right", + EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + L".right", &right)); - ASSERT_EQ(right, window_placement.rcNormalPosition.right); + EXPECT_EQ(right, window_placement.rcNormalPosition.right); // Find if launched window is maximized bool is_window_maximized = (window_placement.showCmd == SW_MAXIMIZE); bool is_maximized = false; - ASSERT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + L".maximized", + EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + L".maximized", &is_maximized)); - ASSERT_EQ(is_maximized, is_window_maximized); + EXPECT_EQ(is_maximized, is_window_maximized); } #endif |