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

Side by Side Diff: ios/web/navigation/navigation_manager_util_unittest.mm

Issue 2901293003: Made renderer-initiated requests registration more reliable. (Closed)
Patch Set: Cleaned up Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ios/web/navigation/navigation_manager_util.h" 5 #include "ios/web/navigation/navigation_manager_util.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #import "ios/web/navigation/crw_session_controller+private_constructors.h" 8 #import "ios/web/navigation/crw_session_controller+private_constructors.h"
9 #import "ios/web/navigation/crw_session_controller.h" 9 #import "ios/web/navigation/crw_session_controller.h"
10 #import "ios/web/navigation/navigation_manager_impl.h" 10 #import "ios/web/navigation/navigation_manager_impl.h"
(...skipping 16 matching lines...) Expand all
27 manager_.SetSessionController(controller_); 27 manager_.SetSessionController(controller_);
28 } 28 }
29 29
30 NavigationManagerImpl manager_; 30 NavigationManagerImpl manager_;
31 CRWSessionController* controller_; 31 CRWSessionController* controller_;
32 32
33 private: 33 private:
34 TestBrowserState browser_state_; 34 TestBrowserState browser_state_;
35 }; 35 };
36 36
37 // Tests GetCommittedItemWithUniqueID and GetCommittedItemIndexWithUniqueID 37 // Tests GetCommittedItemWithUniqueID, GetCommittedItemIndexWithUniqueID and
38 // functions. 38 // GetItemWithUniqueID functions.
39 TEST_F(NavigationManagerUtilTest, GetCommittedItemWithUniqueID) { 39 TEST_F(NavigationManagerUtilTest, GetCommittedItemWithUniqueID) {
40 // Start with NavigationManager that only has a pending item. 40 // Start with NavigationManager that only has a pending item.
41 manager_.AddPendingItem( 41 manager_.AddPendingItem(
42 GURL("http://chromium.org"), Referrer(), ui::PAGE_TRANSITION_TYPED, 42 GURL("http://chromium.org"), Referrer(), ui::PAGE_TRANSITION_TYPED,
43 web::NavigationInitiationType::USER_INITIATED, 43 web::NavigationInitiationType::USER_INITIATED,
44 web::NavigationManager::UserAgentOverrideOption::INHERIT); 44 web::NavigationManager::UserAgentOverrideOption::INHERIT);
45 NavigationItem* item = manager_.GetPendingItem(); 45 NavigationItem* item = manager_.GetPendingItem();
46 int unique_id = item->GetUniqueID(); 46 int unique_id = item->GetUniqueID();
47 EXPECT_FALSE(GetCommittedItemWithUniqueID(&manager_, unique_id)); 47 EXPECT_FALSE(GetCommittedItemWithUniqueID(&manager_, unique_id));
48 EXPECT_EQ(item, GetItemWithUniqueID(&manager_, unique_id));
48 EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(&manager_, unique_id)); 49 EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(&manager_, unique_id));
49 50
50 // Commit that pending item. 51 // Commit that pending item.
51 [controller_ commitPendingItem]; 52 [controller_ commitPendingItem];
52 EXPECT_EQ(item, GetCommittedItemWithUniqueID(&manager_, unique_id)); 53 EXPECT_EQ(item, GetCommittedItemWithUniqueID(&manager_, unique_id));
54 EXPECT_EQ(item, GetItemWithUniqueID(&manager_, unique_id));
53 EXPECT_EQ(0, GetCommittedItemIndexWithUniqueID(&manager_, unique_id)); 55 EXPECT_EQ(0, GetCommittedItemIndexWithUniqueID(&manager_, unique_id));
54 56
55 // Remove committed item. 57 // Remove committed item.
56 manager_.RemoveItemAtIndex(0); 58 manager_.RemoveItemAtIndex(0);
57 EXPECT_FALSE(GetCommittedItemWithUniqueID(&manager_, unique_id)); 59 EXPECT_FALSE(GetCommittedItemWithUniqueID(&manager_, unique_id));
60 EXPECT_FALSE(GetItemWithUniqueID(&manager_, unique_id));
61 EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(&manager_, unique_id));
62
63 // Add transient item.
64 [controller_ addTransientItemWithURL:GURL("http://chromium.org")];
65 item = manager_.GetTransientItem();
66 EXPECT_FALSE(GetCommittedItemWithUniqueID(&manager_, unique_id));
67 EXPECT_EQ(item, GetItemWithUniqueID(&manager_, unique_id));
58 EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(&manager_, unique_id)); 68 EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(&manager_, unique_id));
59 } 69 }
60 70
61 } // namespace web 71 } // namespace web
OLDNEW
« no previous file with comments | « ios/web/navigation/navigation_manager_util.mm ('k') | ios/web/web_state/ui/crw_web_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698