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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ios/shared/chrome/browser/tabs/web_state_list_unittest.mm

Issue 2766413004: [ios] Change API to inform WebStateList of opener-opened relationship. (Closed)
Patch Set: Address 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
« no previous file with comments | « ios/shared/chrome/browser/tabs/web_state_list_order_controller_unittest.mm ('k') | ios/shared/chrome/browser/tabs/web_state_opener.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/shared/chrome/browser/tabs/web_state_list_unittest.mm
diff --git a/ios/shared/chrome/browser/tabs/web_state_list_unittest.mm b/ios/shared/chrome/browser/tabs/web_state_list_unittest.mm
index bc06f5c4bc90da64ea5ae1f4edadf7aa2dc02e52..d7d0e020ea0fcb4cec73682b1d572fdbc39d62d8 100644
--- a/ios/shared/chrome/browser/tabs/web_state_list_unittest.mm
+++ b/ios/shared/chrome/browser/tabs/web_state_list_unittest.mm
@@ -9,6 +9,7 @@
#include "base/supports_user_data.h"
#import "ios/shared/chrome/browser/tabs/fake_web_state_list_delegate.h"
#import "ios/shared/chrome/browser/tabs/web_state_list_observer.h"
+#import "ios/shared/chrome/browser/tabs/web_state_opener.h"
#import "ios/web/public/test/fakes/test_navigation_manager.h"
#import "ios/web/public/test/fakes/test_web_state.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -174,7 +175,7 @@ TEST_F(WebStateListTest, IsEmpty) {
EXPECT_EQ(0, web_state_list_.count());
EXPECT_TRUE(web_state_list_.empty());
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
EXPECT_TRUE(observer_.web_state_inserted_called());
EXPECT_EQ(1, web_state_list_.count());
@@ -182,7 +183,7 @@ TEST_F(WebStateListTest, IsEmpty) {
}
TEST_F(WebStateListTest, InsertUrlSingle) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
EXPECT_TRUE(observer_.web_state_inserted_called());
EXPECT_EQ(1, web_state_list_.count());
@@ -190,9 +191,9 @@ TEST_F(WebStateListTest, InsertUrlSingle) {
}
TEST_F(WebStateListTest, InsertUrlMultiple) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(0, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(0, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL2));
EXPECT_TRUE(observer_.web_state_inserted_called());
EXPECT_EQ(3, web_state_list_.count());
@@ -202,9 +203,9 @@ TEST_F(WebStateListTest, InsertUrlMultiple) {
}
TEST_F(WebStateListTest, MoveWebStateAtRightByOne) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
// Sanity check before closing WebState.
EXPECT_EQ(3, web_state_list_.count());
@@ -223,9 +224,9 @@ TEST_F(WebStateListTest, MoveWebStateAtRightByOne) {
}
TEST_F(WebStateListTest, MoveWebStateAtRightByMoreThanOne) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
// Sanity check before closing WebState.
EXPECT_EQ(3, web_state_list_.count());
@@ -244,9 +245,9 @@ TEST_F(WebStateListTest, MoveWebStateAtRightByMoreThanOne) {
}
TEST_F(WebStateListTest, MoveWebStateAtLeftByOne) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
// Sanity check before closing WebState.
EXPECT_EQ(3, web_state_list_.count());
@@ -265,9 +266,9 @@ TEST_F(WebStateListTest, MoveWebStateAtLeftByOne) {
}
TEST_F(WebStateListTest, MoveWebStateAtLeftByMoreThanOne) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
// Sanity check before closing WebState.
EXPECT_EQ(3, web_state_list_.count());
@@ -286,9 +287,9 @@ TEST_F(WebStateListTest, MoveWebStateAtLeftByMoreThanOne) {
}
TEST_F(WebStateListTest, MoveWebStateAtSameIndex) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
// Sanity check before closing WebState.
EXPECT_EQ(3, web_state_list_.count());
@@ -307,8 +308,8 @@ TEST_F(WebStateListTest, MoveWebStateAtSameIndex) {
}
TEST_F(WebStateListTest, ReplaceWebStateAt) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
// Sanity check before replacing WebState.
EXPECT_EQ(2, web_state_list_.count());
@@ -317,7 +318,7 @@ TEST_F(WebStateListTest, ReplaceWebStateAt) {
observer_.ResetStatistics();
std::unique_ptr<web::WebState> old_web_state(
- web_state_list_.ReplaceWebStateAt(1, CreateWebState(kURL2), nullptr));
+ web_state_list_.ReplaceWebStateAt(1, CreateWebState(kURL2)));
EXPECT_TRUE(observer_.web_state_replaced_called());
EXPECT_EQ(2, web_state_list_.count());
@@ -327,9 +328,9 @@ TEST_F(WebStateListTest, ReplaceWebStateAt) {
}
TEST_F(WebStateListTest, DetachWebStateAtIndexBegining) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
// Sanity check before closing WebState.
EXPECT_EQ(3, web_state_list_.count());
@@ -348,9 +349,9 @@ TEST_F(WebStateListTest, DetachWebStateAtIndexBegining) {
}
TEST_F(WebStateListTest, DetachWebStateAtIndexMiddle) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
// Sanity check before closing WebState.
EXPECT_EQ(3, web_state_list_.count());
@@ -369,9 +370,9 @@ TEST_F(WebStateListTest, DetachWebStateAtIndexMiddle) {
}
TEST_F(WebStateListTest, DetachWebStateAtIndexLast) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
// Sanity check before closing WebState.
EXPECT_EQ(3, web_state_list_.count());
@@ -399,7 +400,7 @@ TEST_F(WebStateListTest, OwnershipBorrowed) {
FakeWebStateListDelegate web_state_list_delegate;
auto web_state_list = base::MakeUnique<WebStateList>(
&web_state_list_delegate, WebStateList::WebStateBorrowed);
- web_state_list->InsertWebState(0, test_web_state.get(), nullptr);
+ web_state_list->InsertWebState(0, test_web_state.get());
EXPECT_FALSE(web_state_was_killed);
web_state_list.reset();
@@ -416,7 +417,7 @@ TEST_F(WebStateListTest, OwnershipOwned) {
FakeWebStateListDelegate web_state_list_delegate;
auto web_state_list = base::MakeUnique<WebStateList>(
&web_state_list_delegate, WebStateList::WebStateOwned);
- web_state_list->InsertWebState(0, test_web_state.release(), nullptr);
+ web_state_list->InsertWebState(0, test_web_state.release());
EXPECT_FALSE(web_state_was_killed);
web_state_list.reset();
@@ -442,9 +443,9 @@ TEST_F(WebStateListTest, OpenersEmptyList) {
}
TEST_F(WebStateListTest, OpenersNothingOpened) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), nullptr);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
for (int index = 0; index < web_state_list_.count(); ++index) {
web::WebState* opener = web_state_list_.GetWebStateAt(index);
@@ -465,11 +466,14 @@ TEST_F(WebStateListTest, OpenersNothingOpened) {
}
TEST_F(WebStateListTest, OpenersChildsAfterOpener) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
web::WebState* opener = web_state_list_.GetWebStateAt(0);
- web_state_list_.InsertWebState(1, CreateWebState(kURL1), opener);
- web_state_list_.InsertWebState(2, CreateWebState(kURL2), opener);
+ web_state_list_.InsertWebState(1, CreateWebState(kURL1));
+ web_state_list_.SetOpenerOfWebStateAt(1, WebStateOpener(opener));
+
+ web_state_list_.InsertWebState(2, CreateWebState(kURL2));
+ web_state_list_.SetOpenerOfWebStateAt(2, WebStateOpener(opener));
const int start_index = web_state_list_.GetIndexOfWebState(opener);
EXPECT_EQ(1,
@@ -507,7 +511,8 @@ TEST_F(WebStateListTest, OpenersChildsAfterOpener) {
// Add a new WebState with the same opener. It should be considered the next
// WebState if groups are considered and the last independently on whether
// groups are used or not.
- web_state_list_.InsertWebState(3, CreateWebState(kURL2), opener);
+ web_state_list_.InsertWebState(3, CreateWebState(kURL2));
+ web_state_list_.SetOpenerOfWebStateAt(3, WebStateOpener(opener));
EXPECT_EQ(1,
web_state_list_.GetIndexOfNextWebStateOpenedBy(opener, start_index,
@@ -525,11 +530,14 @@ TEST_F(WebStateListTest, OpenersChildsAfterOpener) {
}
TEST_F(WebStateListTest, OpenersChildsBeforeOpener) {
- web_state_list_.InsertWebState(0, CreateWebState(kURL0), nullptr);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL0));
web::WebState* opener = web_state_list_.GetWebStateAt(0);
- web_state_list_.InsertWebState(0, CreateWebState(kURL1), opener);
- web_state_list_.InsertWebState(1, CreateWebState(kURL2), opener);
+ web_state_list_.InsertWebState(0, CreateWebState(kURL1));
+ web_state_list_.SetOpenerOfWebStateAt(0, WebStateOpener(opener));
+
+ web_state_list_.InsertWebState(1, CreateWebState(kURL2));
+ web_state_list_.SetOpenerOfWebStateAt(1, WebStateOpener(opener));
const int start_index = web_state_list_.GetIndexOfWebState(opener);
EXPECT_EQ(WebStateList::kInvalidIndex,
« no previous file with comments | « ios/shared/chrome/browser/tabs/web_state_list_order_controller_unittest.mm ('k') | ios/shared/chrome/browser/tabs/web_state_opener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698