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

Unified Diff: ios/web/shell/test/web_shell_page_state_egtest.mm

Issue 2173543002: [ios] Removed web_shell_ prefix from EG tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged Created 4 years, 5 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/shell/test/web_shell_navigation_egtest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/shell/test/web_shell_page_state_egtest.mm
diff --git a/ios/web/shell/test/web_shell_page_state_egtest.mm b/ios/web/shell/test/web_shell_page_state_egtest.mm
deleted file mode 100644
index 4e6a09613992236fd576c9b670ef75d2dc8b38bf..0000000000000000000000000000000000000000
--- a/ios/web/shell/test/web_shell_page_state_egtest.mm
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <CoreGraphics/CoreGraphics.h>
-#import <EarlGrey/EarlGrey.h>
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "ios/web/public/test/http_server.h"
-#include "ios/web/public/test/http_server_util.h"
-#include "ios/web/shell/test/app/navigation_test_util.h"
-#import "ios/web/shell/test/earl_grey/shell_base_test_case.h"
-#import "ios/web/shell/test/earl_grey/shell_matchers.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace {
-
-// URLs for test pages.
-const char kLongPage1[] =
- "http://ios/web/shell/test/http_server_files/tall_page.html";
-const char kLongPage2[] =
- "http://ios/web/shell/test/http_server_files/tall_page.html?2";
-
-// Test scroll offsets.
-const CGFloat kScrollOffset1 = 20.0f;
-const CGFloat kScrollOffset2 = 40.0f;
-
-// Returns a matcher for asserting that element's content offset matches the
-// given |offset|.
-id<GREYMatcher> contentOffset(CGPoint offset) {
- MatchesBlock matches = ^BOOL(UIScrollView* element) {
- return CGPointEqualToPoint([element contentOffset], offset);
- };
- DescribeToBlock describe = ^(id<GREYDescription> description) {
- [description appendText:@"contentOffset"];
- };
- return grey_allOf(
- grey_kindOfClass([UIScrollView class]),
- [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
- descriptionBlock:describe],
- nil);
-}
-
-} // namespace
-
-using web::shell_test_util::LoadUrl;
-using web::test::HttpServer;
-using web::webViewContainingText;
-
-// Page state test cases for the web shell.
-@interface CRWWebShellPageStateTest : ShellBaseTestCase
-
-@end
-
-@implementation CRWWebShellPageStateTest
-
-// Tests that page scroll position of a page is restored upon returning to the
-// page via the back/forward buttons.
-- (void)testScrollPositionRestoring {
- web::test::SetUpFileBasedHttpServer();
-
- // Load first URL which is a long page.
- LoadUrl(HttpServer::MakeUrl(kLongPage1));
- // TODO(crbug.com/629116): Remove this once |LoadUrl| waits for the load
- // completion.
- [[EarlGrey selectElementWithMatcher:webViewContainingText("List of numbers")]
- assertWithMatcher:grey_notNil()];
-
- // Scroll the first page and verify the offset.
- [[EarlGrey selectElementWithMatcher:web::webViewScrollView()]
- performAction:grey_scrollInDirection(kGREYDirectionDown, kScrollOffset1)];
- [[EarlGrey selectElementWithMatcher:web::webViewScrollView()]
- assertWithMatcher:contentOffset(CGPointMake(0, kScrollOffset1))];
-
- // Load second URL, which is also a long page.
- GURL URL2 = HttpServer::MakeUrl(kLongPage2);
- LoadUrl(URL2);
- // TODO(crbug.com/629116): Remove these once |LoadUrl| waits for the load
- // completion.
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL2.spec())]
- assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewContainingText("List of numbers")]
- assertWithMatcher:grey_notNil()];
-
- // Scroll the second page and verify the offset.
- [[EarlGrey selectElementWithMatcher:web::webViewScrollView()]
- performAction:grey_scrollInDirection(kGREYDirectionDown, kScrollOffset2)];
- [[EarlGrey selectElementWithMatcher:web::webViewScrollView()]
- assertWithMatcher:contentOffset(CGPointMake(0, kScrollOffset2))];
-
- // Go back and verify that the first page offset has been restored.
- [[EarlGrey selectElementWithMatcher:web::backButton()]
- performAction:grey_tap()];
- [[EarlGrey selectElementWithMatcher:web::webViewScrollView()]
- assertWithMatcher:contentOffset(CGPointMake(0, kScrollOffset1))];
-
- // Go forward and verify that the second page offset has been restored.
- [[EarlGrey selectElementWithMatcher:web::forwardButton()]
- performAction:grey_tap()];
- [[EarlGrey selectElementWithMatcher:web::webViewScrollView()]
- assertWithMatcher:contentOffset(CGPointMake(0, kScrollOffset2))];
-}
-
-@end
« no previous file with comments | « ios/web/shell/test/web_shell_navigation_egtest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698