Commit e1d30416 authored by Chris Lu's avatar Chris Lu Committed by Commit Bot

[ios] Convert Showcase Infobar tests to EG2

Adds a new "constants" source_set to avoid any chrome/app
dependencies.

Bug: 987646
Change-Id: I8fc61687cabc0618e43a7dcc92c30c5cf694e6af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1906893Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715020}
parent 6aeb48b5
...@@ -79,6 +79,7 @@ ios_eg2_test("ios_showcase_eg2tests_module") { ...@@ -79,6 +79,7 @@ ios_eg2_test("ios_showcase_eg2tests_module") {
xctest_bundle_principal_class = "ChromeEGTestBundleMain" xctest_bundle_principal_class = "ChromeEGTestBundleMain"
deps = [ deps = [
"//ios/showcase/content_suggestions:eg2_tests", "//ios/showcase/content_suggestions:eg2_tests",
"//ios/showcase/infobars:eg2_tests",
] ]
bundle_deps = [ "//ios/showcase/core/resources" ] bundle_deps = [ "//ios/showcase/core/resources" ]
} }
......
...@@ -12,6 +12,7 @@ source_set("infobars") { ...@@ -12,6 +12,7 @@ source_set("infobars") {
"sc_infobar_container_view_controller.mm", "sc_infobar_container_view_controller.mm",
] ]
deps = [ deps = [
":constants",
"//ios/chrome/browser/infobars:public", "//ios/chrome/browser/infobars:public",
"//ios/chrome/browser/ui/infobars/banners", "//ios/chrome/browser/ui/infobars/banners",
"//ios/chrome/browser/ui/infobars/coordinators", "//ios/chrome/browser/ui/infobars/coordinators",
...@@ -23,18 +24,52 @@ source_set("infobars") { ...@@ -23,18 +24,52 @@ source_set("infobars") {
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
source_set("constants") {
sources = [
"sc_infobar_constants.h",
"sc_infobar_constants.mm",
]
deps = []
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_infobar_banner_coordinator_egtest.mm",
"sc_infobar_banner_no_modal_coordinator_egtest.mm",
]
deps = [
":constants",
"//ios/chrome/browser/ui/infobars/banners:public",
"//ios/chrome/browser/ui/infobars/modals:public",
"//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_infobar_banner_coordinator_egtest.mm", "sc_infobar_banner_coordinator_egtest.mm",
"sc_infobar_banner_no_modal_coordinator_egtest.mm", "sc_infobar_banner_no_modal_coordinator_egtest.mm",
] ]
deps = [ deps = [
":constants",
"//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/browser/ui/infobars/banners:public",
"//ios/chrome/browser/ui/infobars/modals:public", "//ios/chrome/browser/ui/infobars/modals:public",
"//ios/chrome/test/earl_grey:test_support", "//ios/chrome/test/earl_grey:test_support",
"//ios/showcase/infobars", "//ios/showcase/infobars",
"//ios/showcase/test", "//ios/showcase/test",
"//ios/testing/earl_grey:earl_grey_support",
] ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#import "ios/chrome/browser/ui/infobars/modals/infobar_modal_delegate.h" #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_delegate.h"
#import "ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.h" #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.h"
#import "ios/chrome/browser/ui/infobars/presentation/infobar_modal_transition_driver.h" #import "ios/chrome/browser/ui/infobars/presentation/infobar_modal_transition_driver.h"
#import "ios/showcase/infobars/sc_infobar_constants.h"
#import "ios/showcase/infobars/sc_infobar_container_view_controller.h" #import "ios/showcase/infobars/sc_infobar_container_view_controller.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
......
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
// 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/chrome/browser/ui/infobars/banners/infobar_banner_constants.h" #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_constants.h"
#import "ios/chrome/browser/ui/infobars/modals/infobar_modal_constants.h" #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_constants.h"
#import "ios/showcase/infobars/sc_infobar_container_view_controller.h" #import "ios/showcase/infobars/sc_infobar_constants.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."
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_delegate.h" #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_delegate.h"
#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.h" #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.h"
#import "ios/chrome/browser/ui/infobars/presentation/infobar_banner_transition_driver.h" #import "ios/chrome/browser/ui/infobars/presentation/infobar_banner_transition_driver.h"
#import "ios/showcase/infobars/sc_infobar_constants.h"
#import "ios/showcase/infobars/sc_infobar_container_view_controller.h" #import "ios/showcase/infobars/sc_infobar_container_view_controller.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
......
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
// 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/chrome/browser/ui/infobars/banners/infobar_banner_constants.h" #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_constants.h"
#import "ios/chrome/browser/ui/infobars/modals/infobar_modal_constants.h" #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_constants.h"
#import "ios/showcase/infobars/sc_infobar_container_view_controller.h" #import "ios/showcase/infobars/sc_infobar_constants.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."
......
// Copyright 2019 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.
#ifndef IOS_SHOWCASE_INFOBARS_SC_INFOBAR_CONSTANTS_H_
#define IOS_SHOWCASE_INFOBARS_SC_INFOBAR_CONSTANTS_H_
#import <UIKit/UIKit.h>
extern NSString* const kInfobarBannerTitleLabel;
extern NSString* const kInfobarBannerSubtitleLabel;
extern NSString* const kInfobarBannerButtonLabel;
extern NSString* const kInfobarBannerPresentedModalLabel;
#endif // IOS_SHOWCASE_INFOBARS_SC_INFOBAR_CONSTANTS_H_
// Copyright 2019 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 "ios/showcase/infobars/sc_infobar_constants.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
NSString* const kInfobarBannerTitleLabel = @"Test Infobar";
NSString* const kInfobarBannerSubtitleLabel = @"This a test Infobar.";
NSString* const kInfobarBannerButtonLabel = @"Accept";
NSString* const kInfobarBannerPresentedModalLabel = @"Modal Infobar";
...@@ -13,11 +13,6 @@ ...@@ -13,11 +13,6 @@
@class InfobarBannerTransitionDriver; @class InfobarBannerTransitionDriver;
@class InfobarBannerViewController; @class InfobarBannerViewController;
extern NSString* const kInfobarBannerTitleLabel;
extern NSString* const kInfobarBannerSubtitleLabel;
extern NSString* const kInfobarBannerButtonLabel;
extern NSString* const kInfobarBannerPresentedModalLabel;
@interface ContainerViewController @interface ContainerViewController
: UIViewController <InfobarBannerPositioner, InfobarModalPositioner> : UIViewController <InfobarBannerPositioner, InfobarModalPositioner>
@property(nonatomic, strong) InfobarBannerViewController* bannerViewController; @property(nonatomic, strong) InfobarBannerViewController* bannerViewController;
......
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
#error "This file requires ARC support." #error "This file requires ARC support."
#endif #endif
NSString* const kInfobarBannerTitleLabel = @"Test Infobar";
NSString* const kInfobarBannerSubtitleLabel = @"This a test Infobar.";
NSString* const kInfobarBannerButtonLabel = @"Accept";
NSString* const kInfobarBannerPresentedModalLabel = @"Modal Infobar";
@implementation ContainerViewController @implementation ContainerViewController
- (void)viewDidAppear:(BOOL)animated { - (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated]; [super viewDidAppear:animated];
......
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