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

Side by Side Diff: ios/web/web_state/ui/crw_wk_navigation_states_unittest.mm

Issue 2845913003: Cleaned up unused methods from WebStateImpl and NavigationContextImpl. (Closed)
Patch Set: Fixed tests 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
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.mm ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #import "ios/web/web_state/ui/crw_wk_navigation_states.h" 5 #import "ios/web/web_state/ui/crw_wk_navigation_states.h"
6 6
7 #import <WebKit/WebKit.h> 7 #import <WebKit/WebKit.h>
8 8
9 #import "base/mac/scoped_nsobject.h" 9 #import "base/mac/scoped_nsobject.h"
10 #include "ios/web/web_state/navigation_context_impl.h" 10 #include "ios/web/web_state/navigation_context_impl.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 EXPECT_EQ(navigation2_, [states_ lastAddedNavigation]); 62 EXPECT_EQ(navigation2_, [states_ lastAddedNavigation]);
63 EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]); 63 EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]);
64 64
65 // navigation_2 is still the latest. 65 // navigation_2 is still the latest.
66 [states_ setState:WKNavigationState::STARTED forNavigation:navigation2_]; 66 [states_ setState:WKNavigationState::STARTED forNavigation:navigation2_];
67 EXPECT_EQ(navigation2_, [states_ lastAddedNavigation]); 67 EXPECT_EQ(navigation2_, [states_ lastAddedNavigation]);
68 EXPECT_EQ(WKNavigationState::STARTED, [states_ lastAddedNavigationState]); 68 EXPECT_EQ(WKNavigationState::STARTED, [states_ lastAddedNavigationState]);
69 69
70 // navigation_3 is added later and hence the latest. 70 // navigation_3 is added later and hence the latest.
71 std::unique_ptr<web::NavigationContextImpl> context = 71 std::unique_ptr<web::NavigationContextImpl> context =
72 NavigationContextImpl::CreateSameDocumentNavigationContext( 72 NavigationContextImpl::CreateNavigationContext(nullptr /*web_state*/,
73 nullptr /*web_state*/, GURL(kTestUrl1)); 73 GURL(kTestUrl1));
74 [states_ setContext:std::move(context) forNavigation:navigation3_]; 74 [states_ setContext:std::move(context) forNavigation:navigation3_];
75 EXPECT_EQ(navigation3_, [states_ lastAddedNavigation]); 75 EXPECT_EQ(navigation3_, [states_ lastAddedNavigation]);
76 EXPECT_EQ(WKNavigationState::NONE, [states_ lastAddedNavigationState]); 76 EXPECT_EQ(WKNavigationState::NONE, [states_ lastAddedNavigationState]);
77 } 77 }
78 78
79 // Tests |setContext:forNavigation:| and |contextForNavigaiton:| methods. 79 // Tests |setContext:forNavigation:| and |contextForNavigation:| methods.
80 TEST_F(CRWWKNavigationStatesTest, Context) { 80 TEST_F(CRWWKNavigationStatesTest, Context) {
81 EXPECT_FALSE([states_ contextForNavigation:navigation1_]); 81 EXPECT_FALSE([states_ contextForNavigation:navigation1_]);
82 EXPECT_FALSE([states_ contextForNavigation:navigation2_]); 82 EXPECT_FALSE([states_ contextForNavigation:navigation2_]);
83 EXPECT_FALSE([states_ contextForNavigation:navigation3_]); 83 EXPECT_FALSE([states_ contextForNavigation:navigation3_]);
84 84
85 // Add first context. 85 // Add first context.
86 std::unique_ptr<web::NavigationContextImpl> context1 = 86 std::unique_ptr<web::NavigationContextImpl> context1 =
87 NavigationContextImpl::CreateSameDocumentNavigationContext( 87 NavigationContextImpl::CreateNavigationContext(nullptr /*web_state*/,
88 nullptr /*web_state*/, GURL(kTestUrl1)); 88 GURL(kTestUrl1));
89 context1->SetIsSameDocument(true);
89 [states_ setContext:std::move(context1) forNavigation:navigation1_]; 90 [states_ setContext:std::move(context1) forNavigation:navigation1_];
90 EXPECT_FALSE([states_ contextForNavigation:navigation2_]); 91 EXPECT_FALSE([states_ contextForNavigation:navigation2_]);
91 EXPECT_FALSE([states_ contextForNavigation:navigation3_]); 92 EXPECT_FALSE([states_ contextForNavigation:navigation3_]);
92 ASSERT_TRUE([states_ contextForNavigation:navigation1_]); 93 ASSERT_TRUE([states_ contextForNavigation:navigation1_]);
93 EXPECT_EQ(GURL(kTestUrl1), 94 EXPECT_EQ(GURL(kTestUrl1),
94 [states_ contextForNavigation:navigation1_]->GetUrl()); 95 [states_ contextForNavigation:navigation1_]->GetUrl());
95 EXPECT_TRUE([states_ contextForNavigation:navigation1_]->IsSameDocument()); 96 EXPECT_TRUE([states_ contextForNavigation:navigation1_]->IsSameDocument());
96 EXPECT_FALSE([states_ contextForNavigation:navigation1_]->IsErrorPage()); 97 EXPECT_FALSE([states_ contextForNavigation:navigation1_]->IsErrorPage());
97 98
98 // Replace existing context. 99 // Replace existing context.
99 std::unique_ptr<web::NavigationContextImpl> context2 = 100 std::unique_ptr<web::NavigationContextImpl> context2 =
100 NavigationContextImpl::CreateErrorPageNavigationContext( 101 NavigationContextImpl::CreateNavigationContext(nullptr /*web_state*/,
101 nullptr /*web_state*/, GURL(kTestUrl2), 102 GURL(kTestUrl2));
102 nullptr /* response_headers */); 103 context2->SetIsErrorPage(true);
103 [states_ setContext:std::move(context2) forNavigation:navigation1_]; 104 [states_ setContext:std::move(context2) forNavigation:navigation1_];
104 EXPECT_FALSE([states_ contextForNavigation:navigation2_]); 105 EXPECT_FALSE([states_ contextForNavigation:navigation2_]);
105 EXPECT_FALSE([states_ contextForNavigation:navigation3_]); 106 EXPECT_FALSE([states_ contextForNavigation:navigation3_]);
106 ASSERT_TRUE([states_ contextForNavigation:navigation1_]); 107 ASSERT_TRUE([states_ contextForNavigation:navigation1_]);
107 EXPECT_EQ(GURL(kTestUrl2), 108 EXPECT_EQ(GURL(kTestUrl2),
108 [states_ contextForNavigation:navigation1_]->GetUrl()); 109 [states_ contextForNavigation:navigation1_]->GetUrl());
109 EXPECT_FALSE([states_ contextForNavigation:navigation1_]->IsSameDocument()); 110 EXPECT_FALSE([states_ contextForNavigation:navigation1_]->IsSameDocument());
110 EXPECT_TRUE([states_ contextForNavigation:navigation1_]->IsErrorPage()); 111 EXPECT_TRUE([states_ contextForNavigation:navigation1_]->IsErrorPage());
111 } 112 }
112 113
113 // Tests null WKNavigation object. 114 // Tests null WKNavigation object.
114 TEST_F(CRWWKNavigationStatesTest, NullNavigation) { 115 TEST_F(CRWWKNavigationStatesTest, NullNavigation) {
115 // navigation_1 is the only navigation and it is the latest. 116 // navigation_1 is the only navigation and it is the latest.
116 [states_ setState:WKNavigationState::REQUESTED forNavigation:navigation1_]; 117 [states_ setState:WKNavigationState::REQUESTED forNavigation:navigation1_];
117 ASSERT_EQ(navigation1_, [states_ lastAddedNavigation]); 118 ASSERT_EQ(navigation1_, [states_ lastAddedNavigation]);
118 EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]); 119 EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]);
119 120
120 // null navigation is added later and hence the latest. 121 // null navigation is added later and hence the latest.
121 [states_ setState:WKNavigationState::STARTED forNavigation:nil]; 122 [states_ setState:WKNavigationState::STARTED forNavigation:nil];
122 EXPECT_FALSE([states_ lastAddedNavigation]); 123 EXPECT_FALSE([states_ lastAddedNavigation]);
123 EXPECT_EQ(WKNavigationState::STARTED, [states_ lastAddedNavigationState]); 124 EXPECT_EQ(WKNavigationState::STARTED, [states_ lastAddedNavigationState]);
124 125
125 // navigation_1 is the latest again after removing null navigation. 126 // navigation_1 is the latest again after removing null navigation.
126 [states_ removeNavigation:nil]; 127 [states_ removeNavigation:nil];
127 ASSERT_EQ(navigation1_, [states_ lastAddedNavigation]); 128 ASSERT_EQ(navigation1_, [states_ lastAddedNavigation]);
128 EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]); 129 EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]);
129 } 130 }
130 131
131 } // namespace web 132 } // namespace web
OLDNEW
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.mm ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698