Skip to content

F
Front-End
Unverified Commit 3955276e authored by Jenn Magder's avatar Jenn Magder Committed by GitHub
Browse files
Options

Migrate ios_add2app_life_cycle to earlgrey 2 and latest iOS SDK (#80822)

parent 63ba1b23
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 207 deletions
dev/integration_tests/ios_add2app_life_cycle/Podfile
View file @ 3955276e
...@@ -6,10 +6,10 @@ load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb') ...@@ -6,10 +6,10 @@ load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
target 'ios_add2app' do target 'ios_add2app' do
install_all_flutter_pods(flutter_application_path) install_all_flutter_pods(flutter_application_path)
pod 'EarlGreyApp'
end end
target 'ios_add2appTests' do target 'ios_add2appTests' do
inherit! :search_paths
install_flutter_engine_pod install_flutter_engine_pod
pod 'EarlGrey' pod 'EarlGreyTest'
end end
dev/integration_tests/ios_add2app_life_cycle/build_and_test.sh
View file @ 3955276e
...@@ -12,11 +12,9 @@ pushd flutterapp ...@@ -12,11 +12,9 @@ pushd flutterapp
popd popd
pod install pod install
os_version=$(xcrun --show-sdk-version --sdk iphonesimulator)
xcrun xcodebuild \
xcodebuild \
-workspace ios_add2app.xcworkspace \ -workspace ios_add2app.xcworkspace \
-scheme ios_add2app \ -scheme ios_add2app \
-sdk "iphonesimulator$os_version" \ -sdk "iphonesimulator" \
-destination "OS=$os_version,name=iPhone X" test -destination "OS=latest,name=iPhone 12" test
dev/integration_tests/ios_add2app_life_cycle/ios_add2app.xcodeproj/project.pbxproj
View file @ 3955276e
...@@ -7,21 +7,19 @@ ...@@ -7,21 +7,19 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
09C65652A2B48A21C94FF831 /* EarlGrey.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE1EF0F5719FBB45225A9EC3 /* EarlGrey.framework */; }; 0FD78DA73A20ACC9355B27B9 /* libPods-ios_add2appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 86B9DCFF5941A3BAC28862C3 /* libPods-ios_add2appTests.a */; };
24D2933821A29628008787A5 /* IntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 24D2933721A29628008787A5 /* IntegrationTests.m */; };
24E221BA21A28A0B008ADF09 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221B921A28A0B008ADF09 /* AppDelegate.m */; }; 24E221BA21A28A0B008ADF09 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221B921A28A0B008ADF09 /* AppDelegate.m */; };
24E221C821A28A0C008ADF09 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221C721A28A0C008ADF09 /* main.m */; }; 24E221C821A28A0C008ADF09 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221C721A28A0C008ADF09 /* main.m */; };
24E221DD21A28B23008ADF09 /* FullScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D321A28B23008ADF09 /* FullScreenViewController.m */; }; 24E221DD21A28B23008ADF09 /* FullScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D321A28B23008ADF09 /* FullScreenViewController.m */; };
24E221DE21A28B23008ADF09 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D421A28B23008ADF09 /* MainViewController.m */; }; 24E221DE21A28B23008ADF09 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D421A28B23008ADF09 /* MainViewController.m */; };
24E221E021A28B23008ADF09 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24E221D721A28B23008ADF09 /* Launch Screen.storyboard */; }; 24E221E021A28B23008ADF09 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24E221D721A28B23008ADF09 /* Launch Screen.storyboard */; };
24E221E221A28B36008ADF09 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 24E221E121A28B36008ADF09 /* Assets.xcassets */; }; 24E221E221A28B36008ADF09 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 24E221E121A28B36008ADF09 /* Assets.xcassets */; };
4C21FEB4D629B570C74073D1 /* libPods-ios_add2appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F90B141A9A8A680033E97924 /* libPods-ios_add2appTests.a */; };
8BDD73EC12DFA6CD2AC4EEDA /* EarlGrey.framework in EarlGrey Copy Files */ = {isa = PBXBuildFile; fileRef = DE1EF0F5719FBB45225A9EC3 /* EarlGrey.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
DB9A200AFEB7AAE22B4E12E4 /* libPods-ios_add2app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */; }; DB9A200AFEB7AAE22B4E12E4 /* libPods-ios_add2app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */; };
F73B66B8262F6FE1002080A0 /* IntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F73B66B7262F6FE1002080A0 /* IntegrationTests.m */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
24D2933A21A29628008787A5 /* PBXContainerItemProxy */ = { F73B66B2262F6F87002080A0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 24E221AD21A28A0B008ADF09 /* Project object */; containerPortal = 24E221AD21A28A0B008ADF09 /* Project object */;
proxyType = 1; proxyType = 1;
...@@ -30,25 +28,9 @@ ...@@ -30,25 +28,9 @@
}; };
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
C155689B0EB46CB1FF251109 /* EarlGrey Copy Files */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "$(TEST_HOST)/../";
dstSubfolderSpec = 0;
files = (
8BDD73EC12DFA6CD2AC4EEDA /* EarlGrey.framework in EarlGrey Copy Files */,
);
name = "EarlGrey Copy Files";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
1622526A2A969A03715C04EF /* Pods-ios_add2appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests.release.xcconfig"; sourceTree = "<group>"; };
16D27B9BE77DC8804292A9A9 /* Pods-ios_add2appUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appUITests/Pods-ios_add2appUITests.release.xcconfig"; sourceTree = "<group>"; }; 16D27B9BE77DC8804292A9A9 /* Pods-ios_add2appUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appUITests/Pods-ios_add2appUITests.release.xcconfig"; sourceTree = "<group>"; };
24D2933521A29627008787A5 /* ios_add2appTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ios_add2appTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
24D2933721A29628008787A5 /* IntegrationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IntegrationTests.m; sourceTree = "<group>"; };
24D2933921A29628008787A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
24E221B521A28A0B008ADF09 /* ios_add2app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ios_add2app.app; sourceTree = BUILT_PRODUCTS_DIR; }; 24E221B521A28A0B008ADF09 /* ios_add2app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ios_add2app.app; sourceTree = BUILT_PRODUCTS_DIR; };
24E221B821A28A0B008ADF09 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 24E221B821A28A0B008ADF09 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
24E221B921A28A0B008ADF09 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; 24E221B921A28A0B008ADF09 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
...@@ -61,53 +43,41 @@ ...@@ -61,53 +43,41 @@
24E221D721A28B23008ADF09 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; }; 24E221D721A28B23008ADF09 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
24E221E121A28B36008ADF09 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 24E221E121A28B36008ADF09 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
36DA6BEAA5127D74EC6E3E13 /* Pods-ios_add2appUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appUITests/Pods-ios_add2appUITests.debug.xcconfig"; sourceTree = "<group>"; }; 36DA6BEAA5127D74EC6E3E13 /* Pods-ios_add2appUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appUITests/Pods-ios_add2appUITests.debug.xcconfig"; sourceTree = "<group>"; };
52EA0B290EEBC1D28BF6E803 /* libPods-ios_add2appUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2appUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
74266A4D94FA1C3157B5B560 /* Pods-ios_add2appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests.debug.xcconfig"; sourceTree = "<group>"; };
762E954C71D922C091619CD4 /* Pods-ios_add2app-ios_add2appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app-ios_add2appTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app-ios_add2appTests/Pods-ios_add2app-ios_add2appTests.debug.xcconfig"; sourceTree = "<group>"; };
7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2app.a"; sourceTree = BUILT_PRODUCTS_DIR; };
83017A33946358F55BAE24E1 /* Pods-ios_add2appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests.release.xcconfig"; sourceTree = "<group>"; }; 86B9DCFF5941A3BAC28862C3 /* libPods-ios_add2appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
98A4882F55A3E107DFCB67D8 /* Pods-ios_add2app-ios_add2appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app-ios_add2appTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app-ios_add2appTests/Pods-ios_add2app-ios_add2appTests.release.xcconfig"; sourceTree = "<group>"; };
A18D4CDABD6795975FD6B49F /* Pods-ios_add2app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app/Pods-ios_add2app.release.xcconfig"; sourceTree = "<group>"; }; A18D4CDABD6795975FD6B49F /* Pods-ios_add2app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app/Pods-ios_add2app.release.xcconfig"; sourceTree = "<group>"; };
CCFA174387D083C931FB85D0 /* Pods-ios_add2app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app/Pods-ios_add2app.debug.xcconfig"; sourceTree = "<group>"; }; CCFA174387D083C931FB85D0 /* Pods-ios_add2app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app/Pods-ios_add2app.debug.xcconfig"; sourceTree = "<group>"; };
DE1EF0F5719FBB45225A9EC3 /* EarlGrey.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EarlGrey.framework; path = Pods/EarlGrey/EarlGrey/EarlGrey.framework; sourceTree = SOURCE_ROOT; }; F0AC448427DBFDC9CC64258E /* Pods-ios_add2appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests.debug.xcconfig"; sourceTree = "<group>"; };
F90B141A9A8A680033E97924 /* libPods-ios_add2appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; F73B66AD262F6F87002080A0 /* ios_add2appTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ios_add2appTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F73B66B1262F6F87002080A0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F73B66B7262F6FE1002080A0 /* IntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IntegrationTests.m; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
24D2933221A29627008787A5 /* Frameworks */ = { 24E221B221A28A0B008ADF09 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
09C65652A2B48A21C94FF831 /* EarlGrey.framework in Frameworks */, DB9A200AFEB7AAE22B4E12E4 /* libPods-ios_add2app.a in Frameworks */,
4C21FEB4D629B570C74073D1 /* libPods-ios_add2appTests.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
24E221B221A28A0B008ADF09 /* Frameworks */ = { F73B66AA262F6F87002080A0 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
DB9A200AFEB7AAE22B4E12E4 /* libPods-ios_add2app.a in Frameworks */, 0FD78DA73A20ACC9355B27B9 /* libPods-ios_add2appTests.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
24D2933621A29628008787A5 /* ios_add2appTests */ = {
isa = PBXGroup;
children = (
24D2933721A29628008787A5 /* IntegrationTests.m */,
24D2933921A29628008787A5 /* Info.plist */,
);
path = ios_add2appTests;
sourceTree = "<group>";
};
24E221AC21A28A0B008ADF09 = { 24E221AC21A28A0B008ADF09 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
24E221B721A28A0B008ADF09 /* ios_add2app */, 24E221B721A28A0B008ADF09 /* ios_add2app */,
24D2933621A29628008787A5 /* ios_add2appTests */, F73B66AE262F6F87002080A0 /* ios_add2appTests */,
24E221B621A28A0B008ADF09 /* Products */, 24E221B621A28A0B008ADF09 /* Products */,
F8E51775C9B1473BB9A1386D /* Pods */, F8E51775C9B1473BB9A1386D /* Pods */,
8403FDDD872DC11EF3710BB4 /* Frameworks */, 8403FDDD872DC11EF3710BB4 /* Frameworks */,
...@@ -118,7 +88,7 @@ ...@@ -118,7 +88,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
24E221B521A28A0B008ADF09 /* ios_add2app.app */, 24E221B521A28A0B008ADF09 /* ios_add2app.app */,
24D2933521A29627008787A5 /* ios_add2appTests.xctest */, F73B66AD262F6F87002080A0 /* ios_add2appTests.xctest */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -144,13 +114,20 @@ ...@@ -144,13 +114,20 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */, 7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */,
DE1EF0F5719FBB45225A9EC3 /* EarlGrey.framework */, 86B9DCFF5941A3BAC28862C3 /* libPods-ios_add2appTests.a */,
52EA0B290EEBC1D28BF6E803 /* libPods-ios_add2appUITests.a */,
F90B141A9A8A680033E97924 /* libPods-ios_add2appTests.a */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
F73B66AE262F6F87002080A0 /* ios_add2appTests */ = {
isa = PBXGroup;
children = (
F73B66B7262F6FE1002080A0 /* IntegrationTests.m */,
F73B66B1262F6F87002080A0 /* Info.plist */,
);
path = ios_add2appTests;
sourceTree = "<group>";
};
F8E51775C9B1473BB9A1386D /* Pods */ = { F8E51775C9B1473BB9A1386D /* Pods */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -158,10 +135,8 @@ ...@@ -158,10 +135,8 @@
A18D4CDABD6795975FD6B49F /* Pods-ios_add2app.release.xcconfig */, A18D4CDABD6795975FD6B49F /* Pods-ios_add2app.release.xcconfig */,
36DA6BEAA5127D74EC6E3E13 /* Pods-ios_add2appUITests.debug.xcconfig */, 36DA6BEAA5127D74EC6E3E13 /* Pods-ios_add2appUITests.debug.xcconfig */,
16D27B9BE77DC8804292A9A9 /* Pods-ios_add2appUITests.release.xcconfig */, 16D27B9BE77DC8804292A9A9 /* Pods-ios_add2appUITests.release.xcconfig */,
74266A4D94FA1C3157B5B560 /* Pods-ios_add2appTests.debug.xcconfig */, F0AC448427DBFDC9CC64258E /* Pods-ios_add2appTests.debug.xcconfig */,
83017A33946358F55BAE24E1 /* Pods-ios_add2appTests.release.xcconfig */, 1622526A2A969A03715C04EF /* Pods-ios_add2appTests.release.xcconfig */,
762E954C71D922C091619CD4 /* Pods-ios_add2app-ios_add2appTests.debug.xcconfig */,
98A4882F55A3E107DFCB67D8 /* Pods-ios_add2app-ios_add2appTests.release.xcconfig */,
); );
name = Pods; name = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -169,27 +144,6 @@ ...@@ -169,27 +144,6 @@
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
24D2933421A29627008787A5 /* ios_add2appTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 24D2933C21A29628008787A5 /* Build configuration list for PBXNativeTarget "ios_add2appTests" */;
buildPhases = (
DE5CDCD8B3565EAB9F38F455 /* [CP] Check Pods Manifest.lock */,
24D2933121A29627008787A5 /* Sources */,
24D2933221A29627008787A5 /* Frameworks */,
24D2933321A29627008787A5 /* Resources */,
C155689B0EB46CB1FF251109 /* EarlGrey Copy Files */,
E32E699BE7026038F5987095 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
24D2933B21A29628008787A5 /* PBXTargetDependency */,
);
name = ios_add2appTests;
productName = ios_add2appTests;
productReference = 24D2933521A29627008787A5 /* ios_add2appTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
24E221B421A28A0B008ADF09 /* ios_add2app */ = { 24E221B421A28A0B008ADF09 /* ios_add2app */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 24E221CB21A28A0C008ADF09 /* Build configuration list for PBXNativeTarget "ios_add2app" */; buildConfigurationList = 24E221CB21A28A0C008ADF09 /* Build configuration list for PBXNativeTarget "ios_add2app" */;
...@@ -210,6 +164,26 @@ ...@@ -210,6 +164,26 @@
productReference = 24E221B521A28A0B008ADF09 /* ios_add2app.app */; productReference = 24E221B521A28A0B008ADF09 /* ios_add2app.app */;
productType = "com.apple.product-type.application"; productType = "com.apple.product-type.application";
}; };
F73B66AC262F6F87002080A0 /* ios_add2appTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = F73B66B6262F6F87002080A0 /* Build configuration list for PBXNativeTarget "ios_add2appTests" */;
buildPhases = (
F841B20A4BA845744CC6A838 /* [CP] Check Pods Manifest.lock */,
F73B66A9262F6F87002080A0 /* Sources */,
F73B66AA262F6F87002080A0 /* Frameworks */,
F73B66AB262F6F87002080A0 /* Resources */,
B7873FC60D5B7AA97A1DE937 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
F73B66B3262F6F87002080A0 /* PBXTargetDependency */,
);
name = ios_add2appTests;
productName = ios_add2appUITests;
productReference = F73B66AD262F6F87002080A0 /* ios_add2appTests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
/* Begin PBXProject section */ /* Begin PBXProject section */
...@@ -219,13 +193,13 @@ ...@@ -219,13 +193,13 @@
LastUpgradeCheck = 1000; LastUpgradeCheck = 1000;
ORGANIZATIONNAME = Flutter.io; ORGANIZATIONNAME = Flutter.io;
TargetAttributes = { TargetAttributes = {
24D2933421A29627008787A5 = {
CreatedOnToolsVersion = 10.0;
TestTargetID = 24E221B421A28A0B008ADF09;
};
24E221B421A28A0B008ADF09 = { 24E221B421A28A0B008ADF09 = {
CreatedOnToolsVersion = 10.0; CreatedOnToolsVersion = 10.0;
}; };
F73B66AC262F6F87002080A0 = {
CreatedOnToolsVersion = 12.5;
TestTargetID = 24E221B421A28A0B008ADF09;
};
}; };
}; };
buildConfigurationList = 24E221B021A28A0B008ADF09 /* Build configuration list for PBXProject "ios_add2app" */; buildConfigurationList = 24E221B021A28A0B008ADF09 /* Build configuration list for PBXProject "ios_add2app" */;
...@@ -242,25 +216,25 @@ ...@@ -242,25 +216,25 @@
projectRoot = ""; projectRoot = "";
targets = ( targets = (
24E221B421A28A0B008ADF09 /* ios_add2app */, 24E221B421A28A0B008ADF09 /* ios_add2app */,
24D2933421A29627008787A5 /* ios_add2appTests */, F73B66AC262F6F87002080A0 /* ios_add2appTests */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */ /* Begin PBXResourcesBuildPhase section */
24D2933321A29627008787A5 /* Resources */ = { 24E221B321A28A0B008ADF09 /* Resources */ = {
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
24E221E021A28B23008ADF09 /* Launch Screen.storyboard in Resources */,
24E221E221A28B36008ADF09 /* Assets.xcassets in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
24E221B321A28A0B008ADF09 /* Resources */ = { F73B66AB262F6F87002080A0 /* Resources */ = {
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
24E221E021A28B23008ADF09 /* Launch Screen.storyboard in Resources */,
24E221E221A28B36008ADF09 /* Assets.xcassets in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -294,16 +268,10 @@ ...@@ -294,16 +268,10 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
); );
inputPaths = (
"${SRCROOT}/flutterapp/.metadata",
"${SRCROOT}/flutterapp/.ios/Flutter/App.framework/App",
"${SRCROOT}/flutterapp/.ios/Flutter/engine/Flutter.framework/Flutter",
"${SRCROOT}/flutterapp/.ios/Flutter/flutter_export_environment.sh",
);
name = "[CP-User] Run Flutter Build ios_add2app_life_cycle_flutter Script"; name = "[CP-User] Run Flutter Build ios_add2app_life_cycle_flutter Script";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "set -e\nset -u\nsource \"${SRCROOT}/flutterapp/.ios/Flutter/flutter_export_environment.sh\"\n\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build"; shellScript = "set -e\nset -u\nsource \"${SRCROOT}/flutterapp/.ios/Flutter/flutter_export_environment.sh\"\nexport VERBOSE_SCRIPT_LOGGING=1 && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build";
}; };
7FADF19EC61F97E525982780 /* [CP] Embed Pods Frameworks */ = { 7FADF19EC61F97E525982780 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
...@@ -322,118 +290,78 @@ ...@@ -322,118 +290,78 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios_add2app/Pods-ios_add2app-frameworks.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios_add2app/Pods-ios_add2app-frameworks.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
DE5CDCD8B3565EAB9F38F455 /* [CP] Check Pods Manifest.lock */ = { B7873FC60D5B7AA97A1DE937 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
); );
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
); );
inputPaths = ( name = "[CP] Embed Pods Frameworks";
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = ( outputFileListPaths = (
); "${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ios_add2appTests-checkManifestLockResult.txt",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
E32E699BE7026038F5987095 /* [CP] Embed Pods Frameworks */ = { F841B20A4BA845744CC6A838 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
); );
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
); );
name = "[CP] Embed Pods Frameworks"; inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = ( outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", );
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ios_add2appTests-checkManifestLockResult.txt",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks.sh\"\n"; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
24D2933121A29627008787A5 /* Sources */ = { 24E221B121A28A0B008ADF09 /* Sources */ = {
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
24D2933821A29628008787A5 /* IntegrationTests.m in Sources */, 24E221C821A28A0C008ADF09 /* main.m in Sources */,
24E221DE21A28B23008ADF09 /* MainViewController.m in Sources */,
24E221DD21A28B23008ADF09 /* FullScreenViewController.m in Sources */,
24E221BA21A28A0B008ADF09 /* AppDelegate.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
24E221B121A28A0B008ADF09 /* Sources */ = { F73B66A9262F6F87002080A0 /* Sources */ = {
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
24E221C821A28A0C008ADF09 /* main.m in Sources */, F73B66B8262F6FE1002080A0 /* IntegrationTests.m in Sources */,
24E221DE21A28B23008ADF09 /* MainViewController.m in Sources */,
24E221DD21A28B23008ADF09 /* FullScreenViewController.m in Sources */,
24E221BA21A28A0B008ADF09 /* AppDelegate.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
24D2933B21A29628008787A5 /* PBXTargetDependency */ = { F73B66B3262F6F87002080A0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 24E221B421A28A0B008ADF09 /* ios_add2app */; target = 24E221B421A28A0B008ADF09 /* ios_add2app */;
targetProxy = 24D2933A21A29628008787A5 /* PBXContainerItemProxy */; targetProxy = F73B66B2262F6F87002080A0 /* PBXContainerItemProxy */;
}; };
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
24D2933D21A29628008787A5 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 74266A4D94FA1C3157B5B560 /* Pods-ios_add2appTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = S8QB4VV633;
INFOPLIST_FILE = ios_add2appTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "org.test.ios-add2appTests";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ios_add2app.app/ios_add2app";
};
name = Debug;
};
24D2933E21A29628008787A5 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 83017A33946358F55BAE24E1 /* Pods-ios_add2appTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = S8QB4VV633;
INFOPLIST_FILE = ios_add2appTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "org.test.ios-add2appTests";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ios_add2app.app/ios_add2app";
};
name = Release;
};
24E221C921A28A0C008ADF09 /* Debug */ = { 24E221C921A28A0C008ADF09 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
...@@ -596,18 +524,49 @@ ...@@ -596,18 +524,49 @@
}; };
name = Release; name = Release;
}; };
F73B66B4262F6F87002080A0 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F0AC448427DBFDC9CC64258E /* Pods-ios_add2appTests.debug.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = S8QB4VV633;
INFOPLIST_FILE = ios_add2appTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.5;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.flutterio.ios-add2appTests";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = ios_add2app;
};
name = Debug;
};
F73B66B5262F6F87002080A0 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1622526A2A969A03715C04EF /* Pods-ios_add2appTests.release.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = S8QB4VV633;
INFOPLIST_FILE = ios_add2appTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.5;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.flutterio.ios-add2appTests";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = ios_add2app;
};
name = Release;
};
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
24D2933C21A29628008787A5 /* Build configuration list for PBXNativeTarget "ios_add2appTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
24D2933D21A29628008787A5 /* Debug */,
24D2933E21A29628008787A5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
24E221B021A28A0B008ADF09 /* Build configuration list for PBXProject "ios_add2app" */ = { 24E221B021A28A0B008ADF09 /* Build configuration list for PBXProject "ios_add2app" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
...@@ -626,6 +585,15 @@ ...@@ -626,6 +585,15 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
F73B66B6262F6F87002080A0 /* Build configuration list for PBXNativeTarget "ios_add2appTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
F73B66B4262F6F87002080A0 /* Debug */,
F73B66B5262F6F87002080A0 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };
rootObject = 24E221AD21A28A0B008ADF09 /* Project object */; rootObject = 24E221AD21A28A0B008ADF09 /* Project object */;
......
dev/integration_tests/ios_add2app_life_cycle/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2app.xcscheme
View file @ 3955276e
...@@ -27,29 +27,27 @@ ...@@ -27,29 +27,27 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"> shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "24E221B421A28A0B008ADF09"
BuildableName = "ios_add2app.app"
BlueprintName = "ios_add2app"
ReferencedContainer = "container:ios_add2app.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables> <Testables>
<TestableReference <TestableReference
skipped = "NO"> skipped = "NO">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "24D2933421A29627008787A5" BlueprintIdentifier = "F73B66AC262F6F87002080A0"
BuildableName = "ios_add2appTests.xctest" BuildableName = "ios_add2appTests.xctest"
BlueprintName = "ios_add2appTests" BlueprintName = "ios_add2appTests"
ReferencedContainer = "container:ios_add2app.xcodeproj"> ReferencedContainer = "container:ios_add2app.xcodeproj">
</BuildableReference> </BuildableReference>
</TestableReference> </TestableReference>
</Testables> </Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "24E221B421A28A0B008ADF09"
BuildableName = "ios_add2app.app"
BlueprintName = "ios_add2app"
ReferencedContainer = "container:ios_add2app.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Debug"
...@@ -71,8 +69,6 @@ ...@@ -71,8 +69,6 @@
ReferencedContainer = "container:ios_add2app.xcodeproj"> ReferencedContainer = "container:ios_add2app.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release" buildConfiguration = "Release"
......
dev/integration_tests/ios_add2app_life_cycle/ios_add2app/AppDelegate.h
View file @ 3955276e
...@@ -5,8 +5,16 @@ ...@@ -5,8 +5,16 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import <Flutter/Flutter.h> #import <Flutter/Flutter.h>
@interface AppDelegate : FlutterAppDelegate #import <EarlGreyTest/GREYHostApplicationDistantObject.h>
@property(nonatomic, strong, readonly) FlutterEngine* engine; NS_ASSUME_NONNULL_BEGIN
@interface GREYHostApplicationDistantObject (AppDelegate)
- (NSNotificationCenter *)notificationCenter;
@end @end
@interface AppDelegate : FlutterAppDelegate
@property(nonatomic, strong, readonly) FlutterEngine* engine;
@end
NS_ASSUME_NONNULL_END
dev/integration_tests/ios_add2app_life_cycle/ios_add2app/AppDelegate.m
View file @ 3955276e
...@@ -5,6 +5,14 @@ ...@@ -5,6 +5,14 @@
#import "AppDelegate.h" #import "AppDelegate.h"
#import "MainViewController.h" #import "MainViewController.h"
@implementation GREYHostApplicationDistantObject (AppDelegate)
- (NSNotificationCenter *)notificationCenter {
return [NSNotificationCenter defaultCenter];
}
@end
@interface AppDelegate () @interface AppDelegate ()
@property(nonatomic, strong, readwrite) FlutterEngine* engine; @property(nonatomic, strong, readwrite) FlutterEngine* engine;
......
dev/integration_tests/ios_add2app_life_cycle/ios_add2appTests/Info.plist
View file @ 3955276e
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string> <string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>1.0</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
dev/integration_tests/ios_add2app_life_cycle/ios_add2appTests/IntegrationTests.m
View file @ 3955276e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +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 <EarlGrey/EarlGrey.h> #import <EarlGreyTest/EarlGrey.h>
#import <XCTest/XCTest.h> #import <XCTest/XCTest.h>
#import "AppDelegate.h" #import "AppDelegate.h"
...@@ -13,33 +13,27 @@ ...@@ -13,33 +13,27 @@
@implementation FlutterTests @implementation FlutterTests
- (void)expectSemanticsNotification:(UIViewController*)viewController - (void)setUp {
engine:(FlutterEngine*)engine { self.continueAfterFailure = NO;
// Flutter app will only send semantics update if test passes in main.dart. XCUIApplication *app = [[XCUIApplication alloc] init];
[self expectationForNotification:FlutterSemanticsUpdateNotification object:viewController handler:nil]; [app launch];
[self waitForExpectationsWithTimeout:30.0 handler:nil];
}
- (void)checkAppConnection {
FlutterEngine *engine = [((AppDelegate *)[[UIApplication sharedApplication] delegate]) engine];
UINavigationController *navController =
(UINavigationController *)((AppDelegate *)
[[UIApplication sharedApplication]
delegate])
.window.rootViewController;
__weak UIViewController *weakViewController = navController.visibleViewController;
[self expectSemanticsNotification:weakViewController
engine:engine];
GREYAssertNotNil(weakViewController,
@"Expected non-nil FullScreenViewController.");
} }
- (void)testFullScreenCanPop { - (void)testFullScreenCanPop {
XCTestExpectation *notificationReceived = [self expectationWithDescription:@"Remote semantics notification"];
NSNotificationCenter *notificationCenter = [[GREYHostApplicationDistantObject sharedInstance] notificationCenter];
id observer = [notificationCenter addObserverForName:FlutterSemanticsUpdateNotification object:nil queue:nil usingBlock:^(NSNotification *notification) {
XCTAssertTrue([notification.object isKindOfClass:GREY_REMOTE_CLASS_IN_APP(FullScreenViewController)]);
[notificationReceived fulfill];
}];
[[EarlGrey selectElementWithMatcher:grey_keyWindow()] [[EarlGrey selectElementWithMatcher:grey_keyWindow()]
assertWithMatcher:grey_sufficientlyVisible()]; assertWithMatcher:grey_sufficientlyVisible()];
[[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Full Screen (Cold)")] [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Full Screen (Cold)")]
performAction:grey_tap()]; performAction:grey_tap()];
[self checkAppConnection];
[self waitForExpectationsWithTimeout:30.0 handler:nil];
[notificationCenter removeObserver:observer];
} }
@end @end
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

HIAST - GitLab