Commit af12279a authored by Kurt Horimoto's avatar Kurt Horimoto Committed by Commit Bot

[iOS] Fix order of EXPECT_EQ() in FullscreenWebStateObserverTest.

Bug: none
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: If45349c095ecc2044d5987d954c25604d3aadc0e
Reviewed-on: https://chromium-review.googlesource.com/1167607
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590457}
parent a61ae0a8
...@@ -63,12 +63,12 @@ class FullscreenWebStateObserverTest : public PlatformTest { ...@@ -63,12 +63,12 @@ class FullscreenWebStateObserverTest : public PlatformTest {
TEST_F(FullscreenWebStateObserverTest, ResetForNavigation) { TEST_F(FullscreenWebStateObserverTest, ResetForNavigation) {
// Simulate a scroll to 0.5 progress. // Simulate a scroll to 0.5 progress.
SimulateFullscreenUserScrollForProgress(&model(), 0.5); SimulateFullscreenUserScrollForProgress(&model(), 0.5);
EXPECT_EQ(model().progress(), 0.5); EXPECT_EQ(0.5, model().progress());
// Simulate a navigation. // Simulate a navigation.
web::FakeNavigationContext context; web::FakeNavigationContext context;
web_state().OnNavigationFinished(&context); web_state().OnNavigationFinished(&context);
EXPECT_FALSE(model().has_base_offset()); EXPECT_FALSE(model().has_base_offset());
EXPECT_EQ(model().progress(), 1.0); EXPECT_EQ(1.0, model().progress());
} }
// Tests that the FullscreenModel is not reset for same-document navigations // Tests that the FullscreenModel is not reset for same-document navigations
...@@ -81,12 +81,12 @@ TEST_F(FullscreenWebStateObserverTest, NoResetForSameDocumentSameURL) { ...@@ -81,12 +81,12 @@ TEST_F(FullscreenWebStateObserverTest, NoResetForSameDocumentSameURL) {
model().SetYContentOffset(0.0); model().SetYContentOffset(0.0);
// Simulate a scroll to 0.5 progress. // Simulate a scroll to 0.5 progress.
SimulateFullscreenUserScrollForProgress(&model(), 0.5); SimulateFullscreenUserScrollForProgress(&model(), 0.5);
EXPECT_EQ(model().progress(), 0.5); EXPECT_EQ(0.5, model().progress());
// Simulate a same-document navigation to the same URL and verify that the 0.5 // Simulate a same-document navigation to the same URL and verify that the 0.5
// progress hasn't been reset to 1.0. // progress hasn't been reset to 1.0.
context.SetIsSameDocument(true); context.SetIsSameDocument(true);
web_state().OnNavigationFinished(&context); web_state().OnNavigationFinished(&context);
EXPECT_EQ(model().progress(), 0.5); EXPECT_EQ(0.5, model().progress());
} }
// Tests that the FullscreenModel is not reset for a same-document navigation. // Tests that the FullscreenModel is not reset for a same-document navigation.
...@@ -98,13 +98,13 @@ TEST_F(FullscreenWebStateObserverTest, NoResetForSameDocumentFragmentChange) { ...@@ -98,13 +98,13 @@ TEST_F(FullscreenWebStateObserverTest, NoResetForSameDocumentFragmentChange) {
model().SetYContentOffset(0.0); model().SetYContentOffset(0.0);
// Simulate a scroll to 0.5 progress. // Simulate a scroll to 0.5 progress.
SimulateFullscreenUserScrollForProgress(&model(), 0.5); SimulateFullscreenUserScrollForProgress(&model(), 0.5);
EXPECT_EQ(model().progress(), 0.5); EXPECT_EQ(0.5, model().progress());
// Simulate a same-document navigation to a URL with a different fragment and // Simulate a same-document navigation to a URL with a different fragment and
// verify that the 0.5 progress hasn't been reset to 1.0. // verify that the 0.5 progress hasn't been reset to 1.0.
context.SetUrl(GURL("https://www.test.com#fragment")); context.SetUrl(GURL("https://www.test.com#fragment"));
context.SetIsSameDocument(true); context.SetIsSameDocument(true);
web_state().OnNavigationFinished(&context); web_state().OnNavigationFinished(&context);
EXPECT_EQ(model().progress(), 0.5); EXPECT_EQ(0.5, model().progress());
} }
// Tests that the FullscreenModel is not reset for a same-document navigation. // Tests that the FullscreenModel is not reset for a same-document navigation.
...@@ -116,13 +116,13 @@ TEST_F(FullscreenWebStateObserverTest, ResetForSameDocumentURLChange) { ...@@ -116,13 +116,13 @@ TEST_F(FullscreenWebStateObserverTest, ResetForSameDocumentURLChange) {
model().SetYContentOffset(0.0); model().SetYContentOffset(0.0);
// Simulate a scroll to 0.5 progress. // Simulate a scroll to 0.5 progress.
SimulateFullscreenUserScrollForProgress(&model(), 0.5); SimulateFullscreenUserScrollForProgress(&model(), 0.5);
EXPECT_EQ(model().progress(), 0.5); EXPECT_EQ(0.5, model().progress());
// Simulate a same-document navigation to a new URL and verify that the 0.5 // Simulate a same-document navigation to a new URL and verify that the 0.5
// progress is reset to 1.0. // progress is reset to 1.0.
context.SetUrl(GURL("https://www.test2.com")); context.SetUrl(GURL("https://www.test2.com"));
context.SetIsSameDocument(true); context.SetIsSameDocument(true);
web_state().OnNavigationFinished(&context); web_state().OnNavigationFinished(&context);
EXPECT_EQ(model().progress(), 1.0); EXPECT_EQ(1.0, model().progress());
} }
// Tests that the model is disabled when a load is occurring. // Tests that the model is disabled when a load is occurring.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment