Run iOS scenario apps on iPhone 11 and iOS 14 (flutter#30104)

nkoneko · Dec 7, 2021 · 9b74c21 · 9b74c21
1 parent 6551934
commit 9b74c21
Show file tree

Hide file tree

Showing 41 changed files with 91 additions and 118 deletions.
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj b/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj
diff --git a/.../scenario_app/ios/Scenarios/Scenarios.xcodeproj/xcshareddata/xcschemes/Scenarios.xcscheme b/.../scenario_app/ios/Scenarios/Scenarios.xcodeproj/xcshareddata/xcschemes/Scenarios.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.m
@@ -33,8 +33,14 @@ - (BOOL)compareGoldenToImage:(UIImage*)image {
     os_log_error(OS_LOG_DEFAULT, "GOLDEN DIFF FAILED: image does not exists.");
     return NO;
   }
-  CGImageRef imageRefA = [self.image CGImage];
-  CGImageRef imageRefB = [image CGImage];
+
+  // The home bar at the bottom of the screen can be different shades of gray
+  // depending on how long ago it animated in. This differences causes golden flakes.
+  // Adjust the height by 25 to crop put the home bar. This value may need to be adjusted
+  // depending on SDK and device type captured in the goldens.
+  CGRect imageRect = {CGPointZero, CGSizeMake(image.size.width, image.size.height - 25)};
+  CGImageRef imageRefA = CGImageCreateWithImageInRect(self.image.CGImage, imageRect);
+  CGImageRef imageRefB = CGImageCreateWithImageInRect(image.CGImage, imageRect);
 
   NSUInteger widthA = CGImageGetWidth(imageRefA);
   NSUInteger heightA = CGImageGetHeight(imageRefA);

diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m
@@ -39,6 +39,7 @@ - (instancetype)initWithLaunchArg:(NSString*)launchArg {
         @"--non-full-screen-flutter-view-platform-view" :
             @"non_full_screen_flutter_view_platform_view",
         @"--bogus-font-text" : @"bogus_font_text",
+        @"--spawn-engine-works" : @"spawn_engine_works",
       };
     });
     _identifier = launchArgsMap[launchArg];

diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/SpawnEngineTest.h b/testing/scenario_app/ios/Scenarios/ScenariosUITests/SpawnEngineTest.h
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/SpawnEngineTest.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/SpawnEngineTest.m
@@ -2,37 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "SpawnEngineTest.h"
-#import "GoldenImage.h"
+#import "GoldenPlatformViewTests.h"
+
+@interface SpawnEngineTest : XCTestCase
+@end
 
 @implementation SpawnEngineTest
 
-- (void)setUp {
-  [super setUp];
+- (void)testSpawnEngineWorks {
   self.continueAfterFailure = NO;
 
-  self.application = [[XCUIApplication alloc] init];
-  self.application.launchArguments = @[ @"--spawn-engine-works", @"--enable-software-rendering" ];
-  [self.application launch];
-}
+  XCUIApplication* application = [[XCUIApplication alloc] init];
+  application.launchArguments = @[ @"--spawn-engine-works", @"--enable-software-rendering" ];
+  [application launch];
 
-- (void)testSpawnEngineWorks {
-  NSString* prefix = @"golden_spawn_engine_works_";
-  GoldenImage* golden = [[GoldenImage alloc] initWithGoldenNamePrefix:prefix];
-  if (!golden.image) {
-    XCTFail(@"unable to find golden image for: %@", prefix);
-  }
-  XCUIScreenshot* screenshot = [[XCUIScreen mainScreen] screenshot];
-  if (![golden compareGoldenToImage:screenshot.image]) {
-    XCTAttachment* screenshotAttachment = [XCTAttachment attachmentWithImage:screenshot.image];
-    screenshotAttachment.name = [golden.goldenName stringByAppendingString:@"_actual"];
-    screenshotAttachment.lifetime = XCTAttachmentLifetimeKeepAlways;
-    [self addAttachment:screenshotAttachment];
-
-    XCTFail(@"Goldens do not match. Follow the steps in the "
-            @"README to update golden named %@ if needed.",
-            golden.goldenName);
-  }
+  XCUIElement* addTextField = application.textFields[@"ready"];
+  XCTAssertTrue([addTextField waitForExistenceWithTimeout:30]);
+
+  GoldenTestManager* manager =
+      [[GoldenTestManager alloc] initWithLaunchArg:@"--spawn-engine-works"];
+  [manager checkGoldenForTest:self];
 }
 
 @end
diff --git a/...p/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_iPhone 11_simulator.png b/...p/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_iPhone 11_simulator.png
diff --git a/...pp/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_iPhone 8_simulator.png b/...pp/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_iPhone 8_simulator.png
diff --git a/...Tests/golden_non_full_screen_flutter_view_platform_view_iPhone 11_simulator.png b/...Tests/golden_non_full_screen_flutter_view_platform_view_iPhone 11_simulator.png
diff --git a/...ITests/golden_non_full_screen_flutter_view_platform_view_iPhone 8_simulator.png b/...ITests/golden_non_full_screen_flutter_view_platform_view_iPhone 8_simulator.png
diff --git a/...ing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_D211AP.png b/...ing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_D211AP.png
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_D21AP.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_D21AP.png
diff --git a/...ing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_D321AP.png b/...ing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_D321AP.png
diff --git a/...cenarios/ScenariosUITests/golden_platform_view_clippath_iPhone 11_simulator.png b/...cenarios/ScenariosUITests/golden_platform_view_clippath_iPhone 11_simulator.png
diff --git a/...Scenarios/ScenariosUITests/golden_platform_view_clippath_iPhone 8_simulator.png b/...Scenarios/ScenariosUITests/golden_platform_view_clippath_iPhone 8_simulator.png
diff --git a/...cenarios/ScenariosUITests/golden_platform_view_cliprect_iPhone 11_simulator.png b/...cenarios/ScenariosUITests/golden_platform_view_cliprect_iPhone 11_simulator.png
diff --git a/...Scenarios/ScenariosUITests/golden_platform_view_cliprect_iPhone 8_simulator.png b/...Scenarios/ScenariosUITests/golden_platform_view_cliprect_iPhone 8_simulator.png
diff --git a/...enarios/ScenariosUITests/golden_platform_view_cliprrect_iPhone 11_simulator.png b/...enarios/ScenariosUITests/golden_platform_view_cliprrect_iPhone 11_simulator.png
diff --git a/...cenarios/ScenariosUITests/golden_platform_view_cliprrect_iPhone 8_simulator.png b/...cenarios/ScenariosUITests/golden_platform_view_cliprrect_iPhone 8_simulator.png
diff --git a/...app/ios/Scenarios/ScenariosUITests/golden_platform_view_iPhone 11_simulator.png b/...app/ios/Scenarios/ScenariosUITests/golden_platform_view_iPhone 11_simulator.png
diff --git a/..._app/ios/Scenarios/ScenariosUITests/golden_platform_view_iPhone 8_simulator.png b/..._app/ios/Scenarios/ScenariosUITests/golden_platform_view_iPhone 8_simulator.png
diff --git a/...sts/golden_platform_view_multiple_background_foreground_iPhone 11_simulator.png b/...sts/golden_platform_view_multiple_background_foreground_iPhone 11_simulator.png
diff --git a/...ests/golden_platform_view_multiple_background_foreground_iPhone 8_simulator.png b/...ests/golden_platform_view_multiple_background_foreground_iPhone 8_simulator.png
diff --git a/...sts/golden_platform_view_multiple_background_foreground_iPhone SE_simulator.png b/...sts/golden_platform_view_multiple_background_foreground_iPhone SE_simulator.png
diff --git a/...cenarios/ScenariosUITests/golden_platform_view_multiple_iPhone 11_simulator.png b/...cenarios/ScenariosUITests/golden_platform_view_multiple_iPhone 11_simulator.png
diff --git a/...Scenarios/ScenariosUITests/golden_platform_view_multiple_iPhone 8_simulator.png b/...Scenarios/ScenariosUITests/golden_platform_view_multiple_iPhone 8_simulator.png
diff --git a/...Scenarios/ScenariosUITests/golden_platform_view_opacity_iPhone 11_simulator.png b/...Scenarios/ScenariosUITests/golden_platform_view_opacity_iPhone 11_simulator.png
diff --git a/.../Scenarios/ScenariosUITests/golden_platform_view_opacity_iPhone 8_simulator.png b/.../Scenarios/ScenariosUITests/golden_platform_view_opacity_iPhone 8_simulator.png
diff --git a/.../Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone 11_simulator.png b/.../Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone 11_simulator.png
diff --git a/...s/Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone 8_simulator.png b/...s/Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone 8_simulator.png
diff --git a/.../Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone SE_simulator.png b/.../Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone SE_simulator.png
diff --git a/...enarios/ScenariosUITests/golden_platform_view_transform_iPhone 11_simulator.png b/...enarios/ScenariosUITests/golden_platform_view_transform_iPhone 11_simulator.png
diff --git a/...cenarios/ScenariosUITests/golden_platform_view_transform_iPhone 8_simulator.png b/...cenarios/ScenariosUITests/golden_platform_view_transform_iPhone 8_simulator.png
diff --git a/...UITests/golden_platform_view_with_other_backdrop_filter_iPhone 11_simulator.png b/...UITests/golden_platform_view_with_other_backdrop_filter_iPhone 11_simulator.png
diff --git a/...sUITests/golden_platform_view_with_other_backdrop_filter_iPhone 8_simulator.png b/...sUITests/golden_platform_view_with_other_backdrop_filter_iPhone 8_simulator.png
diff --git a/...os/Scenarios/ScenariosUITests/golden_spawn_engine_works_iPhone 11_simulator.png b/...os/Scenarios/ScenariosUITests/golden_spawn_engine_works_iPhone 11_simulator.png
diff --git a/...ios/Scenarios/ScenariosUITests/golden_spawn_engine_works_iPhone 8_simulator.png b/...ios/Scenarios/ScenariosUITests/golden_spawn_engine_works_iPhone 8_simulator.png
diff --git a/...ts/golden_two_platform_views_with_other_backdrop_filter_iPhone 11_simulator.png b/...ts/golden_two_platform_views_with_other_backdrop_filter_iPhone 11_simulator.png
diff --git a/...sts/golden_two_platform_views_with_other_backdrop_filter_iPhone 8_simulator.png b/...sts/golden_two_platform_views_with_other_backdrop_filter_iPhone 8_simulator.png
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/iPadGestureTests.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/iPadGestureTests.m
@@ -192,7 +192,7 @@ - (void)testPointerHover {
   XCTAssertNotEqual(lastHoverSequenceNumber, -1,
                     @"PointerChange.hover event did not occur for a hover");
   NSString* removeMessage = [NSString
-      stringWithFormat:@"%d,PointerChange.remove,device=0,buttons=0", lastHoverSequenceNumber + 1];
+      stringWithFormat:@"%ld,PointerChange.remove,device=0,buttons=0", lastHoverSequenceNumber + 1];
   XCTAssertTrue([app.textFields[removeMessage] waitForExistenceWithTimeout:1],
                 @"PointerChange.remove event did not occur for a hover");
 }

diff --git a/testing/scenario_app/run_ios_tests.sh b/testing/scenario_app/run_ios_tests.sh
@@ -40,6 +40,6 @@ defaults write com.apple.iphonesimulator RotateWindowWhenSignaledByGuest -int 1
 cd $SRC_DIR/out/$FLUTTER_ENGINE/scenario_app/Scenarios
 set -o pipefail && xcodebuild -sdk iphonesimulator \
   -scheme Scenarios \
-  -destination 'platform=iOS Simulator,OS=13.0,name=iPhone 8' \
+  -destination 'platform=iOS Simulator,OS=14.0,name=iPhone 11' \
   clean test \
   FLUTTER_ENGINE="$FLUTTER_ENGINE"