Revert "Add a golden scenario test for fallback font rendering on iOS take 2 (#22033)" (#22095)

This reverts commit cde78c1.

Author: dnfield

testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj

@@ -28,6 +28,15 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       systemAttachmentLifetime = "keepNever">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "248D76C622E388370012F0C1"
+            BuildableName = "Scenarios.app"
+            BlueprintName = "Scenarios"
+            ReferencedContainer = "container:Scenarios.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -78,10 +87,6 @@
             argument = "--screen-before-flutter"
             isEnabled = "NO">
          </CommandLineArgument>
-         <CommandLineArgument
-            argument = "--bogus-font-text"
-            isEnabled = "NO">
-         </CommandLineArgument>
          <CommandLineArgument
             argument = "--text-semantics-focus"
             isEnabled = "NO">

testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/xcshareddata/xcschemes/Scenarios.xcscheme

@@ -27,7 +27,7 @@ - (BOOL)application:(UIApplication*)application
     self.window.tintColor = UIColor.systemPinkColor;
   }
   NSDictionary<NSString*, NSString*>* launchArgsMap = @{
-    // The golden test args should match `GoldenTestManager`.
+    // The Platform view golden test args should match `PlatformViewGoldenTestManager`.
     @"--locale-initialization" : @"locale_initialization",
     @"--platform-view" : @"platform_view",
     @"--platform-view-no-overlay-intersection" : @"platform_view_no_overlay_intersection",
@@ -52,7 +52,6 @@ - (BOOL)application:(UIApplication*)application
     @"--tap-status-bar" : @"tap_status_bar",
     @"--text-semantics-focus" : @"text_semantics_focus",
     @"--animated-color-square" : @"animated_color_square",
-    @"--bogus-font-text" : @"bogus_font_text"
   };
   __block NSString* flutterViewControllerTestName = nil;
   [launchArgsMap

testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #import <XCTest/XCTest.h>
-#import "GoldenTestManager.h"
+#import "PlatformViewGoldenTestManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -12,19 +12,20 @@ NS_ASSUME_NONNULL_BEGIN
 // A new PlatformView golden tests can subclass this and override the `-initiWithInvocation:`
 // method, which then retun the `-initWithManager:invocation:`
 //
-// Then in any test method, call `checkPlatformViewGolden` to perform the golden test.
+// Then in any test method, call `checkGolden` to perform the golden test.
 //
 // This base class doesn't run any test case on its own.
 @interface GoldenPlatformViewTests : XCTestCase
 
 @property(nonatomic, strong) XCUIApplication* application;
 
-// Initialize with a `GoldenTestManager`.
-- (instancetype)initWithManager:(GoldenTestManager*)manager invocation:(NSInvocation*)invocation;
+// Initialize with a `PlatformViewGoldenTestManager`.
+- (instancetype)initWithManager:(PlatformViewGoldenTestManager*)manager
+                     invocation:(NSInvocation*)invocation;
 
 // Take a sceenshot of the test app and check it has the same pixels with goldenImage inside the
-// `GoldenTestManager`.
-- (void)checkPlatformViewGolden;
+// `PlatformViewGoldenTestManager`.
+- (void)checkGolden;
 
 @end
 

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

@@ -5,21 +5,23 @@
 #import "GoldenPlatformViewTests.h"
 
 #include <sys/sysctl.h>
-#import "GoldenTestManager.h"
+
+#import "PlatformViewGoldenTestManager.h"
 
 static const NSInteger kSecondsToWaitForPlatformView = 30;
 
 @interface GoldenPlatformViewTests ()
 
 @property(nonatomic, copy) NSString* goldenName;
 
-@property(nonatomic, strong) GoldenTestManager* manager;
+@property(nonatomic, strong) PlatformViewGoldenTestManager* manager;
 
 @end
 
 @implementation GoldenPlatformViewTests
 
-- (instancetype)initWithManager:(GoldenTestManager*)manager invocation:(NSInvocation*)invocation {
+- (instancetype)initWithManager:(PlatformViewGoldenTestManager*)manager
+                     invocation:(NSInvocation*)invocation {
   self = [super initWithInvocation:invocation];
   _manager = manager;
   return self;
@@ -35,7 +37,7 @@ - (void)setUp {
 }
 
 // Note: don't prefix with "test" or GoldenPlatformViewTests will run instead of the subclasses.
-- (void)checkPlatformViewGolden {
+- (void)checkGolden {
   XCUIElement* element = self.application.textViews.firstMatch;
   BOOL exists = [element waitForExistenceWithTimeout:kSecondsToWaitForPlatformView];
   if (!exists) {
@@ -45,6 +47,29 @@ - (void)checkPlatformViewGolden {
             @(kSecondsToWaitForPlatformView));
   }
 
-  [self.manager checkGoldenForTest:self];
+  GoldenImage* golden = self.manager.goldenImage;
+
+  XCUIScreenshot* screenshot = [[XCUIScreen mainScreen] screenshot];
+  if (!golden.image) {
+    XCTAttachment* attachment = [XCTAttachment attachmentWithScreenshot:screenshot];
+    attachment.name = @"new_golden";
+    attachment.lifetime = XCTAttachmentLifetimeKeepAlways;
+    [self addAttachment:attachment];
+    XCTFail(@"This test will fail - no golden named %@ found. Follow the steps in the "
+            @"README to add a new golden.",
+            golden.goldenName);
+  }
+
+  if (![golden compareGoldenToImage:screenshot.image]) {
+    XCTAttachment* screenshotAttachment;
+    screenshotAttachment = [XCTAttachment attachmentWithImage:screenshot.image];
+    screenshotAttachment.name = golden.goldenName;
+    screenshotAttachment.lifetime = XCTAttachmentLifetimeKeepAlways;
+    [self addAttachment:screenshotAttachment];
+
+    XCTFail(@"Goldens to not match. Follow the steps in the "
+            @"README to update golden named %@ if needed.",
+            golden.goldenName);
+  }
 }
 @end

testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.h

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
+
 #import "GoldenImage.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -14,7 +14,7 @@ extern NSDictionary* launchArgsMap;
 //
 // It creates the correct `identifer` based on the `launchArg`.
 // It also generates the correct GoldenImage based on the `identifier`.
-@interface GoldenTestManager : NSObject
+@interface PlatformViewGoldenTestManager : NSObject
 
 @property(readonly, strong, nonatomic) GoldenImage* goldenImage;
 @property(readonly, copy, nonatomic) NSString* identifier;
@@ -25,10 +25,6 @@ extern NSDictionary* launchArgsMap;
 // Crahes if the launchArg is not mapped in `Appdelegate.launchArgsMap`.
 - (instancetype)initWithLaunchArg:(NSString*)launchArg;
 
-// Take a sceenshot of the test app and check it has the same pixels with
-// goldenImage inside the `GoldenTestManager`.
-- (void)checkGoldenForTest:(XCTestCase*)test;
-
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "GoldenTestManager.h"
+#import "PlatformViewGoldenTestManager.h"
+
 #import <XCTest/XCTest.h>
 
-@interface GoldenTestManager ()
+@interface PlatformViewGoldenTestManager ()
 
 @property(readwrite, strong, nonatomic) GoldenImage* goldenImage;
 
 @end
 
-@implementation GoldenTestManager
+@implementation PlatformViewGoldenTestManager
 
 NSDictionary* launchArgsMap;
 
@@ -33,7 +34,6 @@ - (instancetype)initWithLaunchArg:(NSString*)launchArg {
         @"--platform-view-transform" : @"platform_view_transform",
         @"--platform-view-opacity" : @"platform_view_opacity",
         @"--platform-view-rotate" : @"platform_view_rotate",
-        @"--bogus-font-text" : @"bogus_font_text",
       };
     });
     _identifier = launchArgsMap[launchArg];
@@ -44,32 +44,4 @@ - (instancetype)initWithLaunchArg:(NSString*)launchArg {
   return self;
 }
 
-- (void)checkGoldenForTest:(XCTestCase*)test {
-  XCUIScreenshot* screenshot = [[XCUIScreen mainScreen] screenshot];
-  if (!_goldenImage.image) {
-    XCTAttachment* attachment = [XCTAttachment attachmentWithScreenshot:screenshot];
-    attachment.name = [_goldenImage.goldenName stringByAppendingString:@"_new"];
-    attachment.lifetime = XCTAttachmentLifetimeKeepAlways;
-    [test addAttachment:attachment];
-    // Instead of XCTFail because that definition changed between Xcode 11 and 12 whereas this impl
-    // is stable.
-    _XCTPrimitiveFail(test,
-                      @"This test will fail - no golden named %@ found. "
-                      @"Follow the steps in the README to add a new golden.",
-                      _goldenImage.goldenName);
-  }
-
-  if (![_goldenImage compareGoldenToImage:screenshot.image]) {
-    XCTAttachment* screenshotAttachment = [XCTAttachment attachmentWithImage:screenshot.image];
-    screenshotAttachment.name = [_goldenImage.goldenName stringByAppendingString:@"_actual"];
-    screenshotAttachment.lifetime = XCTAttachmentLifetimeKeepAlways;
-    [test addAttachment:screenshotAttachment];
-
-    _XCTPrimitiveFail(test,
-                      @"Goldens do not match. Follow the steps in the "
-                      @"README to update golden named %@ if needed.",
-                      _goldenImage.goldenName);
-  }
-}
-
 @end