ios/web/navigation/crw_session_controller_unittest.mm - Issue 2699243002: Remove CRWSessionEntry from CRWSessionController's unittests.

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

Issue 2699243002: Remove CRWSessionEntry from CRWSessionController's unittests. (Closed)

Patch Set: Created 3 years, 10 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

Index: ios/web/navigation/crw_session_controller_unittest.mm

diff --git a/ios/web/navigation/crw_session_controller_unittest.mm b/ios/web/navigation/crw_session_controller_unittest.mm

index 40b2c18c8896dd6b4ff8b8883cc8c9aef5561da5..85e11d481a435b3394160776a81cd0d88dae6d83 100644

--- a/ios/web/navigation/crw_session_controller_unittest.mm

+++ b/ios/web/navigation/crw_session_controller_unittest.mm

@@ -13,7 +13,6 @@

#include "base/memory/ptr_util.h"

#include "base/strings/sys_string_conversions.h"

#import "ios/web/navigation/crw_session_controller+private_constructors.h"

-#import "ios/web/navigation/crw_session_entry.h"

#import "ios/web/navigation/navigation_item_impl.h"

#include "ios/web/public/referrer.h"

#include "ios/web/public/test/fakes/test_browser_state.h"

@@ -24,20 +23,20 @@

#include "testing/platform_test.h"

@interface CRWSessionController (Testing)

-- (const GURL&)URLForSessionAtIndex:(NSUInteger)index;

-- (const GURL&)currentURL;

+- (GURL)URLForItemAtIndex:(size_t)index;

+- (GURL)currentURL;

@end

@implementation CRWSessionController (Testing)

-- (const GURL&)URLForSessionAtIndex:(NSUInteger)index {

- CRWSessionEntry* entry =

- static_cast<CRWSessionEntry*>([self.entries objectAtIndex:index]);

- return entry.navigationItem->GetURL();

+- (GURL)URLForItemAtIndex:(size_t)index {

+ web::NavigationItemList items = self.items;

+ if (index < items.size())

+ return items[index]->GetURL();

+ return GURL();

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 nit: GURL::EmptyURL() and you can keep the only re

kkhorimoto 2017/03/02 01:11:48 Maybe this was removed, but I can't seem to find G

Eugene But (OOO till 7-30) 2017/03/02 02:02:15 Sorry, EmptyGURL

}

-- (const GURL&)currentURL {

- DCHECK([self currentEntry]);

- return [self currentEntry].navigationItem->GetURL();

+- (GURL)currentURL {

+ return self.currentItem ? self.currentItem->GetURL() : GURL();

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 ditto

kkhorimoto 2017/03/02 01:11:48 Acknowledged.

}

@end

@@ -67,8 +66,8 @@ void SetUp() override {

EXPECT_NSEQ(@"test window", [session_controller_ windowName]);

EXPECT_NSEQ(@"opener", [session_controller_ openerId]);

EXPECT_FALSE([session_controller_ isOpenedByDOM]);

- EXPECT_EQ(0U, [[session_controller_ entries] count]);

- EXPECT_EQ(nil, [session_controller_ currentEntry]);

+ EXPECT_TRUE([session_controller_ items].empty());

+ EXPECT_EQ(nullptr, [session_controller_ currentItem]);

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 nit: EXPECT_FALSE

kkhorimoto 2017/03/02 01:11:48 Done.

}

// Tests session controller state after setting a pending index.

@@ -82,8 +81,8 @@ void SetUp() override {

EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);

[session_controller_ setPendingItemIndex:0];

EXPECT_EQ(0, [session_controller_ pendingItemIndex]);

- EXPECT_EQ([[session_controller_ entries] lastObject],

- [session_controller_ pendingEntry]);

+ EXPECT_EQ([session_controller_ items].back(),

+ [session_controller_ pendingItem]);

}

TEST_F(CRWSessionControllerTest, addPendingItem) {

@@ -92,13 +91,13 @@ void SetUp() override {

transition:ui::PAGE_TRANSITION_TYPED

rendererInitiated:NO];

- EXPECT_EQ(0U, [[session_controller_ entries] count]);

+ EXPECT_TRUE([session_controller_ items].empty());

EXPECT_EQ(

GURL("http://www.url.com/"),

[session_controller_ currentURL]);

}

-TEST_F(CRWSessionControllerTest, addPendingItemWithCommittedEntries) {

+TEST_F(CRWSessionControllerTest, addPendingItemWithCommittedItems) {

[session_controller_ addPendingItem:GURL("http://www.committed.url.com")

referrer:MakeReferrer("http://www.referer.com")

transition:ui::PAGE_TRANSITION_TYPED

@@ -110,17 +109,16 @@ void SetUp() override {

transition:ui::PAGE_TRANSITION_TYPED

rendererInitiated:NO];

- EXPECT_EQ(1U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- GURL("http://www.committed.url.com/"),

- [session_controller_ URLForSessionAtIndex:0U]);

+ EXPECT_EQ(1U, [session_controller_ items].size());

+ EXPECT_EQ(GURL("http://www.committed.url.com/"),

+ [session_controller_ URLForItemAtIndex:0U]);

EXPECT_EQ(

GURL("http://www.url.com/"),

[session_controller_ currentURL]);

}

-// Tests that adding a pending entry resets pending entry index.

-TEST_F(CRWSessionControllerTest, addPendingItemWithExisingPendingEntryIndex) {

+// Tests that adding a pending item resets pending item index.

+TEST_F(CRWSessionControllerTest, addPendingItemWithExisingPendingItemIndex) {

[session_controller_ addPendingItem:GURL("http://www.example.com")

referrer:web::Referrer()

transition:ui::PAGE_TRANSITION_TYPED

@@ -132,19 +130,19 @@ void SetUp() override {

rendererInitiated:NO];

[session_controller_ commitPendingItem];

- // Set 0 as pending entry index.

+ // Set 0 as pending item index.

[session_controller_ setPendingItemIndex:0];

EXPECT_EQ(GURL("http://www.example.com/"),

- [[session_controller_ pendingEntry] navigationItem]->GetURL());

+ [session_controller_ pendingItem]->GetURL());

EXPECT_EQ(0, [session_controller_ pendingItemIndex]);

- // Add a pending entry, which should drop pending navigation index.

+ // Add a pending item, which should drop pending navigation index.

[session_controller_ addPendingItem:GURL("http://www.example.com/1")

referrer:web::Referrer()

transition:ui::PAGE_TRANSITION_TYPED

rendererInitiated:NO];

EXPECT_EQ(GURL("http://www.example.com/1"),

- [[session_controller_ pendingEntry] navigationItem]->GetURL());

+ [session_controller_ pendingItem]->GetURL());

EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);

}

@@ -159,7 +157,7 @@ void SetUp() override {

transition:ui::PAGE_TRANSITION_TYPED

rendererInitiated:NO];

- EXPECT_EQ(0U, [[session_controller_ entries] count]);

+ EXPECT_TRUE([session_controller_ items].empty());

EXPECT_EQ(

GURL("http://www.another.url.com/"),

[session_controller_ currentURL]);

@@ -172,13 +170,11 @@ void SetUp() override {

rendererInitiated:NO];

[session_controller_ commitPendingItem];

- EXPECT_EQ(1U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- GURL("http://www.url.com/"),

- [session_controller_ URLForSessionAtIndex:0U]);

- EXPECT_EQ(

- [[session_controller_ entries] objectAtIndex:0U],

- [session_controller_ currentEntry]);

+ EXPECT_EQ(1U, [session_controller_ items].size());

+ EXPECT_EQ(GURL("http://www.url.com/"),

+ [session_controller_ URLForItemAtIndex:0U]);

+ EXPECT_EQ([session_controller_ items].front(),

+ [session_controller_ currentItem]);

}

TEST_F(CRWSessionControllerTest, addPendingItemOverridingAndCommit) {

@@ -193,13 +189,11 @@ void SetUp() override {

rendererInitiated:NO];

[session_controller_ commitPendingItem];

- EXPECT_EQ(1U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- GURL("http://www.another.url.com/"),

- [session_controller_ URLForSessionAtIndex:0U]);

- EXPECT_EQ(

- [[session_controller_ entries] objectAtIndex:0U],

- [session_controller_ currentEntry]);

+ EXPECT_EQ(1U, [session_controller_ items].size());

+ EXPECT_EQ(GURL("http://www.another.url.com/"),

+ [session_controller_ URLForItemAtIndex:0U]);

+ EXPECT_EQ([session_controller_ items].front(),

+ [session_controller_ currentItem]);

}

TEST_F(CRWSessionControllerTest, addPendingItemAndCommitMultiple) {

@@ -216,16 +210,12 @@ void SetUp() override {

rendererInitiated:NO];

[session_controller_ commitPendingItem];

- EXPECT_EQ(2U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- GURL("http://www.url.com/"),

- [session_controller_ URLForSessionAtIndex:0U]);

- EXPECT_EQ(

- GURL("http://www.another.url.com/"),

- [session_controller_ URLForSessionAtIndex:1U]);

- EXPECT_EQ(

- [[session_controller_ entries] objectAtIndex:1U],

- [session_controller_ currentEntry]);

+ EXPECT_EQ(2U, [session_controller_ items].size());

+ EXPECT_EQ(GURL("http://www.url.com/"),

+ [session_controller_ URLForItemAtIndex:0U]);

+ EXPECT_EQ(GURL("http://www.another.url.com/"),

+ [session_controller_ URLForItemAtIndex:1U]);

+ EXPECT_EQ([session_controller_ items][1U], [session_controller_ currentItem]);

}

TEST_F(CRWSessionControllerTest, addPendingItemAndDiscard) {

@@ -235,11 +225,11 @@ void SetUp() override {

rendererInitiated:NO];

[session_controller_ discardNonCommittedItems];

- EXPECT_EQ(0U, [[session_controller_ entries] count]);

- EXPECT_EQ(nil, [session_controller_ currentEntry]);

+ EXPECT_TRUE([session_controller_ items].empty());

+ EXPECT_EQ(nullptr, [session_controller_ currentItem]);

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 ditto

kkhorimoto 2017/03/02 01:11:48 Done.

}

-// Tests discarding pending entry added via |setPendingItemIndex:| call.

+// Tests discarding pending item added via |setPendingItemIndex:| call.

TEST_F(CRWSessionControllerTest, setPendingItemIndexAndDiscard) {

[session_controller_ addPendingItem:GURL("http://www.example.com")

referrer:web::Referrer()

@@ -248,11 +238,11 @@ void SetUp() override {

[session_controller_ commitPendingItem];

[session_controller_ setPendingItemIndex:0];

- EXPECT_TRUE([session_controller_ pendingEntry]);

+ EXPECT_TRUE([session_controller_ pendingItem]);

EXPECT_EQ(0, [session_controller_ pendingItemIndex]);

[session_controller_ discardNonCommittedItems];

- EXPECT_FALSE([session_controller_ pendingEntry]);

+ EXPECT_FALSE([session_controller_ pendingItem]);

EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);

}

@@ -269,13 +259,11 @@ void SetUp() override {

rendererInitiated:NO];

[session_controller_ commitPendingItem];

- EXPECT_EQ(1U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- GURL("http://www.another.url.com/"),

- [session_controller_ URLForSessionAtIndex:0U]);

- EXPECT_EQ(

- [[session_controller_ entries] objectAtIndex:0U],

- [session_controller_ currentEntry]);

+ EXPECT_EQ(1U, [session_controller_ items].size());

+ EXPECT_EQ(GURL("http://www.another.url.com/"),

+ [session_controller_ URLForItemAtIndex:0U]);

+ EXPECT_EQ([session_controller_ items].front(),

+ [session_controller_ currentItem]);

}

TEST_F(CRWSessionControllerTest, addPendingItemAndCommitAndAddAndDiscard) {

@@ -291,43 +279,40 @@ void SetUp() override {

rendererInitiated:NO];

[session_controller_ discardNonCommittedItems];

- EXPECT_EQ(1U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- GURL("http://www.url.com/"),

- [session_controller_ URLForSessionAtIndex:0U]);

- EXPECT_EQ(

- [[session_controller_ entries] objectAtIndex:0U],

- [session_controller_ currentEntry]);

+ EXPECT_EQ(1U, [session_controller_ items].size());

+ EXPECT_EQ(GURL("http://www.url.com/"),

+ [session_controller_ URLForItemAtIndex:0U]);

+ EXPECT_EQ([session_controller_ items].front(),

+ [session_controller_ currentItem]);

}

TEST_F(CRWSessionControllerTest,

- commitPendingItemWithoutPendingOrCommittedEntry) {

+ commitPendingItemWithoutPendingOrCommittedItem) {

[session_controller_ commitPendingItem];

- EXPECT_EQ(0U, [[session_controller_ entries] count]);

- EXPECT_EQ(nil, [session_controller_ currentEntry]);

+ EXPECT_TRUE([session_controller_ items].empty());

+ EXPECT_EQ(nullptr, [session_controller_ currentItem]);

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 ditto

kkhorimoto 2017/03/02 01:11:47 Done.

}

TEST_F(CRWSessionControllerTest,

- commitPendingItemWithoutPendingEntryWithCommittedEntry) {

- // Setup committed entry

+ commitPendingItemWithoutPendingItemWithCommittedItem) {

+ // Setup committed item

[session_controller_ addPendingItem:GURL("http://www.url.com")

referrer:MakeReferrer("http://www.referer.com")

transition:ui::PAGE_TRANSITION_TYPED

rendererInitiated:NO];

[session_controller_ commitPendingItem];

- // Commit pending entry when there is no such one

+ // Commit pending item when there is no such one

[session_controller_ commitPendingItem];

- EXPECT_EQ(1U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- [[session_controller_ entries] objectAtIndex:0U],

- [session_controller_ currentEntry]);

+ EXPECT_EQ(1U, [session_controller_ items].size());

+ EXPECT_EQ([session_controller_ items].front(),

+ [session_controller_ currentItem]);

}

-// Tests that forward entries are discarded after navigation entry is committed.

-TEST_F(CRWSessionControllerTest, commitPendingItemWithExistingForwardEntries) {

+// Tests that forward entries are discarded after navigation item is committed.

+TEST_F(CRWSessionControllerTest, commitPendingItemWithExistingForwardItems) {

// Make 3 entries.

[session_controller_ addPendingItem:GURL("http://www.example.com/0")

referrer:MakeReferrer("http://www.example.com/a")

@@ -345,10 +330,10 @@ void SetUp() override {

rendererInitiated:YES];

[session_controller_ commitPendingItem];

- // Go back to the first entry.

+ // Go back to the first item.

[session_controller_ goToItemAtIndex:0];

- // Create and commit a new pending entry.

+ // Create and commit a new pending item.

[session_controller_ addPendingItem:GURL("http://www.example.com/2")

referrer:MakeReferrer("http://www.example.com/c")

transition:ui::PAGE_TRANSITION_LINK

@@ -356,13 +341,13 @@ void SetUp() override {

[session_controller_ commitPendingItem];

// All forward entries should go away.

- EXPECT_EQ(2U, [[session_controller_ entries] count]);

- EXPECT_EQ(0U, [[session_controller_ forwardEntries] count]);

+ EXPECT_EQ(2U, [session_controller_ items].size());

+ EXPECT_EQ(0U, [session_controller_ forwardItems].size());

ASSERT_EQ(1, [session_controller_ currentNavigationIndex]);

ASSERT_EQ(0, [session_controller_ previousNavigationIndex]);

}

-// Tests committing pending entry index from the middle.

+// Tests committing pending item index from the middle.

TEST_F(CRWSessionControllerTest, commitPendingItemIndex) {

[session_controller_ addPendingItem:GURL("http://www.example.com/0")

referrer:web::Referrer()

@@ -379,40 +364,39 @@ void SetUp() override {

transition:ui::PAGE_TRANSITION_TYPED

rendererInitiated:NO];

[session_controller_ commitPendingItem];

- ASSERT_EQ(3U, [[session_controller_ entries] count]);

+ ASSERT_EQ(3U, [session_controller_ items].size());

- // Go to the middle, and commit first pending entry index.

+ // Go to the middle, and commit first pending item index.

[session_controller_ goToItemAtIndex:1];

[session_controller_ setPendingItemIndex:0];

ASSERT_EQ(0, [session_controller_ pendingItemIndex]);

- base::scoped_nsobject<CRWSessionEntry> pendingEntry(

- [[session_controller_ pendingEntry] retain]);

- ASSERT_TRUE(pendingEntry);

+ web::NavigationItem* pendingItem = [session_controller_ pendingItem];

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 Do you want to drop this variable?

kkhorimoto 2017/03/02 01:11:48 It's used below as well.

+ ASSERT_NE(nullptr, pendingItem);

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 nit: EXPECT_TRUE

kkhorimoto 2017/03/02 01:11:48 Done.

ASSERT_EQ(1, [session_controller_ currentNavigationIndex]);

EXPECT_EQ(2, [session_controller_ previousNavigationIndex]);

[session_controller_ commitPendingItem];

- // Verify that pending entry has been committed and current and previous entry

+ // Verify that pending item has been committed and current and previous item

// indices updated.

- EXPECT_EQ(pendingEntry, [session_controller_ lastCommittedEntry]);

+ EXPECT_EQ([session_controller_ lastCommittedItem], pendingItem);

EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);

- EXPECT_FALSE([session_controller_ pendingEntry]);

+ EXPECT_FALSE([session_controller_ pendingItem]);

EXPECT_EQ(0, [session_controller_ currentNavigationIndex]);

EXPECT_EQ(1, [session_controller_ previousNavigationIndex]);

- EXPECT_EQ(3U, [[session_controller_ entries] count]);

+ EXPECT_EQ(3U, [session_controller_ items].size());

}

TEST_F(CRWSessionControllerTest,

- DiscardPendingEntryWithoutPendingOrCommittedEntry) {

+ DiscardPendingItemWithoutPendingOrCommittedItem) {

[session_controller_ discardNonCommittedItems];

- EXPECT_EQ(0U, [[session_controller_ entries] count]);

- EXPECT_EQ(nil, [session_controller_ currentEntry]);

+ EXPECT_TRUE([session_controller_ items].empty());

+ EXPECT_EQ(nullptr, [session_controller_ currentItem]);

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 nit: EXPECT_FALSE

kkhorimoto 2017/03/02 01:11:48 Done.

}

TEST_F(CRWSessionControllerTest,

- DiscardPendingEntryWithoutPendingEntryWithCommittedEntry) {

- // Setup committed entry

+ DiscardPendingItemWithoutPendingItemWithCommittedItem) {

+ // Setup committed item

[session_controller_ addPendingItem:GURL("http://www.url.com")

referrer:MakeReferrer("http://www.referer.com")

transition:ui::PAGE_TRANSITION_TYPED

@@ -422,21 +406,20 @@ void SetUp() override {

// Discard noncommitted entries when there is no such one

[session_controller_ discardNonCommittedItems];

- EXPECT_EQ(1U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- [[session_controller_ entries] objectAtIndex:0U],

- [session_controller_ currentEntry]);

+ EXPECT_EQ(1U, [session_controller_ items].size());

+ EXPECT_EQ([session_controller_ items].front(),

+ [session_controller_ currentItem]);

}

-TEST_F(CRWSessionControllerTest, updatePendingItemWithoutPendingEntry) {

+TEST_F(CRWSessionControllerTest, updatePendingItemWithoutPendingItem) {

[session_controller_ updatePendingItem:GURL("http://www.another.url.com")];

[session_controller_ commitPendingItem];

- EXPECT_EQ(0U, [[session_controller_ entries] count]);

- EXPECT_EQ(nil, [session_controller_ currentEntry]);

+ EXPECT_TRUE([session_controller_ items].empty());

+ EXPECT_EQ(nullptr, [session_controller_ currentItem]);

Eugene But (OOO till 7-30) 2017/02/23 16:55:17 ditto

kkhorimoto 2017/03/02 01:11:48 Done.

}

-TEST_F(CRWSessionControllerTest, updatePendingItemWithPendingEntry) {

+TEST_F(CRWSessionControllerTest, updatePendingItemWithPendingItem) {

[session_controller_ addPendingItem:GURL("http://www.url.com")

referrer:MakeReferrer("http://www.referer.com")

transition:ui::PAGE_TRANSITION_TYPED

@@ -449,7 +432,7 @@ void SetUp() override {

}

TEST_F(CRWSessionControllerTest,

- updatePendingItemWithPendingEntryAlreadyCommited) {

+ updatePendingItemWithPendingItemAlreadyCommited) {

[session_controller_ addPendingItem:GURL("http://www.url.com")

referrer:MakeReferrer("http://www.referer.com")

transition:ui::PAGE_TRANSITION_TYPED

@@ -458,18 +441,16 @@ void SetUp() override {

[session_controller_ updatePendingItem:GURL("http://www.another.url.com")];

[session_controller_ commitPendingItem];

- EXPECT_EQ(1U, [[session_controller_ entries] count]);

- EXPECT_EQ(

- GURL("http://www.url.com/"),

- [session_controller_ URLForSessionAtIndex:0U]);

- EXPECT_EQ(

- [[session_controller_ entries] objectAtIndex:0U],

- [session_controller_ currentEntry]);

+ EXPECT_EQ(1U, [session_controller_ items].size());

+ EXPECT_EQ(GURL("http://www.url.com/"),

+ [session_controller_ URLForItemAtIndex:0U]);

+ EXPECT_EQ([session_controller_ items].front(),

+ [session_controller_ currentItem]);

}

// Tests inserting session controller state.

TEST_F(CRWSessionControllerTest, InsertState) {

- // Add 1 committed and 1 pending entry to target controller.

+ // Add 1 committed and 1 pending item to target controller.

[session_controller_ addPendingItem:GURL("http://www.url.com/2")

referrer:web::Referrer()

transition:ui::PAGE_TRANSITION_TYPED

@@ -480,7 +461,7 @@ void SetUp() override {

transition:ui::PAGE_TRANSITION_TYPED

rendererInitiated:NO];

- // Create source session controller with 1 committed entry.

+ // Create source session controller with 1 committed item.

base::scoped_nsobject<CRWSessionController> other_session_controller(

[[CRWSessionController alloc] initWithWindowName:nil

openerId:nil

@@ -503,17 +484,17 @@ void SetUp() override {

insertStateFromSessionController:other_session_controller.get()];

EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);

- EXPECT_EQ(2U, [[session_controller_ entries] count]);

+ EXPECT_EQ(2U, [session_controller_ items].size());

EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);

EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);

EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);

EXPECT_EQ(GURL("http://www.url.com/0"),

- [session_controller_ URLForSessionAtIndex:0]);

+ [session_controller_ URLForItemAtIndex:0]);

EXPECT_EQ(GURL("http://www.url.com/2"),

- [session_controller_ URLForSessionAtIndex:1]);

+ [session_controller_ URLForItemAtIndex:1]);

EXPECT_EQ(GURL("http://www.url.com/3"),

- [[session_controller_ pendingEntry] navigationItem]->GetURL());

+ [session_controller_ pendingItem]->GetURL());

}

// Tests inserting session controller state from empty session controller.

@@ -544,21 +525,21 @@ void SetUp() override {

insertStateFromSessionController:other_session_controller.get()];

EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);

- EXPECT_EQ(2U, [[session_controller_ entries] count]);

+ EXPECT_EQ(2U, [session_controller_ items].size());

EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);

EXPECT_EQ(0, [session_controller_ previousNavigationIndex]);

EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);

- EXPECT_FALSE([session_controller_ pendingEntry]);

+ EXPECT_FALSE([session_controller_ pendingItem]);

EXPECT_EQ(GURL("http://www.url.com/0"),

- [session_controller_ URLForSessionAtIndex:0]);

+ [session_controller_ URLForItemAtIndex:0]);

EXPECT_EQ(GURL("http://www.url.com/1"),

- [session_controller_ URLForSessionAtIndex:1]);

+ [session_controller_ URLForItemAtIndex:1]);

}

// Tests inserting session controller state to empty session controller.

TEST_F(CRWSessionControllerTest, InsertStateToEmptySessionController) {

// Create source session controller with 2 committed entries and one

- // pending entry.

+ // pending item.

base::scoped_nsobject<CRWSessionController> other_session_controller(

[[CRWSessionController alloc] initWithWindowName:nil

openerId:nil

@@ -586,22 +567,22 @@ void SetUp() override {

insertStateFromSessionController:other_session_controller.get()];

EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);

- EXPECT_EQ(2U, [[session_controller_ entries] count]);

+ EXPECT_EQ(2U, [session_controller_ items].size());

EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);

EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);

EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);

- EXPECT_FALSE([session_controller_ pendingEntry]);

+ EXPECT_FALSE([session_controller_ pendingItem]);

EXPECT_EQ(GURL("http://www.url.com/0"),

- [session_controller_ URLForSessionAtIndex:0]);

+ [session_controller_ URLForItemAtIndex:0]);

EXPECT_EQ(GURL("http://www.url.com/1"),

- [session_controller_ URLForSessionAtIndex:1]);

+ [session_controller_ URLForItemAtIndex:1]);

}

-// Tests inserting session controller state. Verifies that pending entry index

+// Tests inserting session controller state. Verifies that pending item index

// remains valid.

TEST_F(CRWSessionControllerTest,

- InsertStateWithPendingEntryIndexInTargetController) {

- // Add 2 committed entries and make the first entry pending.

+ InsertStateWithPendingItemIndexInTargetController) {

+ // Add 2 committed entries and make the first item pending.

[session_controller_ addPendingItem:GURL("http://www.url.com/2")

referrer:web::Referrer()

transition:ui::PAGE_TRANSITION_TYPED

@@ -614,7 +595,7 @@ void SetUp() override {

[session_controller_ commitPendingItem];

[session_controller_ setPendingItemIndex:0];

- // Create source session controller with 1 committed entry.

+ // Create source session controller with 1 committed item.

base::scoped_nsobject<CRWSessionController> other_session_controller(

[[CRWSessionController alloc] initWithWindowName:nil

openerId:nil

@@ -633,25 +614,25 @@ void SetUp() override {

insertStateFromSessionController:other_session_controller.get()];

EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);

- EXPECT_EQ(3U, [[session_controller_ entries] count]);

+ EXPECT_EQ(3U, [session_controller_ items].size());

EXPECT_EQ(2, [session_controller_ currentNavigationIndex]);

EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);

EXPECT_EQ(1, [session_controller_ pendingItemIndex]);

EXPECT_EQ(GURL("http://www.url.com/0"),

- [session_controller_ URLForSessionAtIndex:0]);

+ [session_controller_ URLForItemAtIndex:0]);

EXPECT_EQ(GURL("http://www.url.com/2"),

- [session_controller_ URLForSessionAtIndex:1]);

+ [session_controller_ URLForItemAtIndex:1]);

EXPECT_EQ(GURL("http://www.url.com/2"),

- [[session_controller_ pendingEntry] navigationItem]->GetURL());

+ [session_controller_ pendingItem]->GetURL());

}

// Tests state of an empty session controller.

TEST_F(CRWSessionControllerTest, EmptyController) {

- EXPECT_EQ(0U, [[session_controller_ entries] count]);

+ EXPECT_TRUE([session_controller_ items].empty());

EXPECT_EQ(-1, [session_controller_ currentNavigationIndex]);

EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);

- EXPECT_FALSE([session_controller_ currentEntry]);

- EXPECT_FALSE([session_controller_ pendingEntry]);

+ EXPECT_FALSE([session_controller_ currentItem]);

+ EXPECT_FALSE([session_controller_ pendingItem]);

EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);

}

@@ -678,10 +659,10 @@ void SetUp() override {

[[CRWSessionController alloc] initWithNavigationItems:std::move(items)

currentIndex:0

browserState:&browser_state_]);

- EXPECT_EQ(controller.get().entries.count, 0U);

+ EXPECT_TRUE(controller.get().items.empty());

EXPECT_EQ(controller.get().currentNavigationIndex, -1);

EXPECT_EQ(controller.get().previousNavigationIndex, -1);

- EXPECT_FALSE(controller.get().currentEntry);

+ EXPECT_FALSE(controller.get().currentItem);

}

TEST_F(CRWSessionControllerTest, CreateWithNavList) {

@@ -697,19 +678,18 @@ void SetUp() override {

currentIndex:1

browserState:&browser_state_]);

- EXPECT_EQ(controller.get().entries.count, 3U);

+ EXPECT_EQ(controller.get().items.size(), 3U);

EXPECT_EQ(controller.get().currentNavigationIndex, 1);

EXPECT_EQ(controller.get().previousNavigationIndex, -1);

- // Sanity check the current entry, the CRWSessionEntry unit test will ensure

+ // Sanity check the current item, the CRWSessionItem unit test will ensure

// the entire object is created properly.

- CRWSessionEntry* current_entry = controller.get().currentEntry;

- EXPECT_EQ(current_entry.navigationItem->GetURL(),

+ EXPECT_EQ(controller.get().currentItem->GetURL(),

GURL("http://www.yahoo.com"));

EXPECT_EQ([[controller openerId] length], 0UL);

}

-// Tests index of previous navigation entry.

-TEST_F(CRWSessionControllerTest, PreviousNavigationEntry) {

+// Tests index of previous navigation item.

+TEST_F(CRWSessionControllerTest, PreviousNavigationItem) {

EXPECT_EQ(session_controller_.get().previousNavigationIndex, -1);

[session_controller_ addPendingItem:GURL("http://www.url.com")

referrer:MakeReferrer("http://www.referer.com")

@@ -744,7 +724,7 @@ void SetUp() override {

EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);

}

-TEST_F(CRWSessionControllerTest, PushNewEntry) {

+TEST_F(CRWSessionControllerTest, PushNewItem) {

std::vector<std::unique_ptr<web::NavigationItem>> items;

items.push_back(CreateNavigationItem("http://www.firstpage.com",

"http://www.starturl.com", @"First"));

@@ -762,29 +742,26 @@ void SetUp() override {

[controller pushNewItemWithURL:pushPageGurl1

stateObject:stateObject1

transition:ui::PAGE_TRANSITION_LINK];

- CRWSessionEntry* pushedEntry = [controller currentEntry];

- web::NavigationItemImpl* pushedItem = pushedEntry.navigationItemImpl;

+ web::NavigationItemImpl* pushedItem = [controller currentItem];

NSUInteger expectedCount = 2;

- EXPECT_EQ(expectedCount, controller.get().entries.count);

- EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetURL());

+ EXPECT_EQ(expectedCount, controller.get().items.size());

+ EXPECT_EQ(pushPageGurl1, pushedItem->GetURL());

EXPECT_TRUE(pushedItem->IsCreatedFromPushState());

EXPECT_NSEQ(stateObject1, pushedItem->GetSerializedStateObject());

- EXPECT_EQ(GURL("http://www.firstpage.com/"),

- pushedEntry.navigationItem->GetReferrer().url);

+ EXPECT_EQ(GURL("http://www.firstpage.com/"), pushedItem->GetReferrer().url);

- // Add another new entry and check size and fields again.

+ // Add another new item and check size and fields again.

GURL pushPageGurl2("http://www.firstpage.com/push2");

[controller pushNewItemWithURL:pushPageGurl2

stateObject:nil

transition:ui::PAGE_TRANSITION_LINK];

- pushedEntry = [controller currentEntry];

- pushedItem = pushedEntry.navigationItemImpl;

+ pushedItem = [controller currentItem];

expectedCount = 3;

- EXPECT_EQ(expectedCount, controller.get().entries.count);

- EXPECT_EQ(pushPageGurl2, pushedEntry.navigationItem->GetURL());

+ EXPECT_EQ(expectedCount, controller.get().items.size());

+ EXPECT_EQ(pushPageGurl2, pushedItem->GetURL());

EXPECT_TRUE(pushedItem->IsCreatedFromPushState());

EXPECT_EQ(nil, pushedItem->GetSerializedStateObject());

- EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetReferrer().url);

+ EXPECT_EQ(pushPageGurl1, pushedItem->GetReferrer().url);

}

TEST_F(CRWSessionControllerTest, IsSameDocumentNavigation) {

@@ -840,7 +817,7 @@ void SetUp() override {

[controller isSameDocumentNavigationBetweenItem:item2 andItem:item4]);

}

-TEST_F(CRWSessionControllerTest, UpdateCurrentEntry) {

+TEST_F(CRWSessionControllerTest, UpdateCurrentItem) {

std::vector<std::unique_ptr<web::NavigationItem>> items;

items.push_back(CreateNavigationItem("http://www.firstpage.com",

"http://www.starturl.com", @"First"));

@@ -856,34 +833,30 @@ void SetUp() override {

GURL replacePageGurl1("http://www.firstpage.com/#replace1");

NSString* stateObject1 = @"{'foo': 1}";

- // Replace current entry and check the size of history and fields of the

- // modified entry.

+ // Replace current item and check the size of history and fields of the

+ // modified item.

[controller updateCurrentItemWithURL:replacePageGurl1

stateObject:stateObject1];

- CRWSessionEntry* replacedEntry = [controller currentEntry];

- web::NavigationItemImpl* replacedItem = replacedEntry.navigationItemImpl;

+ web::NavigationItemImpl* replacedItem = [controller currentItem];

NSUInteger expectedCount = 3;

- EXPECT_EQ(expectedCount, controller.get().entries.count);

- EXPECT_EQ(replacePageGurl1, replacedEntry.navigationItem->GetURL());

+ EXPECT_EQ(expectedCount, controller.get().items.size());

+ EXPECT_EQ(replacePageGurl1, replacedItem->GetURL());

EXPECT_FALSE(replacedItem->IsCreatedFromPushState());

EXPECT_NSEQ(stateObject1, replacedItem->GetSerializedStateObject());

- EXPECT_EQ(GURL("http://www.starturl.com/"),

- replacedEntry.navigationItem->GetReferrer().url);

+ EXPECT_EQ(GURL("http://www.starturl.com/"), replacedItem->GetReferrer().url);

- // Replace current entry and check size and fields again.

+ // Replace current item and check size and fields again.

GURL replacePageGurl2("http://www.firstpage.com/#replace2");

[controller.get() updateCurrentItemWithURL:replacePageGurl2 stateObject:nil];

- replacedEntry = [controller currentEntry];

- replacedItem = replacedEntry.navigationItemImpl;

- EXPECT_EQ(expectedCount, controller.get().entries.count);

- EXPECT_EQ(replacePageGurl2, replacedEntry.navigationItem->GetURL());

+ replacedItem = [controller currentItem];

+ EXPECT_EQ(expectedCount, controller.get().items.size());

+ EXPECT_EQ(replacePageGurl2, replacedItem->GetURL());

EXPECT_FALSE(replacedItem->IsCreatedFromPushState());

EXPECT_NSEQ(nil, replacedItem->GetSerializedStateObject());

- EXPECT_EQ(GURL("http://www.starturl.com/"),

- replacedEntry.navigationItem->GetReferrer().url);

+ EXPECT_EQ(GURL("http://www.starturl.com/"), replacedItem->GetReferrer().url);

}

-TEST_F(CRWSessionControllerTest, TestBackwardForwardEntries) {

+TEST_F(CRWSessionControllerTest, TestBackwardForwardItems) {

[session_controller_ addPendingItem:GURL("http://www.example.com/0")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_LINK

@@ -906,26 +879,24 @@ void SetUp() override {

[session_controller_ commitPendingItem];

EXPECT_EQ(3, session_controller_.get().currentNavigationIndex);

- NSArray* backEntries = [session_controller_ backwardEntries];

- EXPECT_EQ(2U, [backEntries count]);

- EXPECT_EQ(0U, [[session_controller_ forwardEntries] count]);

- EXPECT_EQ("http://www.example.com/redirect",

- [[backEntries objectAtIndex:0] navigationItem]->GetURL().spec());

+ web::NavigationItemList backItems = [session_controller_ backwardItems];

+ EXPECT_EQ(2U, backItems.size());

+ EXPECT_TRUE([session_controller_ forwardItems].empty());

+ EXPECT_EQ("http://www.example.com/redirect", backItems[0]->GetURL().spec());

[session_controller_ goToItemAtIndex:1];

- EXPECT_EQ(1U, [[session_controller_ backwardEntries] count]);

- EXPECT_EQ(1U, [[session_controller_ forwardEntries] count]);

+ EXPECT_EQ(1U, [session_controller_ backwardItems].size());

+ EXPECT_EQ(1U, [session_controller_ forwardItems].size());

[session_controller_ goToItemAtIndex:0];

- NSArray* forwardEntries = [session_controller_ forwardEntries];

- EXPECT_EQ(0U, [[session_controller_ backwardEntries] count]);

- EXPECT_EQ(2U, [forwardEntries count]);

- EXPECT_EQ("http://www.example.com/2",

- [[forwardEntries objectAtIndex:1] navigationItem]->GetURL().spec());

+ web::NavigationItemList forwardItems = [session_controller_ forwardItems];

+ EXPECT_EQ(0U, [session_controller_ backwardItems].size());

+ EXPECT_EQ(2U, forwardItems.size());

+ EXPECT_EQ("http://www.example.com/2", forwardItems[1]->GetURL().spec());

}

// Tests going to entries with existing and non-existing indices.

-TEST_F(CRWSessionControllerTest, GoToEntryAtIndex) {

+TEST_F(CRWSessionControllerTest, GoToItemAtIndex) {

[session_controller_ addPendingItem:GURL("http://www.example.com/0")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_LINK

@@ -953,23 +924,23 @@ void SetUp() override {

[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];

EXPECT_EQ(3, session_controller_.get().currentNavigationIndex);

EXPECT_EQ(2, session_controller_.get().previousNavigationIndex);

- EXPECT_TRUE(session_controller_.get().pendingEntry);

- EXPECT_TRUE(session_controller_.get().transientEntry);

+ EXPECT_NE(nullptr, [session_controller_ pendingItem]);

+ EXPECT_NE(nullptr, [session_controller_ transientItem]);

// Going back should discard transient and pending entries.

[session_controller_ goToItemAtIndex:1];

EXPECT_EQ(1, session_controller_.get().currentNavigationIndex);

EXPECT_EQ(3, session_controller_.get().previousNavigationIndex);

- EXPECT_FALSE(session_controller_.get().pendingEntry);

- EXPECT_FALSE(session_controller_.get().transientEntry);

+ EXPECT_EQ(nullptr, [session_controller_ pendingItem]);

+ EXPECT_EQ(nullptr, [session_controller_ transientItem]);

- // Going forward should discard transient entry.

+ // Going forward should discard transient item.

[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];

- EXPECT_TRUE(session_controller_.get().transientEntry);

+ EXPECT_NE(nullptr, [session_controller_ transientItem]);

[session_controller_ goToItemAtIndex:2];

EXPECT_EQ(2, session_controller_.get().currentNavigationIndex);

EXPECT_EQ(1, session_controller_.get().previousNavigationIndex);

- EXPECT_FALSE(session_controller_.get().transientEntry);

+ EXPECT_EQ(nullptr, [session_controller_ transientItem]);

// Out of bounds navigations should be no-op.

[session_controller_ goToItemAtIndex:-1];

@@ -987,46 +958,43 @@ void SetUp() override {

// Tests that visible URL is the same as transient URL if there are no committed

// entries.

-TEST_F(CRWSessionControllerTest, VisibleEntryWithSingleTransientEntry) {

+TEST_F(CRWSessionControllerTest, VisibleItemWithSingleTransientItem) {

[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];

- web::NavigationItem* visible_item =

- [[session_controller_ visibleEntry] navigationItem];

+ web::NavigationItem* visible_item = [session_controller_ visibleItem];

ASSERT_TRUE(visible_item);

EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());

}

// Tests that visible URL is the same as transient URL if there is a committed

-// entry.

-TEST_F(CRWSessionControllerTest, VisibleEntryWithCommittedAndTransientEntries) {

+// item.

+TEST_F(CRWSessionControllerTest, VisibleItemWithCommittedAndTransientItems) {

[session_controller_ addPendingItem:GURL("http://www.example.com/0")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_LINK

rendererInitiated:NO];

[session_controller_ commitPendingItem];

[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];

- web::NavigationItem* visible_item =

- [[session_controller_ visibleEntry] navigationItem];

+ web::NavigationItem* visible_item = [session_controller_ visibleItem];

ASSERT_TRUE(visible_item);

EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());

}

// Tests that visible URL is the same as pending URL if it was user-initiated.

TEST_F(CRWSessionControllerTest,

- VisibleEntryWithSingleUserInitiatedPendingEntry) {

+ VisibleItemWithSingleUserInitiatedPendingItem) {

[session_controller_ addPendingItem:GURL("http://www.example.com/0")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_LINK

rendererInitiated:NO];

- web::NavigationItem* visible_item =

- [[session_controller_ visibleEntry] navigationItem];

+ web::NavigationItem* visible_item = [session_controller_ visibleItem];

ASSERT_TRUE(visible_item);

EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());

}

// Tests that visible URL is the same as pending URL if it was user-initiated

-// and there is a committed entry.

+// and there is a committed item.

TEST_F(CRWSessionControllerTest,

- VisibleEntryWithCommittedAndUserInitiatedPendingEntry) {

+ VisibleItemWithCommittedAndUserInitiatedPendingItem) {

[session_controller_ addPendingItem:GURL("http://www.example.com")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_LINK

@@ -1036,8 +1004,7 @@ void SetUp() override {

referrer:MakeReferrer("http://www.example.com/b")

transition:ui::PAGE_TRANSITION_LINK

rendererInitiated:NO];

- web::NavigationItem* visible_item =

- [[session_controller_ visibleEntry] navigationItem];

+ web::NavigationItem* visible_item = [session_controller_ visibleItem];

ASSERT_TRUE(visible_item);

EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());

}

@@ -1045,20 +1012,19 @@ void SetUp() override {

// Tests that visible URL is not the same as pending URL if it was

// renderer-initiated.

TEST_F(CRWSessionControllerTest,

- VisibleEntryWithSingleRendererInitiatedPendingEntry) {

+ VisibleItemWithSingleRendererInitiatedPendingItem) {

[session_controller_ addPendingItem:GURL("http://www.example.com/0")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_LINK

rendererInitiated:YES];

- web::NavigationItem* visible_item =

- [[session_controller_ visibleEntry] navigationItem];

+ web::NavigationItem* visible_item = [session_controller_ visibleItem];

ASSERT_FALSE(visible_item);

}

// Tests that visible URL is not the same as pending URL if it was

-// renderer-initiated and there is a committed entry.

+// renderer-initiated and there is a committed item.

TEST_F(CRWSessionControllerTest,

- VisibleEntryWithCommittedAndRendererInitiatedPendingEntry) {

+ VisibleItemWithCommittedAndRendererInitiatedPendingItem) {

[session_controller_ addPendingItem:GURL("http://www.example.com")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_LINK

@@ -1068,15 +1034,14 @@ void SetUp() override {

referrer:MakeReferrer("http://www.example.com/b")

transition:ui::PAGE_TRANSITION_LINK

rendererInitiated:YES];

- web::NavigationItem* visible_item =

- [[session_controller_ visibleEntry] navigationItem];

+ web::NavigationItem* visible_item = [session_controller_ visibleItem];

ASSERT_TRUE(visible_item);

EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());

}

// Tests that visible URL is not the same as pending URL created via pending

// navigation index.

-TEST_F(CRWSessionControllerTest, VisibleEntryWithPendingNavigationIndex) {

+TEST_F(CRWSessionControllerTest, VisibleItemWithPendingNavigationIndex) {

[session_controller_ addPendingItem:GURL("http://www.example.com")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_LINK

@@ -1090,15 +1055,14 @@ void SetUp() override {

[session_controller_ setPendingItemIndex:0];

- web::NavigationItem* visible_item =

- [[session_controller_ visibleEntry] navigationItem];

+ web::NavigationItem* visible_item = [session_controller_ visibleItem];

ASSERT_TRUE(visible_item);

EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());

}

-// Tests that |-backwardEntries| is empty if all preceding entries are

+// Tests that |-backwardItems| is empty if all preceding entries are

// redirects.

-TEST_F(CRWSessionControllerTest, BackwardEntriesForAllRedirects) {

+TEST_F(CRWSessionControllerTest, BackwardItemsForAllRedirects) {

[session_controller_ addPendingItem:GURL("http://www.example.com")

referrer:MakeReferrer("http://www.example.com/a")

transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT

@@ -1109,7 +1073,7 @@ void SetUp() override {

transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT

rendererInitiated:YES];

[session_controller_ commitPendingItem];

- EXPECT_EQ(0U, [session_controller_ backwardEntries].count);

+ EXPECT_EQ(0U, [session_controller_ backwardItems].size());

}

} // anonymous namespace

« no previous file with comments | « no previous file | no next file » | no next file with comments »