Commit 0a4b0bb0 authored by Chris Lu's avatar Chris Lu Committed by Commit Bot

[ios] Convert Showcase Bubble and Text Badge Tests to EG2

Bug: 987646
Change-Id: Ie711f50c6062370fce8d7bfa96b466a9a774df3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974304
Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726686}
parent 0beb6ed5
...@@ -79,9 +79,11 @@ ios_eg2_test("ios_showcase_eg2tests_module") { ...@@ -79,9 +79,11 @@ ios_eg2_test("ios_showcase_eg2tests_module") {
xctest_bundle_principal_class = "ChromeEGTestBundleMain" xctest_bundle_principal_class = "ChromeEGTestBundleMain"
deps = [ deps = [
"//ios/showcase/badges:eg2_tests", "//ios/showcase/badges:eg2_tests",
"//ios/showcase/bubble:eg2_tests",
"//ios/showcase/content_suggestions:eg2_tests", "//ios/showcase/content_suggestions:eg2_tests",
"//ios/showcase/core:eg2_tests", "//ios/showcase/core:eg2_tests",
"//ios/showcase/infobars:eg2_tests", "//ios/showcase/infobars:eg2_tests",
"//ios/showcase/text_badge_view:eg2_tests",
] ]
bundle_deps = [ "//ios/showcase/core/resources" ] bundle_deps = [ "//ios/showcase/core/resources" ]
} }
......
...@@ -15,8 +15,28 @@ source_set("bubble") { ...@@ -15,8 +15,28 @@ source_set("bubble") {
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
source_set("eg2_tests") {
defines = [ "CHROME_EARL_GREY_2" ]
configs += [
"//build/config/compiler:enable_arc",
"//build/config/ios:xctest_config",
]
testonly = true
sources = [
"sc_bubble_egtest.mm",
]
deps = [
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/showcase/test:eg2_test",
"//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib",
]
libs = [ "UIKit.framework" ]
}
source_set("eg_tests") { source_set("eg_tests") {
testonly = true testonly = true
defines = [ "CHROME_EARL_GREY_1" ]
sources = [ sources = [
"sc_bubble_egtest.mm", "sc_bubble_egtest.mm",
] ]
...@@ -24,6 +44,7 @@ source_set("eg_tests") { ...@@ -24,6 +44,7 @@ source_set("eg_tests") {
"//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/bubble",
"//ios/chrome/test/earl_grey:test_support", "//ios/chrome/test/earl_grey:test_support",
"//ios/showcase/test", "//ios/showcase/test",
"//ios/testing/earl_grey:earl_grey_support",
"//ios/third_party/earl_grey:earl_grey+link", "//ios/third_party/earl_grey:earl_grey+link",
"//ui/base", "//ui/base",
] ]
......
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import <EarlGrey/EarlGrey.h>
#import "ios/showcase/test/showcase_eg_utils.h" #import "ios/showcase/test/showcase_eg_utils.h"
#import "ios/showcase/test/showcase_test_case.h" #import "ios/showcase/test/showcase_test_case.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support." #error "This file requires ARC support."
......
...@@ -10,8 +10,28 @@ source_set("text_badge_view") { ...@@ -10,8 +10,28 @@ source_set("text_badge_view") {
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
source_set("eg2_tests") {
defines = [ "CHROME_EARL_GREY_2" ]
configs += [
"//build/config/compiler:enable_arc",
"//build/config/ios:xctest_config",
]
testonly = true
sources = [
"sc_text_badge_view_egtest.mm",
]
deps = [
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/showcase/test:eg2_test",
"//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib",
]
libs = [ "UIKit.framework" ]
}
source_set("eg_tests") { source_set("eg_tests") {
testonly = true testonly = true
defines = [ "CHROME_EARL_GREY_1" ]
sources = [ sources = [
"sc_text_badge_view_egtest.mm", "sc_text_badge_view_egtest.mm",
] ]
...@@ -19,6 +39,7 @@ source_set("eg_tests") { ...@@ -19,6 +39,7 @@ source_set("eg_tests") {
"//ios/chrome/browser/ui/reading_list:reading_list_ui", "//ios/chrome/browser/ui/reading_list:reading_list_ui",
"//ios/chrome/test/earl_grey:test_support", "//ios/chrome/test/earl_grey:test_support",
"//ios/showcase/test", "//ios/showcase/test",
"//ios/testing/earl_grey:earl_grey_support",
"//ios/third_party/earl_grey:earl_grey+link", "//ios/third_party/earl_grey:earl_grey+link",
"//ui/base", "//ui/base",
] ]
......
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import <EarlGrey/EarlGrey.h>
#import "ios/showcase/test/showcase_eg_utils.h" #import "ios/showcase/test/showcase_eg_utils.h"
#import "ios/showcase/test/showcase_test_case.h" #import "ios/showcase/test/showcase_test_case.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support." #error "This file requires ARC support."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment