Skip to content

GitLab

T
tangled
Commit 2cb01eba authored by Mark Cogan's avatar Mark Cogan Committed by Commit Bot
Browse files
Options

[iOS] Add scene lifecycle plist keys to unittests. 

The CL has the base iOS Chrome unit tests set the plist key for the
UIScene APIs when the gn flags for multiwindow/scene startup are
set.


Change-Id: I278be41b16e26d1078c043f936b3febc65dde6c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2199144
Commit-Queue: Mark Cogan <marq@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774177}
parent 49833088
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 0 deletions
ios/chrome/test/BUILD.gn
View file @ 2cb01eba
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# 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("//ios/build/chrome_build.gni")
import("//ios/build/config.gni") import("//ios/build/config.gni")
import("//ios/chrome/features.gni") import("//ios/chrome/features.gni")
import("//ios/public/provider/chrome/browser/build_config.gni") import("//ios/public/provider/chrome/browser/build_config.gni")
...@@ -161,7 +162,16 @@ test("ios_chrome_perftests") { ...@@ -161,7 +162,16 @@ test("ios_chrome_perftests") {
assert_no_deps = ios_assert_no_deps assert_no_deps = ios_assert_no_deps
} }
bundle_data_ib_file("base_scene_storyboard") {
source = "BaseScene.storyboard"
}
test("ios_chrome_unittests") { test("ios_chrome_unittests") {
# Use the plist with the scene manifest if either multiwindow flag is enabled
if (ios_enable_multi_window || ios_enable_scene_startup) {
info_plist = "//ios/chrome/test/unittest-scene-lifecycle-Info.plist"
}
deps = [ deps = [
# Ensure that all unit tests are run, use fake hooks and pack resources. # Ensure that all unit tests are run, use fake hooks and pack resources.
":run_all_unittests", ":run_all_unittests",
......
ios/chrome/test/BaseScene.storyboard 0 → 100644
View file @ 2cb01eba
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.11" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="j72-TL-eGS">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.13"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="y1s-8x-hYa">
<objects>
<viewController id="j72-TL-eGS" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="6ef-rW-4AQ">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="YKv-hL-i1m"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="qZ4-fB-fJ8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-732" y="75"/>
</scene>
</scenes>
</document>
ios/chrome/test/unittest-scene-lifecycle-Info.plist 0 → 100644
View file @ 2cb01eba
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIApplicationDelegate</key>
<string>MainApplicationDelegate</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${IOS_BUNDLE_ID_PREFIX}.gtest.${GTEST_BUNDLE_ID_SUFFIX:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>chromium</string>
<string>chromiums</string>
<string>comgooglemaps</string>
<string>googleapp</string>
<string>googlechrome</string>
<string>googlechromes</string>
<string>googledevicepolicy</string>
<string>googledocs</string>
<string>googledrive</string>
<string>googlegmail</string>
<string>googlephotos</string>
<string>googleplaymusic</string>
<string>googlesheets</string>
<string>googleslides</string>
<string>gplus</string>
<string>inbox-gmail</string>
<string>vnd.google.calendar</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>UIFileSharingEnabled</key>
<true/>
<key>UILaunchImages</key>
<array>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>Default</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{320, 480}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>Default</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{320, 568}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>8.0</string>
<key>UILaunchImageName</key>
<string>Default</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{375, 667}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>8.0</string>
<key>UILaunchImageName</key>
<string>Default</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{414, 736}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>8.0</string>
<key>UILaunchImageName</key>
<string>Default</string>
<key>UILaunchImageOrientation</key>
<string>Landscape</string>
<key>UILaunchImageSize</key>
<string>{414, 736}</string>
</dict>
</array>
<key>UILaunchImages~ipad</key>
<array>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>Default</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{768, 1024}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>Default</string>
<key>UILaunchImageOrientation</key>
<string>Landscape</string>
<key>UILaunchImageSize</key>
<string>{768, 1024}</string>
</dict>
</array>
<key>UISupportedInterfaceOrientation</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLSchemes</key>
<array>
<string>${PRODUCT_NAME:rfc1034identifier}.http</string>
<string>${PRODUCT_NAME:rfc1034identifier}.https</string>
<string>${PRODUCT_NAME:rfc1034identifier}-x-callback</string>
<string>${IOS_BUNDLE_ID_PREFIX}.sso.${PRODUCT_NAME:rfc1034identifier}</string>
</array>
</dict>
</array>
<key>UTImportedTypeDeclarations</key>
<array>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.url</string>
<string>org.appextension.find-login-action</string>
</array>
<key>UTTypeDescription</key>
<string>Chrome Password Fill by App Extension Action</string>
<key>UTTypeIdentifier</key>
<string>org.appextension.chrome-password-action</string>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.url</string>
</array>
<key>UTTypeDescription</key>
<string>1Password Find Login Action</string>
<key>UTTypeIdentifier</key>
<string>org.appextension.find-login-action</string>
</dict>
</array>
<key>SSOAuthURLScheme</key>
<string>${IOS_BUNDLE_ID_PREFIX}.sso.${PRODUCT_NAME:rfc1034identifier}</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UISceneClassName</key>
<string>UIWindowScene</string>
<key>UISceneDelegateClassName</key>
<string>SceneDelegate</string>
<key>UISceneConfigurationName</key>
<string>Default Configuration</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
</dict>
</array>
</dict>
</dict>
</dict>
</plist>
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