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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ios/web/navigation/navigation_manager_impl_unittest.mm

Issue 2766453002: Implement Reload for ORIGINAL_REQUEST_URL in NavigationManagerImpl. (Closed)
Patch Set: Addressed comments Created 3 years, 9 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
« ios/web/navigation/navigation_manager_impl.mm ('K') | « ios/web/navigation/navigation_manager_impl.mm ('k') | ios/web/public/reload_type.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/navigation_manager_impl_unittest.mm
diff --git a/ios/web/navigation/navigation_manager_impl_unittest.mm b/ios/web/navigation/navigation_manager_impl_unittest.mm
index 9bc5a3ac7834038a92750ab2d15cec013df52c00..37f4b74874fbd6f0e01625f937d31d8a195b3125 100644
--- a/ios/web/navigation/navigation_manager_impl_unittest.mm
+++ b/ios/web/navigation/navigation_manager_impl_unittest.mm
@@ -18,13 +18,19 @@
namespace {
// Stub class for NavigationManagerDelegate.
class TestNavigationManagerDelegate : public NavigationManagerDelegate {
+ public:
Eugene But (OOO till 7-30) 2017/03/28 01:52:56 How about this? public: bool reload_called() {
liaoyuke 2017/03/28 16:22:48 Done.
void GoToIndex(int index) override {}
void LoadURLWithParams(const NavigationManager::WebLoadParams&) override {}
- void Reload() override {}
+ void Reload() override { reload_called_ = true; }
void OnNavigationItemsPruned(size_t pruned_item_count) override {}
void OnNavigationItemChanged() override{};
void OnNavigationItemCommitted(const LoadCommittedDetails&) override {}
WebState* GetWebState() override { return nullptr; }
+
+ bool reload_called() { return reload_called_; }
+
+ private:
+ bool reload_called_ = false;
};
} // namespace
@@ -40,6 +46,9 @@ void OnNavigationItemCommitted(const LoadCommittedDetails&) override {}
}
CRWSessionController* session_controller() { return controller_.get(); }
NavigationManagerImpl* navigation_manager() { return manager_.get(); }
+ TestNavigationManagerDelegate navigation_manager_delegate() {
+ return delegate_;
+ }
private:
TestBrowserState browser_state_;
@@ -598,20 +607,210 @@ void OnNavigationItemCommitted(const LoadCommittedDetails&) override {}
EXPECT_EQ(item2->GetUserAgentType(), item3->GetUserAgentType());
}
-// Tests that calling |Reload| on NavigationManager leaves the Url of the
-// visible item unchanged.
-TEST_F(NavigationManagerTest, ReloadWithNormalReloadType) {
+// Tests that calling |Reload| with web::ReloadType::NORMAL will not crash when
Eugene But (OOO till 7-30) 2017/03/28 01:52:56 s/will not crash/is no op Same comment for other
liaoyuke 2017/03/28 16:22:49 Done.
+// there are no transient, pending and committed items.
+TEST_F(NavigationManagerTest, ReloadEmptyWithNormalType) {
+ ASSERT_FALSE(navigation_manager()->GetTransientItem());
+ ASSERT_FALSE(navigation_manager()->GetPendingItem());
+ ASSERT_EQ(0, navigation_manager()->GetItemCount());
+ navigation_manager()->Reload(web::ReloadType::NORMAL,
+ false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
Eugene But (OOO till 7-30) 2017/03/28 01:52:56 Should this be EXPECT_FALSE?
liaoyuke 2017/03/28 16:22:48 Done.
+}
+
+// Tests that calling |Reload| with web::ReloadType::NORMAL leaves the url of
+// the renderer initiated pending item unchanged when there is one.
+TEST_F(NavigationManagerTest, ReloadRendererPendingItemWithNormalType) {
+ GURL url_before_reload = GURL("http://www.url.com");
navigation_manager()->AddPendingItem(
- GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ url_before_reload, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::RENDERER_INITIATED);
+
+ navigation_manager()->Reload(web::ReloadType::NORMAL,
+ false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(url_before_reload,
+ navigation_manager()->GetPendingItem()->GetURL());
+}
+
+// Tests that calling |Reload| with web::ReloadType::NORMAL leaves the url of
+// the user initiated pending item unchanged when there is one.
+TEST_F(NavigationManagerTest, ReloadUserPendingItemWithNormalType) {
+ GURL url_before_reload = GURL("http://www.url.com");
+ navigation_manager()->AddPendingItem(
+ url_before_reload, Referrer(), ui::PAGE_TRANSITION_TYPED,
web::NavigationInitiationType::USER_INITIATED);
- ASSERT_TRUE(navigation_manager()->GetVisibleItem());
- GURL url_before_reload = navigation_manager()->GetVisibleItem()->GetURL();
navigation_manager()->Reload(web::ReloadType::NORMAL,
false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(url_before_reload,
+ navigation_manager()->GetPendingItem()->GetURL());
+}
+
+// Tests that calling |Reload| with web::ReloadType::NORMAL leaves the url of
+// the last committed item unchanged when there is no pending item.
+TEST_F(NavigationManagerTest, ReloadLastCommittedItemWithNormalType) {
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ [session_controller() commitPendingItem];
+
+ GURL url_before_reload = GURL("http://www.url.com/1");
+ navigation_manager()->AddPendingItem(
+ url_before_reload, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ [session_controller() commitPendingItem];
+
+ navigation_manager()->Reload(web::ReloadType::NORMAL,
+ false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
+
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_EQ(url_before_reload,
+ navigation_manager()->GetLastCommittedItem()->GetURL());
+}
+
+// Tests that calling |Reload| with web::ReloadType::NORMAL leaves the url of
+// the last committed item unchanged when there is no pending item, but there
+// forward items after last committed item.
+TEST_F(NavigationManagerTest,
+ ReloadLastCommittedItemWithNormalTypeWithForwardItems) {
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ [session_controller() commitPendingItem];
+
+ GURL url_before_reload = GURL("http://www.url.com/1");
+ navigation_manager()->AddPendingItem(
+ url_before_reload, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ [session_controller() commitPendingItem];
+
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com/2"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ [session_controller() commitPendingItem];
+
+ [session_controller() goToItemAtIndex:1];
+ EXPECT_EQ(1, navigation_manager()->GetLastCommittedItemIndex());
+
+ navigation_manager()->Reload(web::ReloadType::NORMAL,
+ false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
EXPECT_EQ(url_before_reload,
- navigation_manager()->GetVisibleItem()->GetURL());
+ navigation_manager()->GetLastCommittedItem()->GetURL());
+}
+
+// Tests that calling |Reload| with web::ReloadType::ORIGINAL_REQUEST_URL
+// changes the renderer initiated pending item's url to its original request url
+// when there is one.
+TEST_F(NavigationManagerTest, ReloadRendererPendingItemWithOriginalType) {
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::RENDERER_INITIATED);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ GURL expected_original_url = GURL("http://www.url.com/original");
+ navigation_manager()->GetPendingItem()->SetOriginalRequestURL(
+ expected_original_url);
+
+ navigation_manager()->Reload(web::ReloadType::ORIGINAL_REQUEST_URL,
+ false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(expected_original_url,
+ navigation_manager()->GetPendingItem()->GetURL());
+}
+
+// Tests that calling |Reload| with web::ReloadType::ORIGINAL_REQUEST_URL
+// changes the user initiated pending item's url to its original request url
+// when there is one.
+TEST_F(NavigationManagerTest, ReloadUserPendingItemWithOriginalType) {
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ GURL expected_original_url = GURL("http://www.url.com/original");
+ navigation_manager()->GetPendingItem()->SetOriginalRequestURL(
+ expected_original_url);
+
+ navigation_manager()->Reload(web::ReloadType::ORIGINAL_REQUEST_URL,
+ false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(expected_original_url,
+ navigation_manager()->GetPendingItem()->GetURL());
+}
+
+// Tests that calling |Reload| with web::ReloadType::ORIGINAL_REQUEST_URL
+// changes the last committed item's url to its original request url when there
+// is no pending item.
+TEST_F(NavigationManagerTest, ReloadLastCommittedItemWithOriginalType) {
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ [session_controller() commitPendingItem];
+
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ GURL expected_original_url = GURL("http://www.url.com/1/original");
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ navigation_manager()->GetPendingItem()->SetOriginalRequestURL(
+ expected_original_url);
+ [session_controller() commitPendingItem];
+
+ navigation_manager()->Reload(web::ReloadType::ORIGINAL_REQUEST_URL,
+ false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
+
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_EQ(expected_original_url,
+ navigation_manager()->GetLastCommittedItem()->GetURL());
+}
+
+// Tests that calling |Reload| with web::ReloadType::ORIGINAL_REQUEST_URL
+// changes the last committed item's url to its original request url when there
+// is no pending item, but there are forward items after last committed item.
+TEST_F(NavigationManagerTest,
+ ReloadLastCommittedItemWithOriginalTypeWithForwardItems) {
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ [session_controller() commitPendingItem];
+
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ GURL expected_original_url = GURL("http://www.url.com/1/original");
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ navigation_manager()->GetPendingItem()->SetOriginalRequestURL(
+ expected_original_url);
+ [session_controller() commitPendingItem];
+
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.url.com/2"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED);
+ [session_controller() commitPendingItem];
+
+ [session_controller() goToItemAtIndex:1];
+ EXPECT_EQ(1, navigation_manager()->GetLastCommittedItemIndex());
+
+ navigation_manager()->Reload(web::ReloadType::ORIGINAL_REQUEST_URL,
+ false /* check_for_repost */);
+ EXPECT_TRUE(navigation_manager_delegate().reload_called());
+
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_EQ(expected_original_url,
+ navigation_manager()->GetLastCommittedItem()->GetURL());
}
} // namespace web
« ios/web/navigation/navigation_manager_impl.mm ('K') | « ios/web/navigation/navigation_manager_impl.mm ('k') | ios/web/public/reload_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698