| OLD | NEW |
| 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/shell/test/earl_grey/shell_base_test_case.h" | 5 #import "ios/web/shell/test/earl_grey/web_shell_test_case.h" |
| 6 | 6 |
| 7 #import <EarlGrey/EarlGrey.h> | 7 #import <EarlGrey/EarlGrey.h> |
| 8 | 8 |
| 9 #import "ios/web/public/test/http_server.h" | 9 #import "ios/web/public/test/http_server.h" |
| 10 #import "ios/web/shell/test/earl_grey/shell_matchers.h" | 10 #import "ios/web/shell/test/earl_grey/shell_matchers.h" |
| 11 | 11 |
| 12 #if !defined(__has_feature) || !__has_feature(objc_arc) | 12 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 13 #error "This file requires ARC support." | 13 #error "This file requires ARC support." |
| 14 #endif | 14 #endif |
| 15 | 15 |
| 16 using web::test::HttpServer; | 16 using web::test::HttpServer; |
| 17 using web::WebViewContainingText; | 17 using web::WebViewContainingText; |
| 18 | 18 |
| 19 @implementation ShellBaseTestCase | 19 @implementation WebShellTestCase |
| 20 | 20 |
| 21 // Overrides |testInvocations| to skip all tests if a system alert view is | 21 // Overrides |testInvocations| to skip all tests if a system alert view is |
| 22 // shown, since this isn't a case a user would encounter (i.e. they would | 22 // shown, since this isn't a case a user would encounter (i.e. they would |
| 23 // dismiss the alert first). | 23 // dismiss the alert first). |
| 24 + (NSArray*)testInvocations { | 24 + (NSArray*)testInvocations { |
| 25 // TODO(crbug.com/654085): Simply skipping all tests isn't the best way to | 25 // TODO(crbug.com/654085): Simply skipping all tests isn't the best way to |
| 26 // handle this, it would be better to have something that is more obvious | 26 // handle this, it would be better to have something that is more obvious |
| 27 // on the bots that this is wrong, without making it look like test flake. | 27 // on the bots that this is wrong, without making it look like test flake. |
| 28 NSError* error = nil; | 28 NSError* error = nil; |
| 29 [[EarlGrey selectElementWithMatcher:grey_systemAlertViewShown()] | 29 [[EarlGrey selectElementWithMatcher:grey_systemAlertViewShown()] |
| (...skipping 18 matching lines...) Expand all Loading... |
| 48 [super tearDown]; | 48 [super tearDown]; |
| 49 } | 49 } |
| 50 | 50 |
| 51 // Tear down called after each test. | 51 // Tear down called after each test. |
| 52 - (void)tearDown { | 52 - (void)tearDown { |
| 53 HttpServer::GetSharedInstance().RemoveAllResponseProviders(); | 53 HttpServer::GetSharedInstance().RemoveAllResponseProviders(); |
| 54 [super tearDown]; | 54 [super tearDown]; |
| 55 } | 55 } |
| 56 | 56 |
| 57 @end | 57 @end |
| OLD | NEW |