[pigeon] Consolidate platform test harnesses part 3 - iOS

packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Podfile

@@ -29,6 +29,10 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|

packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -37,6 +37,17 @@
          </BuildableReference>
       </MacroExpansion>
       <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "33AA165E291EB8B600ECBEEB"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/AllDatatypesTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
+@import Flutter;
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "EchoMessenger.h"
-#import "all_datatypes.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface AllDatatypesTest : XCTestCase

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/AsyncHandlersTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AsyncHandlersTest.m

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
+@import Flutter;
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "MockBinaryMessenger.h"
-#import "async_handlers.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface Value ()

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/EchoMessenger.h → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/EchoMessenger.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <Foundation/Foundation.h>
+@import Flutter;
+@import Foundation;
 
 NS_ASSUME_NONNULL_BEGIN
 

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/EnumTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/EnumTest.m

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
+@import Flutter;
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "EchoMessenger.h"
-#import "enum.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface EnumTest : XCTestCase

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/HandlerBinaryMessenger.h → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/HandlerBinaryMessenger.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <Foundation/Foundation.h>
+@import Flutter;
+@import Foundation;
 
 NS_ASSUME_NONNULL_BEGIN
 

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/ListTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/ListTest.m

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
+@import Flutter;
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "EchoMessenger.h"
-#import "list.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface ListTest : XCTestCase

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/MockBinaryMessenger.h → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/MockBinaryMessenger.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <Foundation/Foundation.h>
+@import Flutter;
+@import Foundation;
 
 NS_ASSUME_NONNULL_BEGIN
 

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/MultipleArityTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/MultipleArityTest.m

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
+@import Flutter;
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "HandlerBinaryMessenger.h"
-#import "multiple_arity.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface MultipleAritytest : XCTestCase

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/NonNullFieldsTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/NonNullFieldsTest.m

@@ -3,10 +3,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
+@import Flutter;
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "EchoMessenger.h"
-#import "non_null_fields.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface NonNullFieldsTest : XCTestCase

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/NullFieldsTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/NullFieldsTest.m

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
+@import Flutter;
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "EchoMessenger.h"
-#import "null_fields.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface NullFieldsSearchRequest ()

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/NullableReturnsTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/NullableReturnsTest.m

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <XCTest/XCTest.h>
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "EchoMessenger.h"
 #import "MockBinaryMessenger.h"
-#import "nullable_returns.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface MockNullableArgHostApi : NSObject <NRNullableArgHostApi>

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/PrimitiveTest.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/PrimitiveTest.m

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
+@import Flutter;
+@import XCTest;
+
+@import alternate_language_test_plugin;
+
 #import "EchoMessenger.h"
-#import "primitive.gen.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface PrimitiveTest : XCTestCase

packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/RunnerTests.m → packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/RunnerTests.m

@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <XCTest/XCTest.h>
-#import "message.gen.h"
+@import XCTest;
+
+@import alternate_language_test_plugin;
 
 @interface ACMessageSearchReply ()
 + (ACMessageSearchReply *)fromMap:(NSDictionary *)dict;

packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/.gitignore

@@ -0,0 +1,5 @@
+# TODO(stuartmorgan): Remove this, so that review will show the effects of
+# changes on generated files. This will need a way to avoid unnecessary churn,
+# such as a flag to suppress version stamp generation.
+*.gen.h
+*.gen.m

packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m

@@ -4,21 +4,16 @@
 
 #import "AlternateLanguageTestPlugin.h"
 
+/**
+ * This plugin is currently a no-op since only unit tests have been set up.
+ * In the future, this will register Pigeon APIs used in integration tests.
+ */
 @implementation AlternateLanguageTestPlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
-  FlutterMethodChannel *channel =
-      [FlutterMethodChannel methodChannelWithName:@"alternate_language_test_plugin"
-                                  binaryMessenger:[registrar messenger]];
-  AlternateLanguageTestPlugin *instance = [[AlternateLanguageTestPlugin alloc] init];
-  [registrar addMethodCallDelegate:instance channel:channel];
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
-  if ([@"getPlatformVersion" isEqualToString:call.method]) {
-    result([@"iOS " stringByAppendingString:[[UIDevice currentDevice] systemVersion]]);
-  } else {
-    result(FlutterMethodNotImplemented);
-  }
+  result(FlutterMethodNotImplemented);
 }
 
 @end