Add iOS version to scenario golden images

testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.m

@@ -102,10 +102,11 @@ - (BOOL)compareGoldenToImage:(UIImage*)image {
 }
 
 NS_INLINE NSString* _platformName() {
+  NSString* systemVersion = UIDevice.currentDevice.systemVersion;
   NSString* simulatorName =
       [[NSProcessInfo processInfo].environment objectForKey:@"SIMULATOR_DEVICE_NAME"];
   if (simulatorName) {
-    return [NSString stringWithFormat:@"%@_simulator", simulatorName];
+    return [NSString stringWithFormat:@"%@_%@_simulator", simulatorName, systemVersion];
   }
 
   size_t size;

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];

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

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");
 }