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

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

Issue 2942103002: Fix failing NavigationManagerUtil test that wasn't being run. (Closed)
Patch Set: rebase Created 3 years, 6 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
« no previous file with comments | « ios/web/BUILD.gn ('k') | ios/web/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/navigation_manager_util_unittest.mm
diff --git a/ios/web/navigation/navigation_manager_util_unittest.mm b/ios/web/navigation/navigation_manager_util_unittest.mm
index 4b343cb2b2caa42ddc37ce8e8e3d9c1eb6dd4a75..6a309394d42dbcb82c925c0b3d417d485af44967 100644
--- a/ios/web/navigation/navigation_manager_util_unittest.mm
+++ b/ios/web/navigation/navigation_manager_util_unittest.mm
@@ -10,6 +10,7 @@
#import "ios/web/navigation/legacy_navigation_manager_impl.h"
#import "ios/web/public/navigation_item.h"
#include "ios/web/public/test/fakes/test_browser_state.h"
+#import "ios/web/test/fakes/test_navigation_manager_delegate.h"
#include "testing/platform_test.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -31,6 +32,8 @@
bool test_legacy_navigation_manager = GetParam();
if (test_legacy_navigation_manager) {
manager_.reset(new LegacyNavigationManagerImpl);
+ manager_->SetBrowserState(&browser_state_);
+ manager_->SetDelegate(&delegate_);
manager_->SetSessionController(controller_);
} else {
DCHECK(false) << "Not yet implemented.";
@@ -38,6 +41,7 @@
}
std::unique_ptr<NavigationManagerImpl> manager_;
+ web::TestNavigationManagerDelegate delegate_;
CRWSessionController* controller_;
private:
@@ -46,9 +50,7 @@
// Tests GetCommittedItemWithUniqueID, GetCommittedItemIndexWithUniqueID and
// GetItemWithUniqueID functions.
-// TODO(crbug.com/733658): test was incorrectly moved to a separate target
-// and not run and a refactoring broke it. Disable until the issue is fixed.
-TEST_P(NavigationManagerUtilTest, DISABLED_GetCommittedItemWithUniqueID) {
+TEST_P(NavigationManagerUtilTest, GetCommittedItemWithUniqueID) {
// Start with NavigationManager that only has a pending item.
manager_->AddPendingItem(
GURL("http://chromium.org"), Referrer(), ui::PAGE_TRANSITION_TYPED,
@@ -61,12 +63,18 @@
EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(manager_.get(), unique_id));
// Commit that pending item.
- [controller_ commitPendingItem];
+ manager_->CommitPendingItem();
EXPECT_EQ(item, GetCommittedItemWithUniqueID(manager_.get(), unique_id));
EXPECT_EQ(item, GetItemWithUniqueID(manager_.get(), unique_id));
EXPECT_EQ(0, GetCommittedItemIndexWithUniqueID(manager_.get(), unique_id));
- // Remove committed item.
+ // Commit another navigation so that the current item is updated. This allows
+ // for removing the item with |unique_id|.
+ manager_->AddPendingItem(
+ GURL("http://test.org"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ manager_->CommitPendingItem();
manager_->RemoveItemAtIndex(0);
EXPECT_FALSE(GetCommittedItemWithUniqueID(manager_.get(), unique_id));
EXPECT_FALSE(GetItemWithUniqueID(manager_.get(), unique_id));
@@ -75,6 +83,7 @@
// Add transient item.
[controller_ addTransientItemWithURL:GURL("http://chromium.org")];
item = manager_->GetTransientItem();
+ unique_id = item->GetUniqueID();
EXPECT_FALSE(GetCommittedItemWithUniqueID(manager_.get(), unique_id));
EXPECT_EQ(item, GetItemWithUniqueID(manager_.get(), unique_id));
EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(manager_.get(), unique_id));
« no previous file with comments | « ios/web/BUILD.gn ('k') | ios/web/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698