Convert InspectUITestCase tests to EarlGrey2
Bug: 987646
Change-Id: Ibdb5b6b7393fbdc3593c498d52f4d595872a3647
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1903839
Reviewed-by: Eugene But <[email protected]>
Commit-Queue: Mike Dougherty <[email protected]>
Cr-Commit-Position: refs/heads/master@{#713654}
diff --git a/ios/chrome/browser/ui/webui/BUILD.gn b/ios/chrome/browser/ui/webui/BUILD.gn
index fb4b139..943a0d9 100644
--- a/ios/chrome/browser/ui/webui/BUILD.gn
+++ b/ios/chrome/browser/ui/webui/BUILD.gn
@@ -121,6 +121,7 @@
source_set("eg_tests") {
configs += [ "//build/config/compiler:enable_arc" ]
+ defines = [ "CHROME_EARL_GREY_1" ]
testonly = true
sources = [
"inspect/inspect_ui_egtest.mm",
@@ -135,6 +136,7 @@
"//ios/chrome/browser/ui/omnibox:omnibox_internal",
"//ios/chrome/test/app:test_support",
"//ios/chrome/test/earl_grey:test_support",
+ "//ios/testing/earl_grey:earl_grey_support",
"//ios/web",
"//ios/web/public/test:element_selector",
"//net:test_support",
@@ -143,3 +145,25 @@
]
libs = [ "XCTest.framework" ]
}
+
+source_set("eg2_tests") {
+ defines = [ "CHROME_EARL_GREY_2" ]
+ configs += [
+ "//build/config/compiler:enable_arc",
+ "//build/config/ios:xctest_config",
+ ]
+ testonly = true
+ sources = [
+ "inspect/inspect_ui_egtest.mm",
+ ]
+ deps = [
+ "//base",
+ "//ios/chrome/browser:chrome_url_constants",
+ "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+ "//ios/testing/earl_grey:eg_test_support+eg2",
+ "//ios/third_party/earl_grey2:test_lib",
+ "//ios/web/public/test:element_selector",
+ "//net:test_support",
+ ]
+ libs = [ "UIKit.framework" ]
+}
diff --git a/ios/chrome/browser/ui/webui/inspect/inspect_ui_egtest.mm b/ios/chrome/browser/ui/webui/inspect/inspect_ui_egtest.mm
index 0d5110e..40a2530a8 100644
--- a/ios/chrome/browser/ui/webui/inspect/inspect_ui_egtest.mm
+++ b/ios/chrome/browser/ui/webui/inspect/inspect_ui_egtest.mm
@@ -2,17 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import <EarlGrey/EarlGrey.h>
#import <Foundation/Foundation.h>
#import <XCTest/XCTest.h>
#import "base/strings/sys_string_conversions.h"
#include "ios/chrome/browser/chrome_url_constants.h"
-#import "ios/chrome/test/app/tab_test_util.h"
#import "ios/chrome/test/earl_grey/chrome_actions.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_matchers.h"
#import "ios/chrome/test/earl_grey/chrome_test_case.h"
+#import "ios/testing/earl_grey/earl_grey_test.h"
#include "ios/web/public/test/element_selector.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
@@ -20,8 +19,6 @@
#error "This file requires ARC support."
#endif
-using chrome_test_util::GetCurrentWebState;
-
namespace {
// Directory containing the |kLogoPagePath| and |kLogoPageImageSourcePath|
// resources.
