From de911c1e45813e54f146d09595dc25c910cdb295 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Thu, 20 Jul 2023 13:40:22 -0700 Subject: [PATCH 1/2] git reset --- packages/pigeon/CHANGELOG.md | 5 + packages/pigeon/example/README.md | 1 + .../java/io/flutter/plugins/Messages.java | 16 +- .../flutter/pigeon_example_app/Messages.g.kt | 8 +- .../example/app/ios/Runner/Messages.g.swift | 8 +- .../example/app/lib/src/messages.g.dart | 13 +- .../example/app/macos/Runner/messages.g.m | 15 +- .../pigeon/example/app/pigeons/messages.dart | 1 + .../example/app/windows/runner/messages.g.cpp | 15 +- packages/pigeon/lib/cpp_generator.dart | 159 ++++-- packages/pigeon/lib/dart_generator.dart | 130 ++--- packages/pigeon/lib/generator.dart | 209 +++++-- packages/pigeon/lib/generator_tools.dart | 53 +- packages/pigeon/lib/java_generator.dart | 120 +++- packages/pigeon/lib/kotlin_generator.dart | 93 +++- packages/pigeon/lib/objc_generator.dart | 210 +++++-- packages/pigeon/lib/pigeon_cl.dart | 4 +- packages/pigeon/lib/pigeon_lib.dart | 119 +++- packages/pigeon/lib/swift_generator.dart | 87 ++- .../mock_handler_tester/test/message.dart | 15 +- .../pigeon/mock_handler_tester/test/test.dart | 17 +- .../mock_handler_tester/test/widget_test.dart | 6 +- .../CoreTests.java | 216 ++++---- .../AsyncTest.java | 16 +- .../PrimitiveTest.java | 4 +- .../ios/RunnerTests/AsyncHandlersTest.m | 8 +- .../ios/RunnerTests/NullableReturnsTest.m | 2 +- .../ios/Classes/CoreTests.gen.m | 297 ++++++---- .../macos/Classes/CoreTests.gen.m | 297 ++++++---- .../lib/core_tests.gen.dart | 303 +++++----- .../lib/flutter_unittests.gen.dart | 10 +- .../lib/multiple_arity.gen.dart | 14 +- .../lib/non_null_fields.gen.dart | 12 +- .../lib/null_fields.gen.dart | 11 +- .../lib/nullable_returns.gen.dart | 29 +- .../lib/primitive.gen.dart | 86 +-- .../test/multiple_arity_test.dart | 3 +- .../test/null_safe_test.dart | 27 +- .../test/primitive_test.dart | 9 +- .../lib/src/generated/core_tests.gen.dart | 303 +++++----- .../com/example/test_plugin/CoreTests.gen.kt | 186 +++---- .../example/test_plugin/AsyncHandlersTest.kt | 10 +- .../com/example/test_plugin/EnumTest.kt | 2 +- .../example/test_plugin/MultipleArityTests.kt | 2 +- .../test_plugin/NullableReturnsTest.kt | 2 +- .../com/example/test_plugin/PrimitiveTest.kt | 18 +- .../ios/RunnerTests/AsyncHandlersTest.swift | 4 +- .../example/ios/RunnerTests/EnumTests.swift | 2 +- .../ios/RunnerTests/MultipleArityTests.swift | 2 +- .../RunnerTests/NullableReturnsTests.swift | 2 +- .../ios/RunnerTests/PrimitiveTests.swift | 12 +- .../ios/Classes/CoreTests.gen.swift | 186 +++---- .../macos/Classes/CoreTests.gen.swift | 186 +++---- .../windows/pigeon/core_tests.gen.cpp | 301 ++++++---- .../windows/test/multiple_arity_test.cpp | 18 +- .../windows/test/nullable_returns_test.cpp | 26 +- .../test_plugin/windows/test/pigeon_test.cpp | 16 +- .../windows/test/primitive_test.cpp | 21 +- packages/pigeon/pubspec.yaml | 2 +- packages/pigeon/test/cpp_generator_test.dart | 200 +++++-- packages/pigeon/test/dart_generator_test.dart | 273 +++++++-- .../pigeon/test/generator_tools_test.dart | 6 + packages/pigeon/test/java_generator_test.dart | 286 ++++++++-- .../pigeon/test/kotlin_generator_test.dart | 249 +++++++-- packages/pigeon/test/objc_generator_test.dart | 522 +++++++++++++++--- .../pigeon/test/swift_generator_test.dart | 256 +++++++-- packages/pigeon/tool/generate.dart | 26 +- packages/pigeon/tool/shared/generation.dart | 6 + 68 files changed, 4091 insertions(+), 1682 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 66e6abe0f99..6e2b0acbe51 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,8 @@ +## 10.1.4 + +* Adds package name to method channel strings to avoid potential collisions between plugins. +* Adds packageName option to `pigeonOptions`. + ## 10.1.3 * Adds generic `Object` field support to data classes. diff --git a/packages/pigeon/example/README.md b/packages/pigeon/example/README.md index 078b40259ae..e533f5dff51 100644 --- a/packages/pigeon/example/README.md +++ b/packages/pigeon/example/README.md @@ -31,6 +31,7 @@ needed for your project. // Set this to a unique prefix for your plugin or application, per Objective-C naming conventions. objcOptions: ObjcOptions(prefix: 'PGN'), copyrightHeader: 'pigeons/copyright.txt', + packageName: 'pigeon_example_package', )) ``` Then make a simple call to run pigeon on the Dart file containing your definitions. diff --git a/packages/pigeon/example/app/android/app/src/main/java/io/flutter/plugins/Messages.java b/packages/pigeon/example/app/android/app/src/main/java/io/flutter/plugins/Messages.java index 479ff691e05..f358afe2ebe 100644 --- a/packages/pigeon/example/app/android/app/src/main/java/io/flutter/plugins/Messages.java +++ b/packages/pigeon/example/app/android/app/src/main/java/io/flutter/plugins/Messages.java @@ -233,7 +233,9 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable ExampleHos { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.ExampleHostApi.getHostLanguage", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -254,7 +256,9 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable ExampleHos { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.ExampleHostApi.add", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -281,7 +285,9 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable ExampleHos { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.ExampleHostApi.sendMessage", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -330,7 +336,9 @@ public interface Reply { public void flutterMethod(@Nullable String aStringArg, @NonNull Reply callback) { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.MessageFlutterApi.flutterMethod", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod", + getCodec()); channel.send( new ArrayList(Collections.singletonList(aStringArg)), channelReply -> { diff --git a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt index 8d9dc6e5f3f..e0dc8a49cbc 100644 --- a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt +++ b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt @@ -122,7 +122,7 @@ interface ExampleHostApi { @Suppress("UNCHECKED_CAST") fun setUp(binaryMessenger: BinaryMessenger, api: ExampleHostApi?) { run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.ExampleHostApi.getHostLanguage", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage", codec) if (api != null) { channel.setMessageHandler { _, reply -> var wrapped: List @@ -138,7 +138,7 @@ interface ExampleHostApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.ExampleHostApi.add", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -157,7 +157,7 @@ interface ExampleHostApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.ExampleHostApi.sendMessage", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -189,7 +189,7 @@ class MessageFlutterApi(private val binaryMessenger: BinaryMessenger) { } } fun flutterMethod(aStringArg: String?, callback: (String) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.MessageFlutterApi.flutterMethod", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod", codec) channel.send(listOf(aStringArg)) { val result = it as String callback(result) diff --git a/packages/pigeon/example/app/ios/Runner/Messages.g.swift b/packages/pigeon/example/app/ios/Runner/Messages.g.swift index 48b22d65706..c95fc3edd7e 100644 --- a/packages/pigeon/example/app/ios/Runner/Messages.g.swift +++ b/packages/pigeon/example/app/ios/Runner/Messages.g.swift @@ -121,7 +121,7 @@ class ExampleHostApiSetup { static var codec: FlutterStandardMessageCodec { ExampleHostApiCodec.shared } /// Sets up an instance of `ExampleHostApi` to handle messages through the `binaryMessenger`. static func setUp(binaryMessenger: FlutterBinaryMessenger, api: ExampleHostApi?) { - let getHostLanguageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.ExampleHostApi.getHostLanguage", binaryMessenger: binaryMessenger, codec: codec) + let getHostLanguageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getHostLanguageChannel.setMessageHandler { _, reply in do { @@ -134,7 +134,7 @@ class ExampleHostApiSetup { } else { getHostLanguageChannel.setMessageHandler(nil) } - let addChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.ExampleHostApi.add", binaryMessenger: binaryMessenger, codec: codec) + let addChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", binaryMessenger: binaryMessenger, codec: codec) if let api = api { addChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -150,7 +150,7 @@ class ExampleHostApiSetup { } else { addChannel.setMessageHandler(nil) } - let sendMessageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.ExampleHostApi.sendMessage", binaryMessenger: binaryMessenger, codec: codec) + let sendMessageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendMessageChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -176,7 +176,7 @@ class MessageFlutterApi { self.binaryMessenger = binaryMessenger } func flutterMethod(aString aStringArg: String?, completion: @escaping (String) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.MessageFlutterApi.flutterMethod", binaryMessenger: binaryMessenger) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod", binaryMessenger: binaryMessenger) channel.sendMessage([aStringArg] as [Any?]) { response in let result = response as! String completion(result) diff --git a/packages/pigeon/example/app/lib/src/messages.g.dart b/packages/pigeon/example/app/lib/src/messages.g.dart index ad7560805ec..201b1fd6b26 100644 --- a/packages/pigeon/example/app/lib/src/messages.g.dart +++ b/packages/pigeon/example/app/lib/src/messages.g.dart @@ -87,7 +87,8 @@ class ExampleHostApi { Future getHostLanguage() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.ExampleHostApi.getHostLanguage', codec, + 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -113,7 +114,7 @@ class ExampleHostApi { Future add(int arg_a, int arg_b) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.ExampleHostApi.add', codec, + 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_a, arg_b]) as List?; @@ -140,7 +141,8 @@ class ExampleHostApi { Future sendMessage(MessageData arg_message) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.ExampleHostApi.sendMessage', codec, + 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_message]) as List?; @@ -175,14 +177,15 @@ abstract class MessageFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MessageFlutterApi.flutterMethod', codec, + 'dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.MessageFlutterApi.flutterMethod was null.'); + 'Argument for dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod was null.'); final List args = (message as List?)!; final String? arg_aString = (args[0] as String?); final String output = api.flutterMethod(arg_aString); diff --git a/packages/pigeon/example/app/macos/Runner/messages.g.m b/packages/pigeon/example/app/macos/Runner/messages.g.m index a74215d47f6..37b75fa068e 100644 --- a/packages/pigeon/example/app/macos/Runner/messages.g.m +++ b/packages/pigeon/example/app/macos/Runner/messages.g.m @@ -121,7 +121,7 @@ void PGNExampleHostApiSetup(id binaryMessenger, NSObject *api) { { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.ExampleHostApi.getHostLanguage" + initWithName:@"dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage" binaryMessenger:binaryMessenger codec:PGNExampleHostApiGetCodec()]; if (api) { @@ -139,10 +139,10 @@ void PGNExampleHostApiSetup(id binaryMessenger, } } { - FlutterBasicMessageChannel *channel = - [[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.pigeon.ExampleHostApi.add" - binaryMessenger:binaryMessenger - codec:PGNExampleHostApiGetCodec()]; + FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] + initWithName:@"dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add" + binaryMessenger:binaryMessenger + codec:PGNExampleHostApiGetCodec()]; if (api) { NSCAssert( [api respondsToSelector:@selector(addNumber:toNumber:error:)], @@ -162,7 +162,7 @@ void PGNExampleHostApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.ExampleHostApi.sendMessage" + initWithName:@"dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage" binaryMessenger:binaryMessenger codec:PGNExampleHostApiGetCodec()]; if (api) { @@ -205,7 +205,8 @@ - (instancetype)initWithBinaryMessenger:(NSObject *)bina - (void)flutterMethodAString:(nullable NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.MessageFlutterApi.flutterMethod" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod" binaryMessenger:self.binaryMessenger codec:PGNMessageFlutterApiGetCodec()]; [channel sendMessage:@[ arg_aString ?: [NSNull null] ] diff --git a/packages/pigeon/example/app/pigeons/messages.dart b/packages/pigeon/example/app/pigeons/messages.dart index 06216300eb6..b564d0f9a7d 100644 --- a/packages/pigeon/example/app/pigeons/messages.dart +++ b/packages/pigeon/example/app/pigeons/messages.dart @@ -23,6 +23,7 @@ import 'package:pigeon/pigeon.dart'; // Set this to a unique prefix for your plugin or application, per Objective-C naming conventions. objcOptions: ObjcOptions(prefix: 'PGN'), copyrightHeader: 'pigeons/copyright.txt', + packageName: 'pigeon_example_package', )) // #enddocregion config diff --git a/packages/pigeon/example/app/windows/runner/messages.g.cpp b/packages/pigeon/example/app/windows/runner/messages.g.cpp index a5fac7be46b..ab8ccddd46b 100644 --- a/packages/pigeon/example/app/windows/runner/messages.g.cpp +++ b/packages/pigeon/example/app/windows/runner/messages.g.cpp @@ -135,7 +135,9 @@ void ExampleHostApi::SetUp(flutter::BinaryMessenger* binary_messenger, ExampleHostApi* api) { { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.ExampleHostApi.getHostLanguage", + binary_messenger, + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi." + "getHostLanguage", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -160,7 +162,9 @@ void ExampleHostApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.ExampleHostApi.add", &GetCodec()); + binary_messenger, + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -197,7 +201,8 @@ void ExampleHostApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.ExampleHostApi.sendMessage", + binary_messenger, + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -259,7 +264,9 @@ void MessageFlutterApi::FlutterMethod( std::function&& on_success, std::function&& on_error) { auto channel = std::make_unique>( - binary_messenger_, "dev.flutter.pigeon.MessageFlutterApi.flutterMethod", + binary_messenger_, + "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi." + "flutterMethod", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_string_arg ? EncodableValue(*a_string_arg) : EncodableValue(), diff --git a/packages/pigeon/lib/cpp_generator.dart b/packages/pigeon/lib/cpp_generator.dart index c5ec10196f1..15e0cb23516 100644 --- a/packages/pigeon/lib/cpp_generator.dart +++ b/packages/pigeon/lib/cpp_generator.dart @@ -79,16 +79,28 @@ class CppGenerator extends Generator> { /// Generates C++ file of type specified in [generatorOptions] @override - void generate(OutputFileOptions generatorOptions, Root root, - StringSink sink) { + void generate( + OutputFileOptions generatorOptions, + Root root, + StringSink sink, { + required String packageName, + }) { assert(generatorOptions.fileType == FileType.header || generatorOptions.fileType == FileType.source); if (generatorOptions.fileType == FileType.header) { - const CppHeaderGenerator() - .generate(generatorOptions.languageOptions, root, sink); + const CppHeaderGenerator().generate( + generatorOptions.languageOptions, + root, + sink, + packageName: packageName, + ); } else if (generatorOptions.fileType == FileType.source) { - const CppSourceGenerator() - .generate(generatorOptions.languageOptions, root, sink); + const CppSourceGenerator().generate( + generatorOptions.languageOptions, + root, + sink, + packageName: packageName, + ); } } } @@ -100,7 +112,11 @@ class CppHeaderGenerator extends StructuredGenerator { @override void writeFilePrologue( - CppOptions generatorOptions, Root root, Indent indent) { + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); } @@ -110,7 +126,12 @@ class CppHeaderGenerator extends StructuredGenerator { } @override - void writeFileImports(CppOptions generatorOptions, Root root, Indent indent) { + void writeFileImports( + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { final String guardName = _getGuardName(generatorOptions.headerIncludePath); indent.writeln('#ifndef $guardName'); indent.writeln('#define $guardName'); @@ -143,7 +164,12 @@ class CppHeaderGenerator extends StructuredGenerator { @override void writeEnum( - CppOptions generatorOptions, Root root, Indent indent, Enum anEnum) { + CppOptions generatorOptions, + Root root, + Indent indent, + Enum anEnum, { + required String packageName, + }) { indent.newln(); addDocumentationComments( indent, anEnum.documentationComments, _docCommentSpec); @@ -160,13 +186,22 @@ class CppHeaderGenerator extends StructuredGenerator { @override void writeGeneralUtilities( - CppOptions generatorOptions, Root root, Indent indent) { + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { _writeErrorOr(indent, friends: root.apis.map((Api api) => api.name)); } @override void writeDataClass( - CppOptions generatorOptions, Root root, Indent indent, Class klass) { + CppOptions generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }) { // When generating for a Pigeon unit test, add a test fixture friend class to // allow unit testing private methods, since testing serialization via public // methods is essentially an end-to-end test. @@ -271,8 +306,9 @@ class CppHeaderGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.flutter); if (getCodecClasses(api, root).isNotEmpty) { _writeCodec(generatorOptions, root, indent, api); @@ -322,8 +358,9 @@ class CppHeaderGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.host); if (getCodecClasses(api, root).isNotEmpty) { _writeCodec(generatorOptions, root, indent, api); @@ -511,7 +548,11 @@ $friendLines @override void writeCloseNamespace( - CppOptions generatorOptions, Root root, Indent indent) { + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.namespace != null) { indent.writeln('} // namespace ${generatorOptions.namespace}'); } @@ -527,7 +568,11 @@ class CppSourceGenerator extends StructuredGenerator { @override void writeFilePrologue( - CppOptions generatorOptions, Root root, Indent indent) { + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); } @@ -539,7 +584,12 @@ class CppSourceGenerator extends StructuredGenerator { } @override - void writeFileImports(CppOptions generatorOptions, Root root, Indent indent) { + void writeFileImports( + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.writeln('#include "${generatorOptions.headerIncludePath}"'); indent.newln(); _writeSystemHeaderIncludeBlock(indent, [ @@ -559,7 +609,11 @@ class CppSourceGenerator extends StructuredGenerator { @override void writeOpenNamespace( - CppOptions generatorOptions, Root root, Indent indent) { + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.namespace != null) { indent.writeln('namespace ${generatorOptions.namespace} {'); } @@ -567,7 +621,11 @@ class CppSourceGenerator extends StructuredGenerator { @override void writeGeneralUtilities( - CppOptions generatorOptions, Root root, Indent indent) { + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { final List usingDirectives = [ 'flutter::BasicMessageChannel', 'flutter::CustomEncodableValue', @@ -584,7 +642,12 @@ class CppSourceGenerator extends StructuredGenerator { @override void writeDataClass( - CppOptions generatorOptions, Root root, Indent indent, Class klass) { + CppOptions generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); final Set customEnumNames = @@ -610,12 +673,26 @@ class CppSourceGenerator extends StructuredGenerator { } // Serialization. - writeClassEncode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); + writeClassEncode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); // Deserialization. - writeClassDecode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); + writeClassDecode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); } @override @@ -625,8 +702,9 @@ class CppSourceGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { _writeFunctionDefinition(indent, 'ToEncodableList', scope: klass.name, returnType: 'EncodableList', @@ -652,8 +730,9 @@ class CppSourceGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { // Returns the expression to convert the given EncodableValue to a field // value. String getValueExpression(NamedType field, String encodable) { @@ -729,8 +808,9 @@ class CppSourceGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.flutter); if (getCodecClasses(api, root).isNotEmpty) { _writeCodec(generatorOptions, root, indent, api); @@ -751,7 +831,7 @@ class CppSourceGenerator extends StructuredGenerator { 'return flutter::StandardMessageCodec::GetInstance(&$codeSerializerName::GetInstance());'); }); for (final Method func in api.methods) { - final String channelName = makeChannelName(api, func); + final String channelName = makeChannelName(api, func, packageName); final HostDatatype returnType = getHostDatatype(func.returnType, root.classes, root.enums, _shortBaseCppTypeForBuiltinDartType); @@ -820,7 +900,12 @@ class CppSourceGenerator extends StructuredGenerator { @override void writeHostApi( - CppOptions generatorOptions, Root root, Indent indent, Api api) { + CppOptions generatorOptions, + Root root, + Indent indent, + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.host); if (getCodecClasses(api, root).isNotEmpty) { _writeCodec(generatorOptions, root, indent, api); @@ -846,7 +931,7 @@ class CppSourceGenerator extends StructuredGenerator { '${api.name}* api' ], body: () { for (final Method method in api.methods) { - final String channelName = makeChannelName(api, method); + final String channelName = makeChannelName(api, method, packageName); indent.writeScoped('{', '}', () { indent.writeln( 'auto channel = std::make_unique>(binary_messenger, ' @@ -1155,7 +1240,11 @@ ${prefix}reply(EncodableValue(std::move(wrapped)));'''; @override void writeCloseNamespace( - CppOptions generatorOptions, Root root, Indent indent) { + CppOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.namespace != null) { indent.writeln('} // namespace ${generatorOptions.namespace}'); } diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart index 320e295caf1..a66ebacc59e 100644 --- a/packages/pigeon/lib/dart_generator.dart +++ b/packages/pigeon/lib/dart_generator.dart @@ -2,10 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:io' show Directory, File, FileSystemEntity; - import 'package:path/path.dart' as path; -import 'package:yaml/yaml.dart' as yaml; import 'ast.dart'; import 'functional.dart'; @@ -77,7 +74,11 @@ class DartGenerator extends StructuredGenerator { @override void writeFilePrologue( - DartOptions generatorOptions, Root root, Indent indent) { + DartOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); } @@ -91,7 +92,11 @@ class DartGenerator extends StructuredGenerator { @override void writeFileImports( - DartOptions generatorOptions, Root root, Indent indent) { + DartOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.writeln("import 'dart:async';"); indent.writeln( "import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;", @@ -104,7 +109,12 @@ class DartGenerator extends StructuredGenerator { @override void writeEnum( - DartOptions generatorOptions, Root root, Indent indent, Enum anEnum) { + DartOptions generatorOptions, + Root root, + Indent indent, + Enum anEnum, { + required String packageName, + }) { indent.newln(); addDocumentationComments( indent, anEnum.documentationComments, _docCommentSpec); @@ -120,7 +130,12 @@ class DartGenerator extends StructuredGenerator { @override void writeDataClass( - DartOptions generatorOptions, Root root, Indent indent, Class klass) { + DartOptions generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); final Set customEnumNames = @@ -142,11 +157,25 @@ class DartGenerator extends StructuredGenerator { indent.writeln('$datatype ${field.name};'); indent.newln(); } - writeClassEncode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); + writeClassEncode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); indent.newln(); - writeClassDecode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); + writeClassDecode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); }); } @@ -167,8 +196,9 @@ class DartGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { indent.write('Object encode() '); indent.addScoped('{', '}', () { indent.write( @@ -200,8 +230,9 @@ class DartGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { void writeValueDecode(NamedType field, int index) { final String resultAt = 'result[$index]'; final String castCallPrefix = field.type.isNullable ? '?' : '!'; @@ -280,6 +311,7 @@ $resultAt != null Api api, { String Function(Method)? channelNameFunc, bool isMockHandler = false, + required String packageName, }) { assert(api.location == ApiLocation.flutter); final List customEnumNames = @@ -327,7 +359,7 @@ $resultAt != null 'final BasicMessageChannel channel = BasicMessageChannel(', ); final String channelName = channelNameFunc == null - ? makeChannelName(api, func) + ? makeChannelName(api, func, packageName) : channelNameFunc(func); indent.nest(2, () { indent.writeln("'$channelName', codec,"); @@ -443,7 +475,12 @@ $resultAt != null /// a code, a message, and details in that order. @override void writeHostApi( - DartOptions generatorOptions, Root root, Indent indent, Api api) { + DartOptions generatorOptions, + Root root, + Indent indent, + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.host); String codecName = _standardMessageCodec; if (getCodecClasses(api, root).isNotEmpty) { @@ -499,7 +536,7 @@ final BinaryMessenger? _binaryMessenger; 'Future<${_addGenericTypesNullable(func.returnType)}> ${func.name}($argSignature) async ', ); indent.addScoped('{', '}', () { - final String channelName = makeChannelName(api, func); + final String channelName = makeChannelName(api, func, packageName); indent.writeln( 'final BasicMessageChannel channel = BasicMessageChannel('); indent.nest(2, () { @@ -556,7 +593,12 @@ if (replyList == null) { /// represented by [root], outputting the code to [sink]. [sourceOutPath] is the /// path of the generated dart code to be tested. [testOutPath] is where the /// test code will be generated. - void generateTest(DartOptions generatorOptions, Root root, StringSink sink) { + void generateTest( + DartOptions generatorOptions, + Root root, + StringSink sink, { + required String packageName, + }) { final Indent indent = Indent(sink); final String sourceOutPath = generatorOptions.sourceOutPath ?? ''; final String testOutPath = generatorOptions.testOutPath ?? ''; @@ -567,8 +609,7 @@ if (replyList == null) { _posixify(sourceOutPath), from: _posixify(path.dirname(testOutPath)), ); - late final String? packageName = _deducePackageName(sourceOutPath); - if (!relativeDartPath.contains('/lib/') || packageName == null) { + if (!relativeDartPath.contains('/lib/')) { // If we can't figure out the package name or the relative path doesn't // include a 'lib' directory, try relative path import which only works in // certain (older) versions of Dart. @@ -594,8 +635,10 @@ if (replyList == null) { root, indent, mockApi, - channelNameFunc: (Method func) => makeChannelName(api, func), + channelNameFunc: (Method func) => + makeChannelName(api, func, packageName), isMockHandler: true, + packageName: packageName, ); } } @@ -760,49 +803,6 @@ String _addGenericTypesNullable(TypeDeclaration type) { return type.isNullable ? '$genericType?' : genericType; } -/// Crawls up the path of [dartFilePath] until it finds a pubspec.yaml in a -/// parent directory and returns its path. -String? _findPubspecPath(String dartFilePath) { - try { - Directory dir = File(dartFilePath).parent; - String? pubspecPath; - while (pubspecPath == null) { - if (dir.existsSync()) { - final Iterable pubspecPaths = dir - .listSync() - .map((FileSystemEntity e) => e.path) - .where((String path) => path.endsWith('pubspec.yaml')); - if (pubspecPaths.isNotEmpty) { - pubspecPath = pubspecPaths.first; - } else { - dir = dir.parent; - } - } else { - break; - } - } - return pubspecPath; - } catch (ex) { - return null; - } -} - -/// Given the path of a Dart file, [mainDartFile], the name of the package will -/// be deduced by locating and parsing its associated pubspec.yaml. -String? _deducePackageName(String mainDartFile) { - final String? pubspecPath = _findPubspecPath(mainDartFile); - if (pubspecPath == null) { - return null; - } - - try { - final String text = File(pubspecPath).readAsStringSync(); - return (yaml.loadYaml(text) as Map)['name'] as String?; - } catch (_) { - return null; - } -} - /// Converts [inputPath] to a posix absolute path. String _posixify(String inputPath) { final path.Context context = path.Context(style: path.Style.posix); diff --git a/packages/pigeon/lib/generator.dart b/packages/pigeon/lib/generator.dart index c730f92a714..14829cc57c2 100644 --- a/packages/pigeon/lib/generator.dart +++ b/packages/pigeon/lib/generator.dart @@ -13,7 +13,12 @@ abstract class Generator { const Generator(); /// Generates files for specified language with specified [generatorOptions] - void generate(T generatorOptions, Root root, StringSink sink); + void generate( + T generatorOptions, + Root root, + StringSink sink, { + required String packageName, + }); } /// An abstract base class that enforces code generation across platforms. @@ -25,97 +30,239 @@ abstract class StructuredGenerator extends Generator { void generate( T generatorOptions, Root root, - StringSink sink, - ) { + StringSink sink, { + required String packageName, + }) { final Indent indent = Indent(sink); - writeFilePrologue(generatorOptions, root, indent); + writeFilePrologue( + generatorOptions, + root, + indent, + packageName: packageName, + ); - writeFileImports(generatorOptions, root, indent); + writeFileImports( + generatorOptions, + root, + indent, + packageName: packageName, + ); - writeOpenNamespace(generatorOptions, root, indent); + writeOpenNamespace( + generatorOptions, + root, + indent, + packageName: packageName, + ); - writeGeneralUtilities(generatorOptions, root, indent); + writeGeneralUtilities( + generatorOptions, + root, + indent, + packageName: packageName, + ); - writeEnums(generatorOptions, root, indent); + writeEnums( + generatorOptions, + root, + indent, + packageName: packageName, + ); - writeDataClasses(generatorOptions, root, indent); + writeDataClasses( + generatorOptions, + root, + indent, + packageName: packageName, + ); - writeApis(generatorOptions, root, indent); + writeApis( + generatorOptions, + root, + indent, + packageName: packageName, + ); - writeCloseNamespace(generatorOptions, root, indent); + writeCloseNamespace( + generatorOptions, + root, + indent, + packageName: packageName, + ); } /// Adds specified headers to [indent]. - void writeFilePrologue(T generatorOptions, Root root, Indent indent); + void writeFilePrologue( + T generatorOptions, + Root root, + Indent indent, { + required String packageName, + }); /// Writes specified imports to [indent]. - void writeFileImports(T generatorOptions, Root root, Indent indent); + void writeFileImports( + T generatorOptions, + Root root, + Indent indent, { + required String packageName, + }); /// Writes code to [indent] that opens file namespace if needed. /// /// This method is not required, and does not need to be overridden. - void writeOpenNamespace(T generatorOptions, Root root, Indent indent) {} + void writeOpenNamespace( + T generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) {} /// Writes code to [indent] that closes file namespace if needed. /// /// This method is not required, and does not need to be overridden. - void writeCloseNamespace(T generatorOptions, Root root, Indent indent) {} + void writeCloseNamespace( + T generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) {} /// Writes any necessary helper utilities to [indent] if needed. /// /// This method is not required, and does not need to be overridden. - void writeGeneralUtilities(T generatorOptions, Root root, Indent indent) {} + void writeGeneralUtilities( + T generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) {} /// Writes all enums to [indent]. /// /// Can be overridden to add extra code before/after enums. - void writeEnums(T generatorOptions, Root root, Indent indent) { + void writeEnums( + T generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { for (final Enum anEnum in root.enums) { - writeEnum(generatorOptions, root, indent, anEnum); + writeEnum( + generatorOptions, + root, + indent, + anEnum, + packageName: packageName, + ); } } /// Writes a single Enum to [indent]. This is needed in most generators. - void writeEnum(T generatorOptions, Root root, Indent indent, Enum anEnum) {} + void writeEnum( + T generatorOptions, + Root root, + Indent indent, + Enum anEnum, { + required String packageName, + }) {} /// Writes all data classes to [indent]. /// /// Can be overridden to add extra code before/after apis. - void writeDataClasses(T generatorOptions, Root root, Indent indent) { + void writeDataClasses( + T generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { for (final Class klass in root.classes) { - writeDataClass(generatorOptions, root, indent, klass); + writeDataClass( + generatorOptions, + root, + indent, + klass, + packageName: packageName, + ); } } /// Writes a single data class to [indent]. void writeDataClass( - T generatorOptions, Root root, Indent indent, Class klass); + T generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }); /// Writes a single class encode method to [indent]. - void writeClassEncode(T generatorOptions, Root root, Indent indent, - Class klass, Set customClassNames, Set customEnumNames) {} + void writeClassEncode( + T generatorOptions, + Root root, + Indent indent, + Class klass, + Set customClassNames, + Set customEnumNames, { + required String packageName, + }) {} /// Writes a single class decode method to [indent]. - void writeClassDecode(T generatorOptions, Root root, Indent indent, - Class klass, Set customClassNames, Set customEnumNames) {} + void writeClassDecode( + T generatorOptions, + Root root, + Indent indent, + Class klass, + Set customClassNames, + Set customEnumNames, { + required String packageName, + }) {} /// Writes all apis to [indent]. /// /// Can be overridden to add extra code before/after classes. - void writeApis(T generatorOptions, Root root, Indent indent) { + void writeApis( + T generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { for (final Api api in root.apis) { if (api.location == ApiLocation.host) { - writeHostApi(generatorOptions, root, indent, api); + writeHostApi( + generatorOptions, + root, + indent, + api, + packageName: packageName, + ); } else if (api.location == ApiLocation.flutter) { - writeFlutterApi(generatorOptions, root, indent, api); + writeFlutterApi( + generatorOptions, + root, + indent, + api, + packageName: packageName, + ); } } } /// Writes a single Flutter Api to [indent]. - void writeFlutterApi(T generatorOptions, Root root, Indent indent, Api api); + void writeFlutterApi( + T generatorOptions, + Root root, + Indent indent, + Api api, { + required String packageName, + }); /// Writes a single Host Api to [indent]. - void writeHostApi(T generatorOptions, Root root, Indent indent, Api api); + void writeHostApi( + T generatorOptions, + Root root, + Indent indent, + Api api, { + required String packageName, + }); } diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index 3927bb74641..a7fd2528dce 100644 --- a/packages/pigeon/lib/generator_tools.dart +++ b/packages/pigeon/lib/generator_tools.dart @@ -6,12 +6,14 @@ import 'dart:convert'; import 'dart:io'; import 'dart:mirrors'; +import 'package:yaml/yaml.dart' as yaml; + import 'ast.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '10.1.3'; +const String pigeonVersion = '10.1.4'; /// Read all the content from [stdin] to a String. String readStdin() { @@ -163,8 +165,8 @@ class Indent { } /// Create the generated channel name for a [func] on a [api]. -String makeChannelName(Api api, Method func) { - return 'dev.flutter.pigeon.${api.name}.${func.name}'; +String makeChannelName(Api api, Method func, String packageName) { + return 'dev.flutter.pigeon.$packageName.${api.name}.${func.name}'; } /// Represents the mapping of a Dart datatype to a Host datatype. @@ -523,12 +525,55 @@ void addDocumentationComments( } } -/// Returns an ordered list of fields to provide consistent serialisation order. +/// Returns an ordered list of fields to provide consistent serialization order. Iterable getFieldsInSerializationOrder(Class klass) { // This returns the fields in the order they are declared in the pigeon file. return klass.fields; } +/// Crawls up the path of [dartFilePath] until it finds a pubspec.yaml in a +/// parent directory and returns its path. +String? _findPubspecPath(String dartFilePath) { + try { + Directory dir = File(dartFilePath).parent; + String? pubspecPath; + while (pubspecPath == null) { + if (dir.existsSync()) { + final Iterable pubspecPaths = dir + .listSync() + .map((FileSystemEntity e) => e.path) + .where((String path) => path.endsWith('pubspec.yaml')); + if (pubspecPaths.isNotEmpty) { + pubspecPath = pubspecPaths.first; + } else { + dir = dir.parent; + } + } else { + break; + } + } + return pubspecPath; + } catch (ex) { + return null; + } +} + +/// Given the path of a Dart file, [mainDartFile], the name of the package will +/// be deduced by locating and parsing its associated pubspec.yaml. +String? deducePackageName(String mainDartFile) { + final String? pubspecPath = _findPubspecPath(mainDartFile); + if (pubspecPath == null) { + return null; + } + + try { + final String text = File(pubspecPath).readAsStringSync(); + return (yaml.loadYaml(text) as Map)['name'] as String?; + } catch (_) { + return null; + } +} + /// Enum to specify which file will be generated for multi-file generators enum FileType { /// header file. diff --git a/packages/pigeon/lib/java_generator.dart b/packages/pigeon/lib/java_generator.dart index 0a39c1377de..a14afa7080c 100644 --- a/packages/pigeon/lib/java_generator.dart +++ b/packages/pigeon/lib/java_generator.dart @@ -92,7 +92,11 @@ class JavaGenerator extends StructuredGenerator { @override void writeFilePrologue( - JavaOptions generatorOptions, Root root, Indent indent) { + JavaOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); } @@ -103,7 +107,11 @@ class JavaGenerator extends StructuredGenerator { @override void writeFileImports( - JavaOptions generatorOptions, Root root, Indent indent) { + JavaOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.package != null) { indent.writeln('package ${generatorOptions.package};'); indent.newln(); @@ -128,7 +136,11 @@ class JavaGenerator extends StructuredGenerator { @override void writeOpenNamespace( - JavaOptions generatorOptions, Root root, Indent indent) { + JavaOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.writeln( '$_docCommentPrefix Generated class from Pigeon.$_docCommentSuffix'); indent.writeln( @@ -142,7 +154,12 @@ class JavaGenerator extends StructuredGenerator { @override void writeEnum( - JavaOptions generatorOptions, Root root, Indent indent, Enum anEnum) { + JavaOptions generatorOptions, + Root root, + Indent indent, + Enum anEnum, { + required String packageName, + }) { String camelToSnake(String camelCase) { final RegExp regex = RegExp('([a-z])([A-Z]+)'); return camelCase @@ -176,7 +193,12 @@ class JavaGenerator extends StructuredGenerator { @override void writeDataClass( - JavaOptions generatorOptions, Root root, Indent indent, Class klass) { + JavaOptions generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); final Set customEnumNames = @@ -207,10 +229,24 @@ class JavaGenerator extends StructuredGenerator { } _writeClassBuilder(generatorOptions, root, indent, klass); - writeClassEncode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); - writeClassDecode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); + writeClassEncode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); + writeClassDecode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); }); } @@ -291,8 +327,9 @@ class JavaGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { indent.newln(); indent.writeln('@NonNull'); indent.write('ArrayList toList() '); @@ -329,8 +366,9 @@ class JavaGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { indent.newln(); indent.write( 'static @NonNull ${klass.name} fromList(@NonNull ArrayList list) '); @@ -368,8 +406,9 @@ class JavaGenerator extends StructuredGenerator { JavaOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.flutter); if (getCodecClasses(api, root).isNotEmpty) { _writeCodec(indent, api, root); @@ -414,7 +453,7 @@ class JavaGenerator extends StructuredGenerator { }); for (final Method func in api.methods) { - final String channelName = makeChannelName(api, func); + final String channelName = makeChannelName(api, func, packageName); final String returnType = func.returnType.isVoid ? 'Void' : _javaTypeForDartType(func.returnType); @@ -479,14 +518,19 @@ class JavaGenerator extends StructuredGenerator { } @override - void writeApis(JavaOptions generatorOptions, Root root, Indent indent) { + void writeApis( + JavaOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (root.apis.any((Api api) => api.location == ApiLocation.host && api.methods.any((Method it) => it.isAsynchronous))) { indent.newln(); _writeResultInterface(indent); } - super.writeApis(generatorOptions, root, indent); + super.writeApis(generatorOptions, root, indent, packageName: packageName); } /// Write the java code that represents a host [Api], [api]. @@ -497,7 +541,12 @@ class JavaGenerator extends StructuredGenerator { /// } @override void writeHostApi( - JavaOptions generatorOptions, Root root, Indent indent, Api api) { + JavaOptions generatorOptions, + Root root, + Indent indent, + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.host); if (getCodecClasses(api, root).isNotEmpty) { _writeCodec(indent, api, root); @@ -532,7 +581,14 @@ class JavaGenerator extends StructuredGenerator { 'static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable ${api.name} api) '); indent.addScoped('{', '}', () { for (final Method method in api.methods) { - _writeMethodSetup(generatorOptions, root, indent, api, method); + _writeMethodSetup( + generatorOptions, + root, + indent, + api, + method, + packageName: packageName, + ); } }); }); @@ -581,9 +637,15 @@ class JavaGenerator extends StructuredGenerator { /// Write a static setup function in the interface. /// Example: /// static void setup(BinaryMessenger binaryMessenger, Foo api) {...} - void _writeMethodSetup(JavaOptions generatorOptions, Root root, Indent indent, - Api api, final Method method) { - final String channelName = makeChannelName(api, method); + void _writeMethodSetup( + JavaOptions generatorOptions, + Root root, + Indent indent, + Api api, + final Method method, { + required String packageName, + }) { + final String channelName = makeChannelName(api, method, packageName); indent.write(''); indent.addScoped('{', '}', () { String? taskQueue; @@ -815,7 +877,11 @@ protected static ArrayList wrapError(@NonNull Throwable exception) { @override void writeGeneralUtilities( - JavaOptions generatorOptions, Root root, Indent indent) { + JavaOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.newln(); _writeErrorClass(indent); indent.newln(); @@ -824,7 +890,11 @@ protected static ArrayList wrapError(@NonNull Throwable exception) { @override void writeCloseNamespace( - JavaOptions generatorOptions, Root root, Indent indent) { + JavaOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.dec(); indent.addln('}'); } diff --git a/packages/pigeon/lib/kotlin_generator.dart b/packages/pigeon/lib/kotlin_generator.dart index db3102a65c8..e6e94ff3dcc 100644 --- a/packages/pigeon/lib/kotlin_generator.dart +++ b/packages/pigeon/lib/kotlin_generator.dart @@ -28,8 +28,11 @@ const DocumentCommentSpecification _docCommentSpec = /// Options that control how Kotlin code will be generated. class KotlinOptions { /// Creates a [KotlinOptions] object - const KotlinOptions( - {this.package, this.copyrightHeader, this.errorClassName}); + const KotlinOptions({ + this.package, + this.copyrightHeader, + this.errorClassName, + }); /// The package where the generated class will live. final String? package; @@ -75,7 +78,11 @@ class KotlinGenerator extends StructuredGenerator { @override void writeFilePrologue( - KotlinOptions generatorOptions, Root root, Indent indent) { + KotlinOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); } @@ -85,7 +92,11 @@ class KotlinGenerator extends StructuredGenerator { @override void writeFileImports( - KotlinOptions generatorOptions, Root root, Indent indent) { + KotlinOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.newln(); if (generatorOptions.package != null) { indent.writeln('package ${generatorOptions.package}'); @@ -102,7 +113,12 @@ class KotlinGenerator extends StructuredGenerator { @override void writeEnum( - KotlinOptions generatorOptions, Root root, Indent indent, Enum anEnum) { + KotlinOptions generatorOptions, + Root root, + Indent indent, + Enum anEnum, { + required String packageName, + }) { indent.newln(); addDocumentationComments( indent, anEnum.documentationComments, _docCommentSpec); @@ -132,7 +148,12 @@ class KotlinGenerator extends StructuredGenerator { @override void writeDataClass( - KotlinOptions generatorOptions, Root root, Indent indent, Class klass) { + KotlinOptions generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); final Set customEnumNames = @@ -159,10 +180,24 @@ class KotlinGenerator extends StructuredGenerator { }); indent.addScoped(') {', '}', () { - writeClassDecode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); - writeClassEncode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); + writeClassDecode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); + writeClassEncode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); }); } @@ -173,8 +208,9 @@ class KotlinGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { indent.write('fun toList(): List '); indent.addScoped('{', '}', () { indent.write('return listOf'); @@ -206,8 +242,9 @@ class KotlinGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { final String className = klass.name; indent.write('companion object '); @@ -293,14 +330,15 @@ class KotlinGenerator extends StructuredGenerator { void writeApis( KotlinOptions generatorOptions, Root root, - Indent indent, - ) { + Indent indent, { + required String packageName, + }) { if (root.apis.any((Api api) => api.location == ApiLocation.host && api.methods.any((Method it) => it.isAsynchronous))) { indent.newln(); } - super.writeApis(generatorOptions, root, indent); + super.writeApis(generatorOptions, root, indent, packageName: packageName); } /// Writes the code for a flutter [Api], [api]. @@ -313,8 +351,9 @@ class KotlinGenerator extends StructuredGenerator { KotlinOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.flutter); final bool isCustomCodec = getCodecClasses(api, root).isNotEmpty; if (isCustomCodec) { @@ -346,7 +385,7 @@ class KotlinGenerator extends StructuredGenerator { }); for (final Method func in api.methods) { - final String channelName = makeChannelName(api, func); + final String channelName = makeChannelName(api, func, packageName); final String returnType = func.returnType.isVoid ? '' : _nullsafeKotlinTypeForDartType(func.returnType); @@ -409,8 +448,9 @@ class KotlinGenerator extends StructuredGenerator { KotlinOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.host); final String apiName = api.name; @@ -489,7 +529,8 @@ class KotlinGenerator extends StructuredGenerator { 'val $taskQueue = binaryMessenger.makeBackgroundTaskQueue()'); } - final String channelName = makeChannelName(api, method); + final String channelName = + makeChannelName(api, method, packageName); indent.write( 'val channel = BasicMessageChannel(binaryMessenger, "$channelName", codec'); @@ -672,7 +713,11 @@ class KotlinGenerator extends StructuredGenerator { @override void writeGeneralUtilities( - KotlinOptions generatorOptions, Root root, Indent indent) { + KotlinOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { _writeWrapResult(indent); _writeWrapError(generatorOptions, indent); _writeErrorClass(generatorOptions, indent); diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc_generator.dart index 1d6f93a716d..e1e1ed379ad 100644 --- a/packages/pigeon/lib/objc_generator.dart +++ b/packages/pigeon/lib/objc_generator.dart @@ -71,14 +71,26 @@ class ObjcGenerator extends Generator> { /// Generates Objc file of type specified in [generatorOptions] @override - void generate(OutputFileOptions generatorOptions, Root root, - StringSink sink) { + void generate( + OutputFileOptions generatorOptions, + Root root, + StringSink sink, { + required String packageName, + }) { if (generatorOptions.fileType == FileType.header) { - const ObjcHeaderGenerator() - .generate(generatorOptions.languageOptions, root, sink); + const ObjcHeaderGenerator().generate( + generatorOptions.languageOptions, + root, + sink, + packageName: packageName, + ); } else if (generatorOptions.fileType == FileType.source) { - const ObjcSourceGenerator() - .generate(generatorOptions.languageOptions, root, sink); + const ObjcSourceGenerator().generate( + generatorOptions.languageOptions, + root, + sink, + packageName: packageName, + ); } } } @@ -90,7 +102,11 @@ class ObjcHeaderGenerator extends StructuredGenerator { @override void writeFilePrologue( - ObjcOptions generatorOptions, Root root, Indent indent) { + ObjcOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); } @@ -101,7 +117,11 @@ class ObjcHeaderGenerator extends StructuredGenerator { @override void writeFileImports( - ObjcOptions generatorOptions, Root root, Indent indent) { + ObjcOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.writeln('#import '); indent.newln(); @@ -115,7 +135,12 @@ class ObjcHeaderGenerator extends StructuredGenerator { @override void writeEnum( - ObjcOptions generatorOptions, Root root, Indent indent, Enum anEnum) { + ObjcOptions generatorOptions, + Root root, + Indent indent, + Enum anEnum, { + required String packageName, + }) { final String enumName = _className(generatorOptions.prefix, anEnum.name); indent.newln(); addDocumentationComments( @@ -135,19 +160,33 @@ class ObjcHeaderGenerator extends StructuredGenerator { @override void writeDataClasses( - ObjcOptions generatorOptions, Root root, Indent indent) { + ObjcOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.newln(); for (final Class klass in root.classes) { indent.writeln( '@class ${_className(generatorOptions.prefix, klass.name)};'); } indent.newln(); - super.writeDataClasses(generatorOptions, root, indent); + super.writeDataClasses( + generatorOptions, + root, + indent, + packageName: packageName, + ); } @override void writeDataClass( - ObjcOptions generatorOptions, Root root, Indent indent, Class klass) { + ObjcOptions generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }) { final List classes = root.classes; final List enums = root.enums; final String? prefix = generatorOptions.prefix; @@ -202,8 +241,9 @@ class ObjcHeaderGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) {} + Set customEnumNames, { + required String packageName, + }) {} @override void writeClassDecode( @@ -212,12 +252,18 @@ class ObjcHeaderGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) {} + Set customEnumNames, { + required String packageName, + }) {} @override - void writeApis(ObjcOptions generatorOptions, Root root, Indent indent) { - super.writeApis(generatorOptions, root, indent); + void writeApis( + ObjcOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { + super.writeApis(generatorOptions, root, indent, packageName: packageName); indent.writeln('NS_ASSUME_NONNULL_END'); } @@ -226,8 +272,9 @@ class ObjcHeaderGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { indent.writeln( '$_docCommentPrefix The codec used by ${_className(generatorOptions.prefix, api.name)}.'); indent.writeln( @@ -265,8 +312,9 @@ class ObjcHeaderGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { indent.writeln( '$_docCommentPrefix The codec used by ${_className(generatorOptions.prefix, api.name)}.'); indent.writeln( @@ -336,7 +384,11 @@ class ObjcSourceGenerator extends StructuredGenerator { @override void writeFilePrologue( - ObjcOptions generatorOptions, Root root, Indent indent) { + ObjcOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); } @@ -347,7 +399,11 @@ class ObjcSourceGenerator extends StructuredGenerator { @override void writeFileImports( - ObjcOptions generatorOptions, Root root, Indent indent) { + ObjcOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.writeln('#import "${generatorOptions.headerIncludePath}"'); indent.newln(); indent.writeln('#if TARGET_OS_OSX'); @@ -365,7 +421,11 @@ class ObjcSourceGenerator extends StructuredGenerator { @override void writeDataClasses( - ObjcOptions generatorOptions, Root root, Indent indent) { + ObjcOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { _writeObjcSourceHelperFunctions(indent, hasHostApiMethods: root.apis.any((Api api) => api.location == ApiLocation.host && api.methods.isNotEmpty)); @@ -374,12 +434,22 @@ class ObjcSourceGenerator extends StructuredGenerator { _writeObjcSourceDataClassExtension(generatorOptions, indent, klass); } indent.newln(); - super.writeDataClasses(generatorOptions, root, indent); + super.writeDataClasses( + generatorOptions, + root, + indent, + packageName: packageName, + ); } @override void writeDataClass( - ObjcOptions generatorOptions, Root root, Indent indent, Class klass) { + ObjcOptions generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); final Set customEnumNames = @@ -389,10 +459,24 @@ class ObjcSourceGenerator extends StructuredGenerator { indent.writeln('@implementation $className'); _writeObjcSourceClassInitializer(generatorOptions, root, indent, klass, customClassNames, customEnumNames, className); - writeClassDecode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); - writeClassEncode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); + writeClassDecode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); + writeClassEncode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); indent.writeln('@end'); indent.newln(); } @@ -404,8 +488,9 @@ class ObjcSourceGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { indent.write('- (NSArray *)toList '); indent.addScoped('{', '}', () { indent.write('return'); @@ -425,8 +510,9 @@ class ObjcSourceGenerator extends StructuredGenerator { Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { final String className = _className(generatorOptions.prefix, klass.name); indent.write('+ ($className *)fromList:(NSArray *)list '); indent.addScoped('{', '}', () { @@ -470,8 +556,9 @@ class ObjcSourceGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.flutter); final String apiName = _className(generatorOptions.prefix, api.name); @@ -483,7 +570,14 @@ class ObjcSourceGenerator extends StructuredGenerator { indent.newln(); _writeInitializer(indent); for (final Method func in api.methods) { - _writeMethod(generatorOptions, root, indent, api, func); + _writeMethod( + generatorOptions, + root, + indent, + api, + func, + packageName: packageName, + ); } indent.writeln('@end'); indent.newln(); @@ -494,8 +588,9 @@ class ObjcSourceGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.host); final String apiName = _className(generatorOptions.prefix, api.name); @@ -517,7 +612,14 @@ class ObjcSourceGenerator extends StructuredGenerator { 'NSObject *$taskQueue = [binaryMessenger makeBackgroundTaskQueue];'); } _writeChannelAllocation( - generatorOptions, indent, api, func, channelName, taskQueue); + generatorOptions, + indent, + api, + func, + channelName, + taskQueue, + packageName: packageName, + ); indent.write('if (api) '); indent.addScoped('{', '}', () { _writeChannelApiBinding( @@ -628,13 +730,21 @@ class ObjcSourceGenerator extends StructuredGenerator { }); } - void _writeChannelAllocation(ObjcOptions generatorOptions, Indent indent, - Api api, Method func, String varName, String? taskQueue) { + void _writeChannelAllocation( + ObjcOptions generatorOptions, + Indent indent, + Api api, + Method func, + String varName, + String? taskQueue, { + required String packageName, + }) { indent.writeln('FlutterBasicMessageChannel *$varName ='); indent.nest(1, () { indent.writeln('[[FlutterBasicMessageChannel alloc]'); indent.nest(1, () { - indent.writeln('initWithName:@"${makeChannelName(api, func)}"'); + indent.writeln( + 'initWithName:@"${makeChannelName(api, func, packageName)}"'); indent.writeln('binaryMessenger:binaryMessenger'); indent.write('codec:'); indent @@ -806,8 +916,14 @@ static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) { }); } - void _writeMethod(ObjcOptions languageOptions, Root root, Indent indent, - Api api, Method func) { + void _writeMethod( + ObjcOptions languageOptions, + Root root, + Indent indent, + Api api, + Method func, { + required String packageName, + }) { final _ObjcPtr returnType = _objcTypeForDartType(languageOptions.prefix, func.returnType); final String callbackType = _callbackForType(func.returnType, returnType); @@ -836,7 +952,7 @@ static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) { indent.writeln('[FlutterBasicMessageChannel'); indent.nest(1, () { indent.writeln( - 'messageChannelWithName:@"${makeChannelName(api, func)}"'); + 'messageChannelWithName:@"${makeChannelName(api, func, packageName)}"'); indent.writeln('binaryMessenger:self.binaryMessenger'); indent.write( 'codec:${_getCodecGetterName(languageOptions.prefix, api.name)}()'); diff --git a/packages/pigeon/lib/pigeon_cl.dart b/packages/pigeon/lib/pigeon_cl.dart index 69c3d81ef3f..6c24939161e 100644 --- a/packages/pigeon/lib/pigeon_cl.dart +++ b/packages/pigeon/lib/pigeon_cl.dart @@ -6,8 +6,8 @@ import 'dart:async'; import 'pigeon_lib.dart'; /// This is the main entrypoint for the command-line tool. [args] are the -/// commmand line arguments and there is an optional [packageConfig] to -/// accomodate users that want to integrate pigeon with other build systems. +/// command line arguments and there is an optional [packageConfig] to +/// accommodate users that want to integrate pigeon with other build systems. /// [sdkPath] for specifying an optional Dart SDK path. Future runCommandLine(List args, {Uri? packageConfig, String? sdkPath}) async { diff --git a/packages/pigeon/lib/pigeon_lib.dart b/packages/pigeon/lib/pigeon_lib.dart index 87a150edf44..b8cff04414e 100644 --- a/packages/pigeon/lib/pigeon_lib.dart +++ b/packages/pigeon/lib/pigeon_lib.dart @@ -190,7 +190,8 @@ class PigeonOptions { this.astOut, this.debugGenerators, this.basePath, - }); + String? packageName, + }) : _packageName = packageName; /// Path to the file which will be processed. final String? input; @@ -255,6 +256,9 @@ class PigeonOptions { /// A base path to be prepended to all provided output paths. final String? basePath; + /// The name of the package the pigeon files will be used in. + final String? _packageName; + /// Creates a [PigeonOptions] from a Map representation where: /// `x = PigeonOptions.fromMap(x.toMap())`. static PigeonOptions fromMap(Map map) { @@ -292,6 +296,7 @@ class PigeonOptions { astOut: map['astOut'] as String?, debugGenerators: map['debugGenerators'] as bool?, basePath: map['basePath'] as String?, + packageName: map['packageName'] as String?, ); } @@ -320,6 +325,7 @@ class PigeonOptions { if (oneLanguage != null) 'oneLanguage': oneLanguage!, if (debugGenerators != null) 'debugGenerators': debugGenerators!, if (basePath != null) 'basePath': basePath!, + if (_packageName != null) 'packageName': _packageName!, }; return result; } @@ -329,6 +335,19 @@ class PigeonOptions { PigeonOptions merge(PigeonOptions options) { return PigeonOptions.fromMap(mergeMaps(toMap(), options.toMap())); } + + /// Returns provided or deduced package name, throws `Exception` if none found. + String getPackageName() { + final String? name = _packageName ?? deducePackageName(dartOut ?? ''); + if (name == null) { + throw Exception( + 'Unable to deduce package name, and no package name supplied.\n' + 'Add a `packageName` property to your `PigeonOptions` config,\n' + 'or add --packageName={name_of_package} to your command line pigeon call.', + ); + } + return name; + } } /// A collection of an AST represented as a [Root] and [Error]'s. @@ -409,11 +428,12 @@ DartOptions _dartOptionsWithCopyrightHeader( }) { dartOptions = dartOptions ?? const DartOptions(); return dartOptions.merge(DartOptions( - sourceOutPath: dartOutPath, - testOutPath: testOutPath, - copyrightHeader: copyrightHeader != null - ? _lineReader(path.posix.join(basePath, copyrightHeader)) - : null)); + sourceOutPath: dartOutPath, + testOutPath: testOutPath, + copyrightHeader: copyrightHeader != null + ? _lineReader(path.posix.join(basePath, copyrightHeader)) + : null, + )); } /// A [GeneratorAdapter] that generates the AST. @@ -455,7 +475,12 @@ class DartGeneratorAdapter implements GeneratorAdapter { basePath: options.basePath ?? '', ); const DartGenerator generator = DartGenerator(); - generator.generate(dartOptionsWithHeader, root, sink); + generator.generate( + dartOptionsWithHeader, + root, + sink, + packageName: options.getPackageName(), + ); } @override @@ -485,7 +510,12 @@ class DartTestGeneratorAdapter implements GeneratorAdapter { basePath: options.basePath ?? '', ); const DartGenerator testGenerator = DartGenerator(); - testGenerator.generateTest(dartOptionsWithHeader, root, sink); + testGenerator.generateTest( + dartOptionsWithHeader, + root, + sink, + packageName: options.getPackageName(), + ); } @override @@ -524,7 +554,12 @@ class ObjcGeneratorAdapter implements GeneratorAdapter { OutputFileOptions( fileType: fileType, languageOptions: objcOptionsWithHeader); const ObjcGenerator generator = ObjcGenerator(); - generator.generate(outputFileOptions, root, sink); + generator.generate( + outputFileOptions, + root, + sink, + packageName: options.getPackageName(), + ); } @override @@ -553,14 +588,20 @@ class JavaGeneratorAdapter implements GeneratorAdapter { StringSink sink, PigeonOptions options, Root root, FileType fileType) { JavaOptions javaOptions = options.javaOptions ?? const JavaOptions(); javaOptions = javaOptions.merge(JavaOptions( - className: javaOptions.className ?? - path.basenameWithoutExtension(options.javaOut!), - copyrightHeader: options.copyrightHeader != null - ? _lineReader(path.posix - .join(options.basePath ?? '', options.copyrightHeader)) - : null)); + className: javaOptions.className ?? + path.basenameWithoutExtension(options.javaOut!), + copyrightHeader: options.copyrightHeader != null + ? _lineReader( + path.posix.join(options.basePath ?? '', options.copyrightHeader)) + : null, + )); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: options.getPackageName(), + ); } @override @@ -584,12 +625,18 @@ class SwiftGeneratorAdapter implements GeneratorAdapter { StringSink sink, PigeonOptions options, Root root, FileType fileType) { SwiftOptions swiftOptions = options.swiftOptions ?? const SwiftOptions(); swiftOptions = swiftOptions.merge(SwiftOptions( - copyrightHeader: options.copyrightHeader != null - ? _lineReader(path.posix - .join(options.basePath ?? '', options.copyrightHeader)) - : null)); + copyrightHeader: options.copyrightHeader != null + ? _lineReader( + path.posix.join(options.basePath ?? '', options.copyrightHeader)) + : null, + )); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: options.getPackageName(), + ); } @override @@ -623,7 +670,12 @@ class CppGeneratorAdapter implements GeneratorAdapter { OutputFileOptions( fileType: fileType, languageOptions: cppOptionsWithHeader); const CppGenerator generator = CppGenerator(); - generator.generate(outputFileOptions, root, sink); + generator.generate( + outputFileOptions, + root, + sink, + packageName: options.getPackageName(), + ); } @override @@ -653,13 +705,19 @@ class KotlinGeneratorAdapter implements GeneratorAdapter { KotlinOptions kotlinOptions = options.kotlinOptions ?? const KotlinOptions(); kotlinOptions = kotlinOptions.merge(KotlinOptions( - errorClassName: kotlinOptions.errorClassName ?? 'FlutterError', - copyrightHeader: options.copyrightHeader != null - ? _lineReader(path.posix - .join(options.basePath ?? '', options.copyrightHeader)) - : null)); + errorClassName: kotlinOptions.errorClassName ?? 'FlutterError', + copyrightHeader: options.copyrightHeader != null + ? _lineReader( + path.posix.join(options.basePath ?? '', options.copyrightHeader)) + : null, + )); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: options.getPackageName(), + ); } @override @@ -1381,7 +1439,9 @@ ${_argParser.usage}'''; ..addOption('base_path', help: 'A base path to be prefixed to all outputs and copyright header path. Generally used for testing', - hide: true); + hide: true) + ..addOption('package_name', + help: 'The package that generated code will be in.'); /// Convert command-line arguments to [PigeonOptions]. static PigeonOptions parseArgs(List args) { @@ -1421,6 +1481,7 @@ ${_argParser.usage}'''; astOut: results['ast_out'] as String?, debugGenerators: results['debug_generators'] as bool?, basePath: results['base_path'] as String?, + packageName: results['package_name'] as String?, ); return opts; } diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart index 26547fb6591..d5b10911038 100644 --- a/packages/pigeon/lib/swift_generator.dart +++ b/packages/pigeon/lib/swift_generator.dart @@ -55,7 +55,11 @@ class SwiftGenerator extends StructuredGenerator { @override void writeFilePrologue( - SwiftOptions generatorOptions, Root root, Indent indent) { + SwiftOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); } @@ -66,7 +70,11 @@ class SwiftGenerator extends StructuredGenerator { @override void writeFileImports( - SwiftOptions generatorOptions, Root root, Indent indent) { + SwiftOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { indent.writeln('import Foundation'); indent.format(''' #if os(iOS) @@ -80,7 +88,12 @@ import FlutterMacOS @override void writeEnum( - SwiftOptions generatorOptions, Root root, Indent indent, Enum anEnum) { + SwiftOptions generatorOptions, + Root root, + Indent indent, + Enum anEnum, { + required String packageName, + }) { indent.newln(); addDocumentationComments( indent, anEnum.documentationComments, _docCommentSpec); @@ -97,7 +110,12 @@ import FlutterMacOS @override void writeDataClass( - SwiftOptions generatorOptions, Root root, Indent indent, Class klass) { + SwiftOptions generatorOptions, + Root root, + Indent indent, + Class klass, { + required String packageName, + }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); final Set customEnumNames = @@ -118,10 +136,24 @@ import FlutterMacOS }); indent.newln(); - writeClassDecode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); - writeClassEncode(generatorOptions, root, indent, klass, customClassNames, - customEnumNames); + writeClassDecode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); + writeClassEncode( + generatorOptions, + root, + indent, + klass, + customClassNames, + customEnumNames, + packageName: packageName, + ); }); } @@ -132,8 +164,9 @@ import FlutterMacOS Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { indent.write('func toList() -> [Any?] '); indent.addScoped('{', '}', () { indent.write('return '); @@ -166,8 +199,9 @@ import FlutterMacOS Indent indent, Class klass, Set customClassNames, - Set customEnumNames, - ) { + Set customEnumNames, { + required String packageName, + }) { final String className = klass.name; indent.write('static func fromList(_ list: [Any?]) -> $className? '); @@ -213,14 +247,15 @@ import FlutterMacOS void writeApis( SwiftOptions generatorOptions, Root root, - Indent indent, - ) { + Indent indent, { + required String packageName, + }) { if (root.apis.any((Api api) => api.location == ApiLocation.host && api.methods.any((Method it) => it.isAsynchronous))) { indent.newln(); } - super.writeApis(generatorOptions, root, indent); + super.writeApis(generatorOptions, root, indent, packageName: packageName); } /// Writes the code for a flutter [Api], [api]. @@ -235,8 +270,9 @@ import FlutterMacOS SwiftOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.flutter); final bool isCustomCodec = getCodecClasses(api, root).isNotEmpty; if (isCustomCodec) { @@ -268,7 +304,7 @@ import FlutterMacOS final _SwiftFunctionComponents components = _SwiftFunctionComponents.fromMethod(func); - final String channelName = makeChannelName(api, func); + final String channelName = makeChannelName(api, func, packageName); final String returnType = func.returnType.isVoid ? '' : _nullsafeSwiftTypeForDartType(func.returnType); @@ -341,8 +377,9 @@ import FlutterMacOS SwiftOptions generatorOptions, Root root, Indent indent, - Api api, - ) { + Api api, { + required String packageName, + }) { assert(api.location == ApiLocation.host); final String apiName = api.name; @@ -416,7 +453,7 @@ import FlutterMacOS final _SwiftFunctionComponents components = _SwiftFunctionComponents.fromMethod(method); - final String channelName = makeChannelName(api, method); + final String channelName = makeChannelName(api, method, packageName); final String varChannelName = '${method.name}Channel'; addDocumentationComments( indent, method.documentationComments, _docCommentSpec); @@ -499,7 +536,7 @@ import FlutterMacOS }); } - /// Writes the codec classwill be used for encoding messages for the [api]. + /// Writes the codec class will be used for encoding messages for the [api]. /// Example: /// private class FooHostApiCodecReader: FlutterStandardReader {...} /// private class FooHostApiCodecWriter: FlutterStandardWriter {...} @@ -701,7 +738,11 @@ private func nilOrValue(_ value: Any?) -> T? { @override void writeGeneralUtilities( - SwiftOptions generatorOptions, Root root, Indent indent) { + SwiftOptions generatorOptions, + Root root, + Indent indent, { + required String packageName, + }) { _writeWrapResult(indent); _writeWrapError(indent); _writeNilOrValue(indent); diff --git a/packages/pigeon/mock_handler_tester/test/message.dart b/packages/pigeon/mock_handler_tester/test/message.dart index 1ae793cf20b..3a330815b39 100644 --- a/packages/pigeon/mock_handler_tester/test/message.dart +++ b/packages/pigeon/mock_handler_tester/test/message.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import @@ -172,7 +172,7 @@ class MessageApi { /// This comment also tests multiple line comments. Future initialize() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MessageApi.initialize', codec, + 'dev.flutter.pigeon.mock_handler_tester.MessageApi.initialize', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -194,7 +194,7 @@ class MessageApi { /// This comment is to test method documentation comments. Future search(MessageSearchRequest arg_request) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MessageApi.search', codec, + 'dev.flutter.pigeon.mock_handler_tester.MessageApi.search', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_request]) as List?; @@ -269,7 +269,7 @@ class MessageNestedApi { /// This comment also tests multiple line comments. Future search(MessageNested arg_nested) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MessageNestedApi.search', codec, + 'dev.flutter.pigeon.mock_handler_tester.MessageNestedApi.search', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_nested]) as List?; @@ -334,19 +334,20 @@ abstract class MessageFlutterSearchApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MessageFlutterSearchApi.search', codec, + 'dev.flutter.pigeon.mock_handler_tester.MessageFlutterSearchApi.search', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.MessageFlutterSearchApi.search was null.'); + 'Argument for dev.flutter.pigeon.mock_handler_tester.MessageFlutterSearchApi.search was null.'); final List args = (message as List?)!; final MessageSearchRequest? arg_request = (args[0] as MessageSearchRequest?); assert(arg_request != null, - 'Argument for dev.flutter.pigeon.MessageFlutterSearchApi.search was null, expected non-null MessageSearchRequest.'); + 'Argument for dev.flutter.pigeon.mock_handler_tester.MessageFlutterSearchApi.search was null, expected non-null MessageSearchRequest.'); final MessageSearchReply output = api.search(arg_request!); return output; }); diff --git a/packages/pigeon/mock_handler_tester/test/test.dart b/packages/pigeon/mock_handler_tester/test/test.dart index 21c4f391856..a6cf4682bd4 100644 --- a/packages/pigeon/mock_handler_tester/test/test.dart +++ b/packages/pigeon/mock_handler_tester/test/test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import // ignore_for_file: avoid_relative_lib_imports @@ -61,7 +61,7 @@ abstract class TestHostApi { static void setup(TestHostApi? api, {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MessageApi.initialize', codec, + 'dev.flutter.pigeon.mock_handler_tester.MessageApi.initialize', codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -78,7 +78,7 @@ abstract class TestHostApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MessageApi.search', codec, + 'dev.flutter.pigeon.mock_handler_tester.MessageApi.search', codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -88,12 +88,12 @@ abstract class TestHostApi { .setMockDecodedMessageHandler(channel, (Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.MessageApi.search was null.'); + 'Argument for dev.flutter.pigeon.mock_handler_tester.MessageApi.search was null.'); final List args = (message as List?)!; final MessageSearchRequest? arg_request = (args[0] as MessageSearchRequest?); assert(arg_request != null, - 'Argument for dev.flutter.pigeon.MessageApi.search was null, expected non-null MessageSearchRequest.'); + 'Argument for dev.flutter.pigeon.mock_handler_tester.MessageApi.search was null, expected non-null MessageSearchRequest.'); final MessageSearchReply output = api.search(arg_request!); return [output]; }); @@ -149,7 +149,8 @@ abstract class TestNestedApi { static void setup(TestNestedApi? api, {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MessageNestedApi.search', codec, + 'dev.flutter.pigeon.mock_handler_tester.MessageNestedApi.search', + codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -159,11 +160,11 @@ abstract class TestNestedApi { .setMockDecodedMessageHandler(channel, (Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.MessageNestedApi.search was null.'); + 'Argument for dev.flutter.pigeon.mock_handler_tester.MessageNestedApi.search was null.'); final List args = (message as List?)!; final MessageNested? arg_nested = (args[0] as MessageNested?); assert(arg_nested != null, - 'Argument for dev.flutter.pigeon.MessageNestedApi.search was null, expected non-null MessageNested.'); + 'Argument for dev.flutter.pigeon.mock_handler_tester.MessageNestedApi.search was null, expected non-null MessageNested.'); final MessageSearchReply output = api.search(arg_nested!); return [output]; }); diff --git a/packages/pigeon/mock_handler_tester/test/widget_test.dart b/packages/pigeon/mock_handler_tester/test/widget_test.dart index 0973bfe778d..bb0af448434 100644 --- a/packages/pigeon/mock_handler_tester/test/widget_test.dart +++ b/packages/pigeon/mock_handler_tester/test/widget_test.dart @@ -74,14 +74,14 @@ void main() { TestHostApi.setup(mock); expect( await const BasicMessageChannel( - 'dev.flutter.pigeon.MessageApi.initialize', + 'dev.flutter.pigeon.mock_handler_tester.MessageApi.initialize', StandardMessageCodec(), ).send([null]), isEmpty, ); try { await const BasicMessageChannel( - 'dev.flutter.pigeon.MessageApi.search', + 'dev.flutter.pigeon.mock_handler_tester.MessageApi.search', StandardMessageCodec(), ).send([null]) as List?; expect(true, isFalse); // should not reach here @@ -90,7 +90,7 @@ void main() { expect( error.toString(), contains( - 'Argument for dev.flutter.pigeon.MessageApi.search was null, expected non-null MessageSearchRequest.', + 'Argument for dev.flutter.pigeon.mock_handler_tester.MessageApi.search was null, expected non-null MessageSearchRequest.', ), ); } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java index 41307363cf8..6f2215f91d6 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java @@ -1166,7 +1166,9 @@ static void setup( { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.noop", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -1188,7 +1190,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1213,7 +1215,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1236,7 +1238,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1259,7 +1261,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1281,7 +1283,9 @@ static void setup( { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoInt", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -1305,7 +1309,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1329,7 +1333,9 @@ static void setup( { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoBool", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -1353,7 +1359,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1378,7 +1384,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1403,7 +1409,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1427,7 +1433,9 @@ static void setup( { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoList", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -1450,7 +1458,9 @@ static void setup( { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoMap", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -1474,7 +1484,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1499,7 +1509,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1524,7 +1534,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1549,7 +1559,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1574,7 +1584,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1605,7 +1615,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1632,7 +1642,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1657,7 +1667,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1682,7 +1692,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1707,7 +1717,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1732,7 +1742,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1757,7 +1767,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1782,7 +1792,7 @@ static void setup( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1806,7 +1816,9 @@ static void setup( { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -1834,7 +1846,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1865,7 +1877,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1896,7 +1908,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1927,7 +1939,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1958,7 +1970,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List", getCodec()); if (api != null) { channel.setMessageHandler( @@ -1989,7 +2001,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2020,7 +2032,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2051,7 +2063,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2082,7 +2094,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2111,7 +2123,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2140,7 +2152,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2169,7 +2181,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2200,7 +2212,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2231,7 +2243,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2263,7 +2275,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2294,7 +2306,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2325,7 +2337,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2356,7 +2368,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2387,7 +2399,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2418,7 +2430,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2449,7 +2461,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2480,7 +2492,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2509,7 +2521,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2538,7 +2550,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2567,7 +2579,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2598,7 +2610,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2635,7 +2647,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2666,7 +2678,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2698,7 +2710,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2729,7 +2741,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2760,7 +2772,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2791,7 +2803,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2822,7 +2834,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2853,7 +2865,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2884,7 +2896,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2916,7 +2928,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2947,7 +2959,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString", getCodec()); if (api != null) { channel.setMessageHandler( @@ -2978,7 +2990,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", getCodec()); if (api != null) { channel.setMessageHandler( @@ -3009,7 +3021,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList", getCodec()); if (api != null) { channel.setMessageHandler( @@ -3040,7 +3052,7 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap", getCodec()); if (api != null) { channel.setMessageHandler( @@ -3140,7 +3152,9 @@ public interface Reply { public void noop(@NonNull Reply callback) { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.noop", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop", + getCodec()); channel.send(null, channelReply -> callback.reply(null)); } /** Responds with an error from an async function returning a value. */ @@ -3148,7 +3162,7 @@ public void throwError(@NonNull Reply callback) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError", getCodec()); channel.send( null, @@ -3163,7 +3177,7 @@ public void throwErrorFromVoid(@NonNull Reply callback) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid", getCodec()); channel.send(null, channelReply -> callback.reply(null)); } @@ -3172,7 +3186,7 @@ public void echoAllTypes(@NonNull AllTypes everythingArg, @NonNull Reply channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes", getCodec()); channel.send( new ArrayList(Collections.singletonList(everythingArg)), @@ -3188,7 +3202,7 @@ public void echoAllNullableTypes( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes", getCodec()); channel.send( new ArrayList(Collections.singletonList(everythingArg)), @@ -3211,7 +3225,7 @@ public void sendMultipleNullableTypes( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes", getCodec()); channel.send( new ArrayList( @@ -3226,7 +3240,9 @@ public void sendMultipleNullableTypes( public void echoBool(@NonNull Boolean aBoolArg, @NonNull Reply callback) { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool", + getCodec()); channel.send( new ArrayList(Collections.singletonList(aBoolArg)), channelReply -> { @@ -3239,7 +3255,9 @@ public void echoBool(@NonNull Boolean aBoolArg, @NonNull Reply callback public void echoInt(@NonNull Long anIntArg, @NonNull Reply callback) { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt", + getCodec()); channel.send( new ArrayList(Collections.singletonList(anIntArg)), channelReply -> { @@ -3253,7 +3271,7 @@ public void echoDouble(@NonNull Double aDoubleArg, @NonNull Reply callba BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble", getCodec()); channel.send( new ArrayList(Collections.singletonList(aDoubleArg)), @@ -3268,7 +3286,7 @@ public void echoString(@NonNull String aStringArg, @NonNull Reply callba BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString", getCodec()); channel.send( new ArrayList(Collections.singletonList(aStringArg)), @@ -3283,7 +3301,7 @@ public void echoUint8List(@NonNull byte[] aListArg, @NonNull Reply callb BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List", getCodec()); channel.send( new ArrayList(Collections.singletonList(aListArg)), @@ -3297,7 +3315,9 @@ public void echoUint8List(@NonNull byte[] aListArg, @NonNull Reply callb public void echoList(@NonNull List aListArg, @NonNull Reply> callback) { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList", + getCodec()); channel.send( new ArrayList(Collections.singletonList(aListArg)), channelReply -> { @@ -3311,7 +3331,9 @@ public void echoMap( @NonNull Map aMapArg, @NonNull Reply> callback) { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap", + getCodec()); channel.send( new ArrayList(Collections.singletonList(aMapArg)), channelReply -> { @@ -3325,7 +3347,7 @@ public void echoNullableBool(@Nullable Boolean aBoolArg, @NonNull Reply BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool", getCodec()); channel.send( new ArrayList(Collections.singletonList(aBoolArg)), @@ -3340,7 +3362,7 @@ public void echoNullableInt(@Nullable Long anIntArg, @NonNull Reply callba BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt", getCodec()); channel.send( new ArrayList(Collections.singletonList(anIntArg)), @@ -3355,7 +3377,7 @@ public void echoNullableDouble(@Nullable Double aDoubleArg, @NonNull Reply channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble", getCodec()); channel.send( new ArrayList(Collections.singletonList(aDoubleArg)), @@ -3370,7 +3392,7 @@ public void echoNullableString(@Nullable String aStringArg, @NonNull Reply channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString", getCodec()); channel.send( new ArrayList(Collections.singletonList(aStringArg)), @@ -3385,7 +3407,7 @@ public void echoNullableUint8List(@Nullable byte[] aListArg, @NonNull Reply channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List", getCodec()); channel.send( new ArrayList(Collections.singletonList(aListArg)), @@ -3401,7 +3423,7 @@ public void echoNullableList( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList", getCodec()); channel.send( new ArrayList(Collections.singletonList(aListArg)), @@ -3417,7 +3439,7 @@ public void echoNullableMap( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap", getCodec()); channel.send( new ArrayList(Collections.singletonList(aMapArg)), @@ -3435,7 +3457,7 @@ public void noopAsync(@NonNull Reply callback) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync", getCodec()); channel.send(null, channelReply -> callback.reply(null)); } @@ -3444,7 +3466,7 @@ public void echoAsyncString(@NonNull String aStringArg, @NonNull Reply c BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString", getCodec()); channel.send( new ArrayList(Collections.singletonList(aStringArg)), @@ -3473,7 +3495,9 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable HostTrivia { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostTrivialApi.noop", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -3513,7 +3537,9 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable HostSmallA { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostSmallApi.echo", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -3542,7 +3568,9 @@ public void error(Throwable error) { { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.HostSmallApi.voidVoid", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", + getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { @@ -3620,7 +3648,9 @@ public interface Reply { public void echoWrappedList(@NonNull TestMessage msgArg, @NonNull Reply callback) { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.FlutterSmallApi.echoWrappedList", getCodec()); + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList", + getCodec()); channel.send( new ArrayList(Collections.singletonList(msgArg)), channelReply -> { diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AsyncTest.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AsyncTest.java index 2434910d837..01f6ef55645 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AsyncTest.java +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AsyncTest.java @@ -48,9 +48,13 @@ public void asyncSuccess() { HostSmallApi.setup(binaryMessenger, api); ArgumentCaptor handler = ArgumentCaptor.forClass(BinaryMessenger.BinaryMessageHandler.class); - verify(binaryMessenger).setMessageHandler(eq("dev.flutter.pigeon.HostSmallApi.echo"), any()); verify(binaryMessenger) - .setMessageHandler(eq("dev.flutter.pigeon.HostSmallApi.voidVoid"), handler.capture()); + .setMessageHandler( + eq("dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo"), any()); + verify(binaryMessenger) + .setMessageHandler( + eq("dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid"), + handler.capture()); MessageCodec codec = HostSmallApi.getCodec(); ByteBuffer message = codec.encodeMessage(null); Boolean[] didCall = {false}; @@ -75,9 +79,13 @@ public void asyncError() { HostSmallApi.setup(binaryMessenger, api); ArgumentCaptor handler = ArgumentCaptor.forClass(BinaryMessenger.BinaryMessageHandler.class); - verify(binaryMessenger).setMessageHandler(eq("dev.flutter.pigeon.HostSmallApi.echo"), any()); verify(binaryMessenger) - .setMessageHandler(eq("dev.flutter.pigeon.HostSmallApi.voidVoid"), handler.capture()); + .setMessageHandler( + eq("dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo"), any()); + verify(binaryMessenger) + .setMessageHandler( + eq("dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid"), + handler.capture()); MessageCodec codec = HostSmallApi.getCodec(); ByteBuffer message = codec.encodeMessage(null); Boolean[] didCall = {false}; diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/PrimitiveTest.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/PrimitiveTest.java index 186d80bb1c6..d45970196aa 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/PrimitiveTest.java +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/PrimitiveTest.java @@ -87,7 +87,9 @@ public void primitiveIntHostApi() { ArgumentCaptor handler = ArgumentCaptor.forClass(BinaryMessenger.BinaryMessageHandler.class); verify(binaryMessenger) - .setMessageHandler(eq("dev.flutter.pigeon.PrimitiveHostApi.anInt"), handler.capture()); + .setMessageHandler( + eq("dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt"), + handler.capture()); MessageCodec codec = PrimitiveHostApi.getCodec(); @SuppressWarnings("unchecked") ByteBuffer message = codec.encodeMessage(new ArrayList(Arrays.asList((Integer) 1))); diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AsyncHandlersTest.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AsyncHandlersTest.m index 35b9dc80162..14aec3e94aa 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AsyncHandlersTest.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AsyncHandlersTest.m @@ -61,7 +61,7 @@ - (void)testAsyncFlutter2HostVoidVoid { [[MockBinaryMessenger alloc] initWithCodec:HostSmallApiGetCodec()]; MockHostSmallApi *mockHostSmallApi = [[MockHostSmallApi alloc] init]; HostSmallApiSetup(binaryMessenger, mockHostSmallApi); - NSString *channelName = @"dev.flutter.pigeon.HostSmallApi.voidVoid"; + NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid"; XCTAssertNotNil(binaryMessenger.handlers[channelName]); XCTestExpectation *expectation = [self expectationWithDescription:@"voidvoid callback"]; @@ -81,7 +81,7 @@ - (void)testAsyncFlutter2HostVoidVoidError { message:@"message" details:nil]; HostSmallApiSetup(binaryMessenger, mockHostSmallApi); - NSString *channelName = @"dev.flutter.pigeon.HostSmallApi.voidVoid"; + NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid"; XCTAssertNotNil(binaryMessenger.handlers[channelName]); XCTestExpectation *expectation = [self expectationWithDescription:@"voidvoid callback"]; @@ -101,7 +101,7 @@ - (void)testAsyncFlutter2Host { NSString *value = @"Test"; mockHostSmallApi.output = value; HostSmallApiSetup(binaryMessenger, mockHostSmallApi); - NSString *channelName = @"dev.flutter.pigeon.HostSmallApi.echo"; + NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo"; XCTAssertNotNil(binaryMessenger.handlers[channelName]); NSData *inputEncoded = [binaryMessenger.codec encode:@[ value ]]; @@ -120,7 +120,7 @@ - (void)testAsyncFlutter2HostError { [[MockBinaryMessenger alloc] initWithCodec:HostSmallApiGetCodec()]; MockHostSmallApi *mockHostSmallApi = [[MockHostSmallApi alloc] init]; HostSmallApiSetup(binaryMessenger, mockHostSmallApi); - NSString *channelName = @"dev.flutter.pigeon.HostSmallApi.echo"; + NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo"; XCTAssertNotNil(binaryMessenger.handlers[channelName]); NSData *inputEncoded = [binaryMessenger.codec encode:@[ @"Test" ]]; diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/NullableReturnsTest.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/NullableReturnsTest.m index d09be4cd473..a1fb114cf6e 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/NullableReturnsTest.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/NullableReturnsTest.m @@ -51,7 +51,7 @@ - (void)testNullableParameterWithHostApi { MockNullableArgHostApi *api = [[MockNullableArgHostApi alloc] init]; MockBinaryMessenger *binaryMessenger = [[MockBinaryMessenger alloc] initWithCodec:NullableArgHostApiGetCodec()]; - NSString *channel = @"dev.flutter.pigeon.NullableArgHostApi.doit"; + NSString *channel = @"dev.flutter.pigeon.pigeon_integration_tests.NullableArgHostApi.doit"; NullableArgHostApiSetup(binaryMessenger, api); XCTAssertNotNil(binaryMessenger.handlers[channel]); XCTestExpectation *expectation = [self expectationWithDescription:@"callback"]; diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m index d3a35af1d2d..524a9dd7037 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m @@ -334,7 +334,7 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// test basic calling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.noop" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -353,7 +353,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -375,7 +376,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns an error, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwError" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -395,7 +397,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns an error from a void function, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"throwErrorFromVoid" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -415,7 +418,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns a Flutter error, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"throwFlutterError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -435,7 +439,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoInt" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -456,7 +461,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -477,7 +483,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in boolean. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoBool" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -498,7 +505,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoString" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -519,7 +527,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in Uint8List. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -541,7 +550,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in generic Object. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoObject" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -562,7 +572,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoList" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -583,7 +594,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoMap" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -604,7 +616,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map to test nested class serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoClassWrapper" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -626,7 +639,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAllNullableTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -649,7 +663,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// sending of nested objects. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"extractNestedNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -672,7 +687,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// sending of nested objects. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"createNestedNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -695,7 +711,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in arguments of multiple types. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"sendMultipleNullableTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -723,7 +740,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -745,7 +763,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -767,7 +786,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in boolean. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -789,7 +809,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -811,7 +832,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in Uint8List. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -834,7 +856,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in generic Object. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableObject" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -856,7 +879,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -878,7 +902,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -901,7 +926,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// test basic asynchronous calling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -921,7 +947,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in int asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -944,7 +971,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in double asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -967,7 +995,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in boolean asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -990,7 +1019,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed string asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1013,7 +1043,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in Uint8List asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1037,7 +1068,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in generic Object asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1060,7 +1092,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1083,7 +1116,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1107,7 +1141,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Responds with an error from an async function returning a value. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1127,7 +1162,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Responds with an error from an async void function. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"throwAsyncErrorFromVoid" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1147,7 +1183,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Responds with a Flutter error from an async function returning a value. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"throwAsyncFlutterError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1168,7 +1205,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed object, to test async serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncAllTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1191,8 +1229,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableAllNullableTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1216,7 +1254,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in int asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1239,7 +1278,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in double asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1262,7 +1302,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in boolean asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1285,7 +1326,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed string asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1308,7 +1350,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in Uint8List asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1332,7 +1375,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in generic Object asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableObject" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1355,7 +1399,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1378,7 +1423,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1401,7 +1447,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1420,7 +1467,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterThrowError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1440,7 +1488,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterThrowErrorFromVoid" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1459,7 +1508,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoAllTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1481,8 +1531,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterSendMultipleNullableTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1510,7 +1560,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1532,7 +1583,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1554,7 +1606,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1576,7 +1629,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1598,7 +1652,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1621,7 +1676,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1643,7 +1699,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1666,7 +1723,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1689,7 +1747,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1712,7 +1771,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1735,7 +1795,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1758,8 +1819,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1782,7 +1843,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1805,7 +1867,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1905,7 +1968,8 @@ - (instancetype)initWithBinaryMessenger:(NSObject *)bina } - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.noop" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:nil @@ -1915,7 +1979,8 @@ - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion { } - (void)throwErrorWithCompletion:(void (^)(id _Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:nil @@ -1926,7 +1991,8 @@ - (void)throwErrorWithCompletion:(void (^)(id _Nullable, FlutterError *_Nullable } - (void)throwErrorFromVoidWithCompletion:(void (^)(FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.throwErrorFromVoid" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:nil @@ -1937,7 +2003,8 @@ - (void)throwErrorFromVoidWithCompletion:(void (^)(FlutterError *_Nullable))comp - (void)echoAllTypes:(AllTypes *)arg_everything completion:(void (^)(AllTypes *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_everything ?: [NSNull null] ] @@ -1950,7 +2017,8 @@ - (void)echoAllNullableTypes:(AllNullableTypes *)arg_everything completion: (void (^)(AllNullableTypes *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoAllNullableTypes" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_everything ?: [NSNull null] ] @@ -1965,8 +2033,8 @@ - (void)sendMultipleNullableTypesABool:(nullable NSNumber *)arg_aNullableBool completion:(void (^)(AllNullableTypes *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName: - @"dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.sendMultipleNullableTypes" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ @@ -1981,7 +2049,8 @@ - (void)sendMultipleNullableTypesABool:(nullable NSNumber *)arg_aNullableBool - (void)echoBool:(NSNumber *)arg_aBool completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aBool ?: [NSNull null] ] @@ -1993,7 +2062,8 @@ - (void)echoBool:(NSNumber *)arg_aBool - (void)echoInt:(NSNumber *)arg_anInt completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_anInt ?: [NSNull null] ] @@ -2005,7 +2075,8 @@ - (void)echoInt:(NSNumber *)arg_anInt - (void)echoDouble:(NSNumber *)arg_aDouble completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aDouble ?: [NSNull null] ] @@ -2017,7 +2088,8 @@ - (void)echoDouble:(NSNumber *)arg_aDouble - (void)echoString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aString ?: [NSNull null] ] @@ -2030,7 +2102,8 @@ - (void)echoUint8List:(FlutterStandardTypedData *)arg_aList completion: (void (^)(FlutterStandardTypedData *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aList ?: [NSNull null] ] @@ -2042,7 +2115,8 @@ - (void)echoUint8List:(FlutterStandardTypedData *)arg_aList - (void)echoList:(NSArray *)arg_aList completion:(void (^)(NSArray *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aList ?: [NSNull null] ] @@ -2055,7 +2129,8 @@ - (void)echoMap:(NSDictionary *)arg_aMap completion: (void (^)(NSDictionary *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aMap ?: [NSNull null] ] @@ -2067,7 +2142,8 @@ - (void)echoMap:(NSDictionary *)arg_aMap - (void)echoNullableBool:(nullable NSNumber *)arg_aBool completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aBool ?: [NSNull null] ] @@ -2079,7 +2155,8 @@ - (void)echoNullableBool:(nullable NSNumber *)arg_aBool - (void)echoNullableInt:(nullable NSNumber *)arg_anInt completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_anInt ?: [NSNull null] ] @@ -2091,7 +2168,8 @@ - (void)echoNullableInt:(nullable NSNumber *)arg_anInt - (void)echoNullableDouble:(nullable NSNumber *)arg_aDouble completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableDouble" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aDouble ?: [NSNull null] ] @@ -2103,7 +2181,8 @@ - (void)echoNullableDouble:(nullable NSNumber *)arg_aDouble - (void)echoNullableString:(nullable NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableString" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aString ?: [NSNull null] ] @@ -2116,7 +2195,8 @@ - (void)echoNullableUint8List:(nullable FlutterStandardTypedData *)arg_aList completion:(void (^)(FlutterStandardTypedData *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableUint8List" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aList ?: [NSNull null] ] @@ -2128,7 +2208,8 @@ - (void)echoNullableUint8List:(nullable FlutterStandardTypedData *)arg_aList - (void)echoNullableList:(nullable NSArray *)arg_aList completion:(void (^)(NSArray *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aList ?: [NSNull null] ] @@ -2141,7 +2222,8 @@ - (void)echoNullableMap:(nullable NSDictionary *)arg_aMap completion:(void (^)(NSDictionary *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aMap ?: [NSNull null] ] @@ -2152,7 +2234,8 @@ - (void)echoNullableMap:(nullable NSDictionary *)arg_aMap } - (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:nil @@ -2163,7 +2246,8 @@ - (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion { - (void)echoAsyncString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aString ?: [NSNull null] ] @@ -2183,10 +2267,10 @@ - (void)echoAsyncString:(NSString *)arg_aString void HostTrivialApiSetup(id binaryMessenger, NSObject *api) { { - FlutterBasicMessageChannel *channel = - [[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.pigeon.HostTrivialApi.noop" - binaryMessenger:binaryMessenger - codec:HostTrivialApiGetCodec()]; + FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop" + binaryMessenger:binaryMessenger + codec:HostTrivialApiGetCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(noopWithError:)], @"HostTrivialApi api (%@) doesn't respond to @selector(noopWithError:)", api); @@ -2208,10 +2292,10 @@ void HostTrivialApiSetup(id binaryMessenger, void HostSmallApiSetup(id binaryMessenger, NSObject *api) { { - FlutterBasicMessageChannel *channel = - [[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.pigeon.HostSmallApi.echo" - binaryMessenger:binaryMessenger - codec:HostSmallApiGetCodec()]; + FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo" + binaryMessenger:binaryMessenger + codec:HostSmallApiGetCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(echoString:completion:)], @"HostSmallApi api (%@) doesn't respond to @selector(echoString:completion:)", api); @@ -2228,10 +2312,10 @@ void HostSmallApiSetup(id binaryMessenger, NSObject *)bina - (void)echoWrappedList:(TestMessage *)arg_msg completion:(void (^)(TestMessage *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterSmallApi.echoWrappedList" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList" binaryMessenger:self.binaryMessenger codec:FlutterSmallApiGetCodec()]; [channel sendMessage:@[ arg_msg ?: [NSNull null] ] diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m index d3a35af1d2d..524a9dd7037 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m @@ -334,7 +334,7 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// test basic calling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.noop" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -353,7 +353,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -375,7 +376,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns an error, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwError" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -395,7 +397,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns an error from a void function, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"throwErrorFromVoid" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -415,7 +418,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns a Flutter error, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"throwFlutterError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -435,7 +439,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoInt" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -456,7 +461,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -477,7 +483,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in boolean. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoBool" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -498,7 +505,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoString" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -519,7 +527,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in Uint8List. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -541,7 +550,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in generic Object. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoObject" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -562,7 +572,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoList" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -583,7 +594,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoMap" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -604,7 +616,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map to test nested class serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoClassWrapper" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -626,7 +639,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAllNullableTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -649,7 +663,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// sending of nested objects. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"extractNestedNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -672,7 +687,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// sending of nested objects. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"createNestedNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -695,7 +711,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in arguments of multiple types. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"sendMultipleNullableTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -723,7 +740,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -745,7 +763,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -767,7 +786,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in boolean. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -789,7 +809,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -811,7 +832,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in Uint8List. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -834,7 +856,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in generic Object. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableObject" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -856,7 +879,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoNullableList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -878,7 +902,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -901,7 +926,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// test basic asynchronous calling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -921,7 +947,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in int asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -944,7 +971,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in double asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -967,7 +995,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in boolean asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -990,7 +1019,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed string asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1013,7 +1043,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in Uint8List asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1037,7 +1068,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in generic Object asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1060,7 +1092,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1083,7 +1116,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1107,7 +1141,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Responds with an error from an async function returning a value. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1127,7 +1162,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Responds with an error from an async void function. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"throwAsyncErrorFromVoid" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1147,7 +1183,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Responds with a Flutter error from an async function returning a value. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"throwAsyncFlutterError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1168,7 +1205,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed object, to test async serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncAllTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1191,8 +1229,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableAllNullableTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1216,7 +1254,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in int asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1239,7 +1278,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns passed in double asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1262,7 +1302,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in boolean asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1285,7 +1326,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed string asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1308,7 +1350,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in Uint8List asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1332,7 +1375,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed in generic Object asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableObject" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1355,7 +1399,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1378,7 +1423,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"echoAsyncNullableMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1401,7 +1447,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop" + initWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1420,7 +1467,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterThrowError" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1440,7 +1488,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterThrowErrorFromVoid" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1459,7 +1508,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoAllTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1481,8 +1531,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterSendMultipleNullableTypes" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1510,7 +1560,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1532,7 +1583,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1554,7 +1606,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1576,7 +1629,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1598,7 +1652,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1621,7 +1676,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1643,7 +1699,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1666,7 +1723,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableBool" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1689,7 +1747,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableInt" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1712,7 +1771,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableDouble" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1735,7 +1795,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableString" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1758,8 +1819,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableUint8List" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1782,7 +1843,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableList" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1805,7 +1867,8 @@ void HostIntegrationCoreApiSetup(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap" + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterEchoNullableMap" binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1905,7 +1968,8 @@ - (instancetype)initWithBinaryMessenger:(NSObject *)bina } - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.noop" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:nil @@ -1915,7 +1979,8 @@ - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion { } - (void)throwErrorWithCompletion:(void (^)(id _Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:nil @@ -1926,7 +1991,8 @@ - (void)throwErrorWithCompletion:(void (^)(id _Nullable, FlutterError *_Nullable } - (void)throwErrorFromVoidWithCompletion:(void (^)(FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.throwErrorFromVoid" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:nil @@ -1937,7 +2003,8 @@ - (void)throwErrorFromVoidWithCompletion:(void (^)(FlutterError *_Nullable))comp - (void)echoAllTypes:(AllTypes *)arg_everything completion:(void (^)(AllTypes *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_everything ?: [NSNull null] ] @@ -1950,7 +2017,8 @@ - (void)echoAllNullableTypes:(AllNullableTypes *)arg_everything completion: (void (^)(AllNullableTypes *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoAllNullableTypes" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_everything ?: [NSNull null] ] @@ -1965,8 +2033,8 @@ - (void)sendMultipleNullableTypesABool:(nullable NSNumber *)arg_aNullableBool completion:(void (^)(AllNullableTypes *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName: - @"dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.sendMultipleNullableTypes" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ @@ -1981,7 +2049,8 @@ - (void)sendMultipleNullableTypesABool:(nullable NSNumber *)arg_aNullableBool - (void)echoBool:(NSNumber *)arg_aBool completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aBool ?: [NSNull null] ] @@ -1993,7 +2062,8 @@ - (void)echoBool:(NSNumber *)arg_aBool - (void)echoInt:(NSNumber *)arg_anInt completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_anInt ?: [NSNull null] ] @@ -2005,7 +2075,8 @@ - (void)echoInt:(NSNumber *)arg_anInt - (void)echoDouble:(NSNumber *)arg_aDouble completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aDouble ?: [NSNull null] ] @@ -2017,7 +2088,8 @@ - (void)echoDouble:(NSNumber *)arg_aDouble - (void)echoString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aString ?: [NSNull null] ] @@ -2030,7 +2102,8 @@ - (void)echoUint8List:(FlutterStandardTypedData *)arg_aList completion: (void (^)(FlutterStandardTypedData *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aList ?: [NSNull null] ] @@ -2042,7 +2115,8 @@ - (void)echoUint8List:(FlutterStandardTypedData *)arg_aList - (void)echoList:(NSArray *)arg_aList completion:(void (^)(NSArray *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aList ?: [NSNull null] ] @@ -2055,7 +2129,8 @@ - (void)echoMap:(NSDictionary *)arg_aMap completion: (void (^)(NSDictionary *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aMap ?: [NSNull null] ] @@ -2067,7 +2142,8 @@ - (void)echoMap:(NSDictionary *)arg_aMap - (void)echoNullableBool:(nullable NSNumber *)arg_aBool completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aBool ?: [NSNull null] ] @@ -2079,7 +2155,8 @@ - (void)echoNullableBool:(nullable NSNumber *)arg_aBool - (void)echoNullableInt:(nullable NSNumber *)arg_anInt completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_anInt ?: [NSNull null] ] @@ -2091,7 +2168,8 @@ - (void)echoNullableInt:(nullable NSNumber *)arg_anInt - (void)echoNullableDouble:(nullable NSNumber *)arg_aDouble completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableDouble" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aDouble ?: [NSNull null] ] @@ -2103,7 +2181,8 @@ - (void)echoNullableDouble:(nullable NSNumber *)arg_aDouble - (void)echoNullableString:(nullable NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableString" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aString ?: [NSNull null] ] @@ -2116,7 +2195,8 @@ - (void)echoNullableUint8List:(nullable FlutterStandardTypedData *)arg_aList completion:(void (^)(FlutterStandardTypedData *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List" + messageChannelWithName:@"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableUint8List" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aList ?: [NSNull null] ] @@ -2128,7 +2208,8 @@ - (void)echoNullableUint8List:(nullable FlutterStandardTypedData *)arg_aList - (void)echoNullableList:(nullable NSArray *)arg_aList completion:(void (^)(NSArray *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aList ?: [NSNull null] ] @@ -2141,7 +2222,8 @@ - (void)echoNullableMap:(nullable NSDictionary *)arg_aMap completion:(void (^)(NSDictionary *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aMap ?: [NSNull null] ] @@ -2152,7 +2234,8 @@ - (void)echoNullableMap:(nullable NSDictionary *)arg_aMap } - (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:nil @@ -2163,7 +2246,8 @@ - (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion { - (void)echoAsyncString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString" binaryMessenger:self.binaryMessenger codec:FlutterIntegrationCoreApiGetCodec()]; [channel sendMessage:@[ arg_aString ?: [NSNull null] ] @@ -2183,10 +2267,10 @@ - (void)echoAsyncString:(NSString *)arg_aString void HostTrivialApiSetup(id binaryMessenger, NSObject *api) { { - FlutterBasicMessageChannel *channel = - [[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.pigeon.HostTrivialApi.noop" - binaryMessenger:binaryMessenger - codec:HostTrivialApiGetCodec()]; + FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop" + binaryMessenger:binaryMessenger + codec:HostTrivialApiGetCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(noopWithError:)], @"HostTrivialApi api (%@) doesn't respond to @selector(noopWithError:)", api); @@ -2208,10 +2292,10 @@ void HostTrivialApiSetup(id binaryMessenger, void HostSmallApiSetup(id binaryMessenger, NSObject *api) { { - FlutterBasicMessageChannel *channel = - [[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.pigeon.HostSmallApi.echo" - binaryMessenger:binaryMessenger - codec:HostSmallApiGetCodec()]; + FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] + initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo" + binaryMessenger:binaryMessenger + codec:HostSmallApiGetCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(echoString:completion:)], @"HostSmallApi api (%@) doesn't respond to @selector(echoString:completion:)", api); @@ -2228,10 +2312,10 @@ void HostSmallApiSetup(id binaryMessenger, NSObject *)bina - (void)echoWrappedList:(TestMessage *)arg_msg completion:(void (^)(TestMessage *_Nullable, FlutterError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.FlutterSmallApi.echoWrappedList" + messageChannelWithName: + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList" binaryMessenger:self.binaryMessenger codec:FlutterSmallApiGetCodec()]; [channel sendMessage:@[ arg_msg ?: [NSNull null] ] diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart index f9add7c144b..6c0ded63c25 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import @@ -309,7 +309,8 @@ class HostIntegrationCoreApi { /// test basic calling. Future noop() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.noop', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.noop', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -331,7 +332,8 @@ class HostIntegrationCoreApi { /// Returns the passed object, to test serialization and deserialization. Future echoAllTypes(AllTypes arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAllTypes', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_everything]) as List?; @@ -359,7 +361,8 @@ class HostIntegrationCoreApi { /// Returns an error, to test error handling. Future throwError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwError', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.throwError', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -381,7 +384,8 @@ class HostIntegrationCoreApi { /// Returns an error from a void function, to test error handling. Future throwErrorFromVoid() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.throwErrorFromVoid', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -403,7 +407,8 @@ class HostIntegrationCoreApi { /// Returns a Flutter error, to test error handling. Future throwFlutterError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.throwFlutterError', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -425,7 +430,8 @@ class HostIntegrationCoreApi { /// Returns passed in int. Future echoInt(int arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anInt]) as List?; @@ -453,7 +459,8 @@ class HostIntegrationCoreApi { /// Returns passed in double. Future echoDouble(double arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoDouble', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aDouble]) as List?; @@ -481,7 +488,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean. Future echoBool(bool arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoBool', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aBool]) as List?; @@ -509,7 +517,8 @@ class HostIntegrationCoreApi { /// Returns the passed in string. Future echoString(String arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoString', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoString', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aString]) as List?; @@ -537,7 +546,8 @@ class HostIntegrationCoreApi { /// Returns the passed in Uint8List. Future echoUint8List(Uint8List arg_aUint8List) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoUint8List', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aUint8List]) as List?; @@ -565,7 +575,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object. Future echoObject(Object arg_anObject) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoObject', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoObject', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anObject]) as List?; @@ -593,7 +604,8 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test serialization and deserialization. Future> echoList(List arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aList]) as List?; @@ -621,7 +633,8 @@ class HostIntegrationCoreApi { /// Returns the passed map, to test serialization and deserialization. Future> echoMap(Map arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aMap]) as List?; @@ -650,7 +663,8 @@ class HostIntegrationCoreApi { Future echoClassWrapper( AllClassesWrapper arg_wrapper) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoClassWrapper', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_wrapper]) as List?; @@ -679,7 +693,8 @@ class HostIntegrationCoreApi { Future echoAllNullableTypes( AllNullableTypes? arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAllNullableTypes', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_everything]) as List?; @@ -704,7 +719,7 @@ class HostIntegrationCoreApi { Future extractNestedNullableString( AllClassesWrapper arg_wrapper) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.extractNestedNullableString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -730,7 +745,7 @@ class HostIntegrationCoreApi { Future createNestedNullableString( String? arg_nullableString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.createNestedNullableString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -760,7 +775,7 @@ class HostIntegrationCoreApi { Future sendMultipleNullableTypes(bool? arg_aNullableBool, int? arg_aNullableInt, String? arg_aNullableString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.sendMultipleNullableTypes', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send( @@ -790,7 +805,8 @@ class HostIntegrationCoreApi { /// Returns passed in int. Future echoNullableInt(int? arg_aNullableInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoNullableInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableInt]) as List?; @@ -813,7 +829,8 @@ class HostIntegrationCoreApi { /// Returns passed in double. Future echoNullableDouble(double? arg_aNullableDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoNullableDouble', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableDouble]) as List?; @@ -836,7 +853,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean. Future echoNullableBool(bool? arg_aNullableBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoNullableBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableBool]) as List?; @@ -859,7 +877,8 @@ class HostIntegrationCoreApi { /// Returns the passed in string. Future echoNullableString(String? arg_aNullableString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoNullableString', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableString]) as List?; @@ -883,7 +902,7 @@ class HostIntegrationCoreApi { Future echoNullableUint8List( Uint8List? arg_aNullableUint8List) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoNullableUint8List', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -907,7 +926,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object. Future echoNullableObject(Object? arg_aNullableObject) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoNullableObject', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableObject]) as List?; @@ -931,7 +951,8 @@ class HostIntegrationCoreApi { Future?> echoNullableList( List? arg_aNullableList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoNullableList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableList]) as List?; @@ -955,7 +976,8 @@ class HostIntegrationCoreApi { Future?> echoNullableMap( Map? arg_aNullableMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoNullableMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableMap]) as List?; @@ -979,7 +1001,8 @@ class HostIntegrationCoreApi { /// test basic asynchronous calling. Future noopAsync() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.noopAsync', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -1001,7 +1024,8 @@ class HostIntegrationCoreApi { /// Returns passed in int asynchronously. Future echoAsyncInt(int arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anInt]) as List?; @@ -1029,7 +1053,8 @@ class HostIntegrationCoreApi { /// Returns passed in double asynchronously. Future echoAsyncDouble(double arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncDouble', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aDouble]) as List?; @@ -1057,7 +1082,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean asynchronously. Future echoAsyncBool(bool arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aBool]) as List?; @@ -1085,7 +1111,8 @@ class HostIntegrationCoreApi { /// Returns the passed string asynchronously. Future echoAsyncString(String arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncString', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aString]) as List?; @@ -1113,7 +1140,8 @@ class HostIntegrationCoreApi { /// Returns the passed in Uint8List asynchronously. Future echoAsyncUint8List(Uint8List arg_aUint8List) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncUint8List', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aUint8List]) as List?; @@ -1141,7 +1169,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object asynchronously. Future echoAsyncObject(Object arg_anObject) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncObject', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anObject]) as List?; @@ -1169,7 +1198,8 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test serialization and deserialization asynchronously. Future> echoAsyncList(List arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aList]) as List?; @@ -1198,7 +1228,8 @@ class HostIntegrationCoreApi { Future> echoAsyncMap( Map arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aMap]) as List?; @@ -1226,7 +1257,8 @@ class HostIntegrationCoreApi { /// Responds with an error from an async function returning a value. Future throwAsyncError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.throwAsyncError', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -1248,7 +1280,7 @@ class HostIntegrationCoreApi { /// Responds with an error from an async void function. Future throwAsyncErrorFromVoid() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; @@ -1271,7 +1303,7 @@ class HostIntegrationCoreApi { /// Responds with a Flutter error from an async function returning a value. Future throwAsyncFlutterError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.throwAsyncFlutterError', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; @@ -1294,7 +1326,8 @@ class HostIntegrationCoreApi { /// Returns the passed object, to test async serialization and deserialization. Future echoAsyncAllTypes(AllTypes arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncAllTypes', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_everything]) as List?; @@ -1323,7 +1356,7 @@ class HostIntegrationCoreApi { Future echoAsyncNullableAllNullableTypes( AllNullableTypes? arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1347,7 +1380,8 @@ class HostIntegrationCoreApi { /// Returns passed in int asynchronously. Future echoAsyncNullableInt(int? arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anInt]) as List?; @@ -1370,7 +1404,7 @@ class HostIntegrationCoreApi { /// Returns passed in double asynchronously. Future echoAsyncNullableDouble(double? arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableDouble', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1394,7 +1428,7 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean asynchronously. Future echoAsyncNullableBool(bool? arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableBool', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1418,7 +1452,7 @@ class HostIntegrationCoreApi { /// Returns the passed string asynchronously. Future echoAsyncNullableString(String? arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1443,7 +1477,7 @@ class HostIntegrationCoreApi { Future echoAsyncNullableUint8List( Uint8List? arg_aUint8List) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1467,7 +1501,7 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object asynchronously. Future echoAsyncNullableObject(Object? arg_anObject) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableObject', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1491,7 +1525,7 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test serialization and deserialization asynchronously. Future?> echoAsyncNullableList(List? arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableList', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1516,7 +1550,8 @@ class HostIntegrationCoreApi { Future?> echoAsyncNullableMap( Map? arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.echoAsyncNullableMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aMap]) as List?; @@ -1538,7 +1573,8 @@ class HostIntegrationCoreApi { Future callFlutterNoop() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterNoop', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -1559,7 +1595,7 @@ class HostIntegrationCoreApi { Future callFlutterThrowError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterThrowError', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; @@ -1581,7 +1617,7 @@ class HostIntegrationCoreApi { Future callFlutterThrowErrorFromVoid() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; @@ -1603,7 +1639,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoAllTypes(AllTypes arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1634,7 +1670,7 @@ class HostIntegrationCoreApi { int? arg_aNullableInt, String? arg_aNullableString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send( @@ -1663,7 +1699,8 @@ class HostIntegrationCoreApi { Future callFlutterEchoBool(bool arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aBool]) as List?; @@ -1690,7 +1727,8 @@ class HostIntegrationCoreApi { Future callFlutterEchoInt(int arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anInt]) as List?; @@ -1717,7 +1755,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoDouble(double arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoDouble', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1745,7 +1783,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoString(String arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1773,7 +1811,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoUint8List(Uint8List arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoUint8List', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1801,7 +1839,8 @@ class HostIntegrationCoreApi { Future> callFlutterEchoList(List arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aList]) as List?; @@ -1829,7 +1868,8 @@ class HostIntegrationCoreApi { Future> callFlutterEchoMap( Map arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aMap]) as List?; @@ -1856,7 +1896,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableBool(bool? arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1879,7 +1919,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableInt(int? arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1902,7 +1942,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableDouble(double? arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1925,7 +1965,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableString(String? arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoNullableString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1949,7 +1989,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableUint8List( Uint8List? arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1973,7 +2013,7 @@ class HostIntegrationCoreApi { Future?> callFlutterEchoNullableList( List? arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoNullableList', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1997,7 +2037,7 @@ class HostIntegrationCoreApi { Future?> callFlutterEchoNullableMap( Map? arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap', + 'dev.flutter.pigeon.flutter_unit_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -2137,7 +2177,8 @@ abstract class FlutterIntegrationCoreApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.noop', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.noop', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); @@ -2151,7 +2192,8 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.throwError', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); @@ -2165,7 +2207,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid', + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.throwErrorFromVoid', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2180,18 +2222,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAllTypes', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAllTypes was null.'); final List args = (message as List?)!; final AllTypes? arg_everything = (args[0] as AllTypes?); assert(arg_everything != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes was null, expected non-null AllTypes.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAllTypes was null, expected non-null AllTypes.'); final AllTypes output = api.echoAllTypes(arg_everything!); return output; }); @@ -2199,7 +2242,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes', + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAllNullableTypes', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2207,12 +2250,12 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAllNullableTypes was null.'); final List args = (message as List?)!; final AllNullableTypes? arg_everything = (args[0] as AllNullableTypes?); assert(arg_everything != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes was null, expected non-null AllNullableTypes.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAllNullableTypes was null, expected non-null AllNullableTypes.'); final AllNullableTypes output = api.echoAllNullableTypes(arg_everything!); return output; @@ -2221,7 +2264,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes', + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2229,7 +2272,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes was null.'); final List args = (message as List?)!; final bool? arg_aNullableBool = (args[0] as bool?); final int? arg_aNullableInt = (args[1] as int?); @@ -2242,18 +2285,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoBool', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoBool was null.'); final List args = (message as List?)!; final bool? arg_aBool = (args[0] as bool?); assert(arg_aBool != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool was null, expected non-null bool.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoBool was null, expected non-null bool.'); final bool output = api.echoBool(arg_aBool!); return output; }); @@ -2261,18 +2305,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoInt', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoInt was null.'); final List args = (message as List?)!; final int? arg_anInt = (args[0] as int?); assert(arg_anInt != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt was null, expected non-null int.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoInt was null, expected non-null int.'); final int output = api.echoInt(arg_anInt!); return output; }); @@ -2280,18 +2325,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoDouble', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoDouble was null.'); final List args = (message as List?)!; final double? arg_aDouble = (args[0] as double?); assert(arg_aDouble != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble was null, expected non-null double.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoDouble was null, expected non-null double.'); final double output = api.echoDouble(arg_aDouble!); return output; }); @@ -2299,18 +2345,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoString', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoString was null.'); final List args = (message as List?)!; final String? arg_aString = (args[0] as String?); assert(arg_aString != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoString was null, expected non-null String.'); final String output = api.echoString(arg_aString!); return output; }); @@ -2318,18 +2365,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoUint8List', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoUint8List was null.'); final List args = (message as List?)!; final Uint8List? arg_aList = (args[0] as Uint8List?); assert(arg_aList != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List was null, expected non-null Uint8List.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoUint8List was null, expected non-null Uint8List.'); final Uint8List output = api.echoUint8List(arg_aList!); return output; }); @@ -2337,19 +2385,20 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoList', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoList was null.'); final List args = (message as List?)!; final List? arg_aList = (args[0] as List?)?.cast(); assert(arg_aList != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList was null, expected non-null List.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoList was null, expected non-null List.'); final List output = api.echoList(arg_aList!); return output; }); @@ -2357,19 +2406,20 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoMap', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoMap was null.'); final List args = (message as List?)!; final Map? arg_aMap = (args[0] as Map?)?.cast(); assert(arg_aMap != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap was null, expected non-null Map.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoMap was null, expected non-null Map.'); final Map output = api.echoMap(arg_aMap!); return output; }); @@ -2377,7 +2427,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool', + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableBool', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2385,7 +2435,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableBool was null.'); final List args = (message as List?)!; final bool? arg_aBool = (args[0] as bool?); final bool? output = api.echoNullableBool(arg_aBool); @@ -2395,14 +2445,15 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableInt', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableInt was null.'); final List args = (message as List?)!; final int? arg_anInt = (args[0] as int?); final int? output = api.echoNullableInt(arg_anInt); @@ -2412,7 +2463,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble', + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableDouble', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2420,7 +2471,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableDouble was null.'); final List args = (message as List?)!; final double? arg_aDouble = (args[0] as double?); final double? output = api.echoNullableDouble(arg_aDouble); @@ -2430,7 +2481,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString', + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableString', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2438,7 +2489,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableString was null.'); final List args = (message as List?)!; final String? arg_aString = (args[0] as String?); final String? output = api.echoNullableString(arg_aString); @@ -2448,7 +2499,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List', + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableUint8List', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2456,7 +2507,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableUint8List was null.'); final List args = (message as List?)!; final Uint8List? arg_aList = (args[0] as Uint8List?); final Uint8List? output = api.echoNullableUint8List(arg_aList); @@ -2466,7 +2517,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList', + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableList', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2474,7 +2525,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableList was null.'); final List args = (message as List?)!; final List? arg_aList = (args[0] as List?)?.cast(); @@ -2485,14 +2536,15 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableMap', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoNullableMap was null.'); final List args = (message as List?)!; final Map? arg_aMap = (args[0] as Map?)?.cast(); @@ -2503,7 +2555,8 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.noopAsync', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); @@ -2517,18 +2570,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAsyncString', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAsyncString was null.'); final List args = (message as List?)!; final String? arg_aString = (args[0] as String?); assert(arg_aString != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterIntegrationCoreApi.echoAsyncString was null, expected non-null String.'); final String output = await api.echoAsyncString(arg_aString!); return output; }); @@ -2550,7 +2604,7 @@ class HostTrivialApi { Future noop() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostTrivialApi.noop', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostTrivialApi.noop', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -2583,7 +2637,7 @@ class HostSmallApi { Future echo(String arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostSmallApi.echo', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostSmallApi.echo', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aString]) as List?; @@ -2610,7 +2664,7 @@ class HostSmallApi { Future voidVoid() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostSmallApi.voidVoid', codec, + 'dev.flutter.pigeon.flutter_unit_tests.HostSmallApi.voidVoid', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -2662,18 +2716,19 @@ abstract class FlutterSmallApi { static void setup(FlutterSmallApi? api, {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterSmallApi.echoWrappedList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.FlutterSmallApi.echoWrappedList', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterSmallApi.echoWrappedList was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterSmallApi.echoWrappedList was null.'); final List args = (message as List?)!; final TestMessage? arg_msg = (args[0] as TestMessage?); assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.FlutterSmallApi.echoWrappedList was null, expected non-null TestMessage.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.FlutterSmallApi.echoWrappedList was null, expected non-null TestMessage.'); final TestMessage output = api.echoWrappedList(arg_msg!); return output; }); diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart index 6464c6566b3..d7dad85b257 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import @@ -150,7 +150,7 @@ class Api { Future search(FlutterSearchRequest arg_request) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.Api.search', codec, + 'dev.flutter.pigeon.flutter_unit_tests.Api.search', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_request]) as List?; @@ -178,7 +178,7 @@ class Api { Future doSearches( FlutterSearchRequests arg_request) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.Api.doSearches', codec, + 'dev.flutter.pigeon.flutter_unit_tests.Api.doSearches', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_request]) as List?; @@ -205,7 +205,7 @@ class Api { Future echo(FlutterSearchRequests arg_requests) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.Api.echo', codec, + 'dev.flutter.pigeon.flutter_unit_tests.Api.echo', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_requests]) as List?; @@ -232,7 +232,7 @@ class Api { Future anInt(int arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.Api.anInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.Api.anInt', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart index e0179a16fef..2b4c1746bae 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import @@ -24,7 +24,8 @@ class MultipleArityHostApi { Future subtract(int arg_x, int arg_y) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MultipleArityHostApi.subtract', codec, + 'dev.flutter.pigeon.flutter_unit_tests.MultipleArityHostApi.subtract', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_x, arg_y]) as List?; @@ -59,21 +60,22 @@ abstract class MultipleArityFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.MultipleArityFlutterApi.subtract', codec, + 'dev.flutter.pigeon.flutter_unit_tests.MultipleArityFlutterApi.subtract', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.MultipleArityFlutterApi.subtract was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.MultipleArityFlutterApi.subtract was null.'); final List args = (message as List?)!; final int? arg_x = (args[0] as int?); assert(arg_x != null, - 'Argument for dev.flutter.pigeon.MultipleArityFlutterApi.subtract was null, expected non-null int.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.MultipleArityFlutterApi.subtract was null, expected non-null int.'); final int? arg_y = (args[1] as int?); assert(arg_y != null, - 'Argument for dev.flutter.pigeon.MultipleArityFlutterApi.subtract was null, expected non-null int.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.MultipleArityFlutterApi.subtract was null, expected non-null int.'); final int output = api.subtract(arg_x!, arg_y!); return output; }); diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart index b5132e9fe1c..8484653e4fa 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import @@ -151,7 +151,8 @@ class NonNullFieldHostApi { Future search( NonNullFieldSearchRequest arg_nested) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NonNullFieldHostApi.search', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NonNullFieldHostApi.search', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_nested]) as List?; @@ -219,19 +220,20 @@ abstract class NonNullFieldFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NonNullFieldFlutterApi.search', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NonNullFieldFlutterApi.search', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.NonNullFieldFlutterApi.search was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.NonNullFieldFlutterApi.search was null.'); final List args = (message as List?)!; final NonNullFieldSearchRequest? arg_request = (args[0] as NonNullFieldSearchRequest?); assert(arg_request != null, - 'Argument for dev.flutter.pigeon.NonNullFieldFlutterApi.search was null, expected non-null NonNullFieldSearchRequest.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.NonNullFieldFlutterApi.search was null, expected non-null NonNullFieldSearchRequest.'); final NonNullFieldSearchReply output = api.search(arg_request!); return output; }); diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart index 4e100e3d43b..a0d790939fb 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import @@ -129,7 +129,7 @@ class NullFieldsHostApi { Future search( NullFieldsSearchRequest arg_nested) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullFieldsHostApi.search', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullFieldsHostApi.search', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_nested]) as List?; @@ -192,19 +192,20 @@ abstract class NullFieldsFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullFieldsFlutterApi.search', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullFieldsFlutterApi.search', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.NullFieldsFlutterApi.search was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.NullFieldsFlutterApi.search was null.'); final List args = (message as List?)!; final NullFieldsSearchRequest? arg_request = (args[0] as NullFieldsSearchRequest?); assert(arg_request != null, - 'Argument for dev.flutter.pigeon.NullFieldsFlutterApi.search was null, expected non-null NullFieldsSearchRequest.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.NullFieldsFlutterApi.search was null, expected non-null NullFieldsSearchRequest.'); final NullFieldsSearchReply output = api.search(arg_request!); return output; }); diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart index aaa8f1d65fa..3f6602a3007 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import @@ -24,7 +24,8 @@ class NullableReturnHostApi { Future doit() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullableReturnHostApi.doit', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullableReturnHostApi.doit', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -53,7 +54,8 @@ abstract class NullableReturnFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullableReturnFlutterApi.doit', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullableReturnFlutterApi.doit', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); @@ -80,7 +82,7 @@ class NullableArgHostApi { Future doit(int? arg_x) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullableArgHostApi.doit', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullableArgHostApi.doit', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_x]) as List?; @@ -115,14 +117,15 @@ abstract class NullableArgFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullableArgFlutterApi.doit', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullableArgFlutterApi.doit', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.NullableArgFlutterApi.doit was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.NullableArgFlutterApi.doit was null.'); final List args = (message as List?)!; final int? arg_x = (args[0] as int?); final int output = api.doit(arg_x); @@ -145,7 +148,8 @@ class NullableCollectionReturnHostApi { Future?> doit() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullableCollectionReturnHostApi.doit', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullableCollectionReturnHostApi.doit', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -174,7 +178,8 @@ abstract class NullableCollectionReturnFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullableCollectionReturnFlutterApi.doit', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullableCollectionReturnFlutterApi.doit', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); @@ -201,7 +206,8 @@ class NullableCollectionArgHostApi { Future> doit(List? arg_x) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullableCollectionArgHostApi.doit', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullableCollectionArgHostApi.doit', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_x]) as List?; @@ -236,14 +242,15 @@ abstract class NullableCollectionArgFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.NullableCollectionArgFlutterApi.doit', codec, + 'dev.flutter.pigeon.flutter_unit_tests.NullableCollectionArgFlutterApi.doit', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.NullableCollectionArgFlutterApi.doit was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.NullableCollectionArgFlutterApi.doit was null.'); final List args = (message as List?)!; final List? arg_x = (args[0] as List?)?.cast(); diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart index cca3f6cbd6d..0a491ff13d2 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.4), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import @@ -24,7 +24,7 @@ class PrimitiveHostApi { Future anInt(int arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.anInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.anInt', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -51,7 +51,7 @@ class PrimitiveHostApi { Future aBool(bool arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.aBool', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aBool', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -78,7 +78,7 @@ class PrimitiveHostApi { Future aString(String arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.aString', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aString', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -105,7 +105,7 @@ class PrimitiveHostApi { Future aDouble(double arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.aDouble', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aDouble', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -132,7 +132,7 @@ class PrimitiveHostApi { Future> aMap(Map arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.aMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aMap', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -159,7 +159,7 @@ class PrimitiveHostApi { Future> aList(List arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.aList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aList', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -186,7 +186,8 @@ class PrimitiveHostApi { Future anInt32List(Int32List arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.anInt32List', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.anInt32List', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -213,7 +214,8 @@ class PrimitiveHostApi { Future> aBoolList(List arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.aBoolList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aBoolList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -240,7 +242,8 @@ class PrimitiveHostApi { Future> aStringIntMap(Map arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveHostApi.aStringIntMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aStringIntMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_value]) as List?; @@ -291,18 +294,19 @@ abstract class PrimitiveFlutterApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.anInt', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.anInt', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.anInt was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.anInt was null.'); final List args = (message as List?)!; final int? arg_value = (args[0] as int?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.anInt was null, expected non-null int.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.anInt was null, expected non-null int.'); final int output = api.anInt(arg_value!); return output; }); @@ -310,18 +314,19 @@ abstract class PrimitiveFlutterApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.aBool', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aBool', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aBool was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aBool was null.'); final List args = (message as List?)!; final bool? arg_value = (args[0] as bool?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aBool was null, expected non-null bool.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aBool was null, expected non-null bool.'); final bool output = api.aBool(arg_value!); return output; }); @@ -329,18 +334,19 @@ abstract class PrimitiveFlutterApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.aString', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aString', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aString was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aString was null.'); final List args = (message as List?)!; final String? arg_value = (args[0] as String?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aString was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aString was null, expected non-null String.'); final String output = api.aString(arg_value!); return output; }); @@ -348,18 +354,19 @@ abstract class PrimitiveFlutterApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.aDouble', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aDouble', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aDouble was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aDouble was null.'); final List args = (message as List?)!; final double? arg_value = (args[0] as double?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aDouble was null, expected non-null double.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aDouble was null, expected non-null double.'); final double output = api.aDouble(arg_value!); return output; }); @@ -367,19 +374,20 @@ abstract class PrimitiveFlutterApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.aMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aMap', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aMap was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aMap was null.'); final List args = (message as List?)!; final Map? arg_value = (args[0] as Map?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aMap was null, expected non-null Map.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aMap was null, expected non-null Map.'); final Map output = api.aMap(arg_value!); return output; }); @@ -387,18 +395,19 @@ abstract class PrimitiveFlutterApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.aList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aList', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aList was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aList was null.'); final List args = (message as List?)!; final List? arg_value = (args[0] as List?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aList was null, expected non-null List.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aList was null, expected non-null List.'); final List output = api.aList(arg_value!); return output; }); @@ -406,18 +415,19 @@ abstract class PrimitiveFlutterApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.anInt32List', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.anInt32List', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.anInt32List was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.anInt32List was null.'); final List args = (message as List?)!; final Int32List? arg_value = (args[0] as Int32List?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.anInt32List was null, expected non-null Int32List.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.anInt32List was null, expected non-null Int32List.'); final Int32List output = api.anInt32List(arg_value!); return output; }); @@ -425,19 +435,20 @@ abstract class PrimitiveFlutterApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.aBoolList', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aBoolList', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aBoolList was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aBoolList was null.'); final List args = (message as List?)!; final List? arg_value = (args[0] as List?)?.cast(); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aBoolList was null, expected non-null List.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aBoolList was null, expected non-null List.'); final List output = api.aBoolList(arg_value!); return output; }); @@ -445,19 +456,20 @@ abstract class PrimitiveFlutterApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.PrimitiveFlutterApi.aStringIntMap', codec, + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aStringIntMap', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aStringIntMap was null.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aStringIntMap was null.'); final List args = (message as List?)!; final Map? arg_value = (args[0] as Map?)?.cast(); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.PrimitiveFlutterApi.aStringIntMap was null, expected non-null Map.'); + 'Argument for dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aStringIntMap was null, expected non-null Map.'); final Map output = api.aStringIntMap(arg_value!); return output; }); diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/multiple_arity_test.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/multiple_arity_test.dart index 8ff2a6b10c6..1c3d535460a 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/multiple_arity_test.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/multiple_arity_test.dart @@ -14,7 +14,8 @@ void main() { test('multiple arity', () async { final BinaryMessenger mockMessenger = MockBinaryMessenger(); when(mockMessenger.send( - 'dev.flutter.pigeon.MultipleArityHostApi.subtract', any)) + 'dev.flutter.pigeon.flutter_unit_tests.MultipleArityHostApi.subtract', + any)) .thenAnswer((Invocation realInvocation) async { final Object input = MultipleArityHostApi.codec .decodeMessage(realInvocation.positionalArguments[1] as ByteData?)!; diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/null_safe_test.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/null_safe_test.dart index fb29452b428..12bbf61f074 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/null_safe_test.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/null_safe_test.dart @@ -52,7 +52,8 @@ void main() { final Completer completer = Completer(); completer.complete(Api.codec.encodeMessage([reply])); final Future sendResult = completer.future; - when(mockMessenger.send('dev.flutter.pigeon.Api.search', any)) + when(mockMessenger.send( + 'dev.flutter.pigeon.flutter_unit_tests.Api.search', any)) .thenAnswer((Invocation realInvocation) => sendResult); final Api api = Api(binaryMessenger: mockMessenger); final FlutterSearchReply readReply = await api.search(request); @@ -67,7 +68,7 @@ void main() { final BinaryMessenger mockMessenger = MockBinaryMessenger(); echoOneArgument( mockMessenger, - 'dev.flutter.pigeon.Api.echo', + 'dev.flutter.pigeon.flutter_unit_tests.Api.echo', Api.codec, ); final Api api = Api(binaryMessenger: mockMessenger); @@ -80,7 +81,7 @@ void main() { final BinaryMessenger mockMessenger = MockBinaryMessenger(); echoOneArgument( mockMessenger, - 'dev.flutter.pigeon.Api.anInt', + 'dev.flutter.pigeon.flutter_unit_tests.Api.anInt', Api.codec, ); final Api api = Api(binaryMessenger: mockMessenger); @@ -90,7 +91,7 @@ void main() { test('return null to nonnull', () async { final BinaryMessenger mockMessenger = MockBinaryMessenger(); - const String channel = 'dev.flutter.pigeon.Api.anInt'; + const String channel = 'dev.flutter.pigeon.flutter_unit_tests.Api.anInt'; when(mockMessenger.send(channel, any)) .thenAnswer((Invocation realInvocation) async { return Api.codec.encodeMessage([null]); @@ -102,7 +103,8 @@ void main() { test('send null parameter', () async { final BinaryMessenger mockMessenger = MockBinaryMessenger(); - const String channel = 'dev.flutter.pigeon.NullableArgHostApi.doit'; + const String channel = + 'dev.flutter.pigeon.flutter_unit_tests.NullableArgHostApi.doit'; when(mockMessenger.send(channel, any)) .thenAnswer((Invocation realInvocation) async { return Api.codec.encodeMessage([123]); @@ -115,7 +117,7 @@ void main() { test('send null collection parameter', () async { final BinaryMessenger mockMessenger = MockBinaryMessenger(); const String channel = - 'dev.flutter.pigeon.NullableCollectionArgHostApi.doit'; + 'dev.flutter.pigeon.flutter_unit_tests.NullableCollectionArgHostApi.doit'; when(mockMessenger.send(channel, any)) .thenAnswer((Invocation realInvocation) async { return Api.codec.encodeMessage([ @@ -136,7 +138,7 @@ void main() { final Completer resultCompleter = Completer(); binding.defaultBinaryMessenger.handlePlatformMessage( - 'dev.flutter.pigeon.NullableArgFlutterApi.doit', + 'dev.flutter.pigeon.flutter_unit_tests.NullableArgFlutterApi.doit', NullableArgFlutterApi.codec.encodeMessage([null]), (ByteData? data) { resultCompleter.complete( @@ -160,7 +162,7 @@ void main() { final Completer> resultCompleter = Completer>(); binding.defaultBinaryMessenger.handlePlatformMessage( - 'dev.flutter.pigeon.NullableCollectionArgFlutterApi.doit', + 'dev.flutter.pigeon.flutter_unit_tests.NullableCollectionArgFlutterApi.doit', NullableCollectionArgFlutterApi.codec.encodeMessage([null]), (ByteData? data) { resultCompleter.complete( @@ -179,7 +181,8 @@ void main() { test('receive null return', () async { final BinaryMessenger mockMessenger = MockBinaryMessenger(); - const String channel = 'dev.flutter.pigeon.NullableReturnHostApi.doit'; + const String channel = + 'dev.flutter.pigeon.flutter_unit_tests.NullableReturnHostApi.doit'; when(mockMessenger.send(channel, any)) .thenAnswer((Invocation realInvocation) async { return NullableReturnHostApi.codec.encodeMessage([null]); @@ -192,7 +195,7 @@ void main() { test('receive null collection return', () async { final BinaryMessenger mockMessenger = MockBinaryMessenger(); const String channel = - 'dev.flutter.pigeon.NullableCollectionReturnHostApi.doit'; + 'dev.flutter.pigeon.flutter_unit_tests.NullableCollectionReturnHostApi.doit'; when(mockMessenger.send(channel, any)) .thenAnswer((Invocation realInvocation) async { return NullableCollectionReturnHostApi.codec @@ -212,7 +215,7 @@ void main() { final Completer resultCompleter = Completer(); unawaited(binding.defaultBinaryMessenger.handlePlatformMessage( - 'dev.flutter.pigeon.NullableReturnFlutterApi.doit', + 'dev.flutter.pigeon.flutter_unit_tests.NullableReturnFlutterApi.doit', NullableReturnFlutterApi.codec.encodeMessage([]), (ByteData? data) { resultCompleter.complete(null); @@ -235,7 +238,7 @@ void main() { final Completer?> resultCompleter = Completer?>(); unawaited(binding.defaultBinaryMessenger.handlePlatformMessage( - 'dev.flutter.pigeon.NullableCollectionReturnFlutterApi.doit', + 'dev.flutter.pigeon.flutter_unit_tests.NullableCollectionReturnFlutterApi.doit', NullableCollectionReturnFlutterApi.codec.encodeMessage([]), (ByteData? data) { resultCompleter.complete(null); diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/primitive_test.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/primitive_test.dart index 175bf53468d..27763e3e263 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/primitive_test.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/primitive_test.dart @@ -17,7 +17,7 @@ void main() { final BinaryMessenger mockMessenger = MockBinaryMessenger(); echoOneArgument( mockMessenger, - 'dev.flutter.pigeon.PrimitiveHostApi.anInt', + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.anInt', PrimitiveHostApi.codec, ); final PrimitiveHostApi api = @@ -30,7 +30,7 @@ void main() { final BinaryMessenger mockMessenger = MockBinaryMessenger(); echoOneArgument( mockMessenger, - 'dev.flutter.pigeon.PrimitiveHostApi.aBoolList', + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aBoolList', PrimitiveHostApi.codec, ); final PrimitiveHostApi api = @@ -44,7 +44,8 @@ void main() { final PrimitiveFlutterApi api = MockPrimitiveFlutterApi(); when(api.aBoolList([true, false])).thenReturn([]); when(mockMessenger.setMessageHandler( - 'dev.flutter.pigeon.PrimitiveFlutterApi.aBoolList', any)) + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveFlutterApi.aBoolList', + any)) .thenAnswer((Invocation realInvocation) { final MessageHandler? handler = realInvocation.positionalArguments[1] as MessageHandler?; @@ -60,7 +61,7 @@ void main() { final BinaryMessenger mockMessenger = MockBinaryMessenger(); echoOneArgument( mockMessenger, - 'dev.flutter.pigeon.PrimitiveHostApi.aStringIntMap', + 'dev.flutter.pigeon.flutter_unit_tests.PrimitiveHostApi.aStringIntMap', PrimitiveHostApi.codec, ); final PrimitiveHostApi api = diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart index d0d8c34060f..6d93313f6f1 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart @@ -309,7 +309,8 @@ class HostIntegrationCoreApi { /// test basic calling. Future noop() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.noop', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -331,7 +332,8 @@ class HostIntegrationCoreApi { /// Returns the passed object, to test serialization and deserialization. Future echoAllTypes(AllTypes arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_everything]) as List?; @@ -359,7 +361,8 @@ class HostIntegrationCoreApi { /// Returns an error, to test error handling. Future throwError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwError', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -381,7 +384,8 @@ class HostIntegrationCoreApi { /// Returns an error from a void function, to test error handling. Future throwErrorFromVoid() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -403,7 +407,8 @@ class HostIntegrationCoreApi { /// Returns a Flutter error, to test error handling. Future throwFlutterError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -425,7 +430,8 @@ class HostIntegrationCoreApi { /// Returns passed in int. Future echoInt(int arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoInt', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anInt]) as List?; @@ -453,7 +459,8 @@ class HostIntegrationCoreApi { /// Returns passed in double. Future echoDouble(double arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aDouble]) as List?; @@ -481,7 +488,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean. Future echoBool(bool arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoBool', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aBool]) as List?; @@ -509,7 +517,8 @@ class HostIntegrationCoreApi { /// Returns the passed in string. Future echoString(String arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoString', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aString]) as List?; @@ -537,7 +546,8 @@ class HostIntegrationCoreApi { /// Returns the passed in Uint8List. Future echoUint8List(Uint8List arg_aUint8List) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aUint8List]) as List?; @@ -565,7 +575,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object. Future echoObject(Object arg_anObject) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoObject', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anObject]) as List?; @@ -593,7 +604,8 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test serialization and deserialization. Future> echoList(List arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoList', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aList]) as List?; @@ -621,7 +633,8 @@ class HostIntegrationCoreApi { /// Returns the passed map, to test serialization and deserialization. Future> echoMap(Map arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoMap', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aMap]) as List?; @@ -650,7 +663,8 @@ class HostIntegrationCoreApi { Future echoClassWrapper( AllClassesWrapper arg_wrapper) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_wrapper]) as List?; @@ -679,7 +693,8 @@ class HostIntegrationCoreApi { Future echoAllNullableTypes( AllNullableTypes? arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_everything]) as List?; @@ -704,7 +719,7 @@ class HostIntegrationCoreApi { Future extractNestedNullableString( AllClassesWrapper arg_wrapper) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -730,7 +745,7 @@ class HostIntegrationCoreApi { Future createNestedNullableString( String? arg_nullableString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -760,7 +775,7 @@ class HostIntegrationCoreApi { Future sendMultipleNullableTypes(bool? arg_aNullableBool, int? arg_aNullableInt, String? arg_aNullableString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send( @@ -790,7 +805,8 @@ class HostIntegrationCoreApi { /// Returns passed in int. Future echoNullableInt(int? arg_aNullableInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableInt]) as List?; @@ -813,7 +829,8 @@ class HostIntegrationCoreApi { /// Returns passed in double. Future echoNullableDouble(double? arg_aNullableDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableDouble]) as List?; @@ -836,7 +853,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean. Future echoNullableBool(bool? arg_aNullableBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableBool]) as List?; @@ -859,7 +877,8 @@ class HostIntegrationCoreApi { /// Returns the passed in string. Future echoNullableString(String? arg_aNullableString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableString]) as List?; @@ -883,7 +902,7 @@ class HostIntegrationCoreApi { Future echoNullableUint8List( Uint8List? arg_aNullableUint8List) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -907,7 +926,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object. Future echoNullableObject(Object? arg_aNullableObject) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableObject]) as List?; @@ -931,7 +951,8 @@ class HostIntegrationCoreApi { Future?> echoNullableList( List? arg_aNullableList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableList]) as List?; @@ -955,7 +976,8 @@ class HostIntegrationCoreApi { Future?> echoNullableMap( Map? arg_aNullableMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aNullableMap]) as List?; @@ -979,7 +1001,8 @@ class HostIntegrationCoreApi { /// test basic asynchronous calling. Future noopAsync() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -1001,7 +1024,8 @@ class HostIntegrationCoreApi { /// Returns passed in int asynchronously. Future echoAsyncInt(int arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anInt]) as List?; @@ -1029,7 +1053,8 @@ class HostIntegrationCoreApi { /// Returns passed in double asynchronously. Future echoAsyncDouble(double arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aDouble]) as List?; @@ -1057,7 +1082,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean asynchronously. Future echoAsyncBool(bool arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aBool]) as List?; @@ -1085,7 +1111,8 @@ class HostIntegrationCoreApi { /// Returns the passed string asynchronously. Future echoAsyncString(String arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aString]) as List?; @@ -1113,7 +1140,8 @@ class HostIntegrationCoreApi { /// Returns the passed in Uint8List asynchronously. Future echoAsyncUint8List(Uint8List arg_aUint8List) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aUint8List]) as List?; @@ -1141,7 +1169,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object asynchronously. Future echoAsyncObject(Object arg_anObject) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anObject]) as List?; @@ -1169,7 +1198,8 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test serialization and deserialization asynchronously. Future> echoAsyncList(List arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aList]) as List?; @@ -1198,7 +1228,8 @@ class HostIntegrationCoreApi { Future> echoAsyncMap( Map arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aMap]) as List?; @@ -1226,7 +1257,8 @@ class HostIntegrationCoreApi { /// Responds with an error from an async function returning a value. Future throwAsyncError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -1248,7 +1280,7 @@ class HostIntegrationCoreApi { /// Responds with an error from an async void function. Future throwAsyncErrorFromVoid() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; @@ -1271,7 +1303,7 @@ class HostIntegrationCoreApi { /// Responds with a Flutter error from an async function returning a value. Future throwAsyncFlutterError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; @@ -1294,7 +1326,8 @@ class HostIntegrationCoreApi { /// Returns the passed object, to test async serialization and deserialization. Future echoAsyncAllTypes(AllTypes arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_everything]) as List?; @@ -1323,7 +1356,7 @@ class HostIntegrationCoreApi { Future echoAsyncNullableAllNullableTypes( AllNullableTypes? arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1347,7 +1380,8 @@ class HostIntegrationCoreApi { /// Returns passed in int asynchronously. Future echoAsyncNullableInt(int? arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anInt]) as List?; @@ -1370,7 +1404,7 @@ class HostIntegrationCoreApi { /// Returns passed in double asynchronously. Future echoAsyncNullableDouble(double? arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1394,7 +1428,7 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean asynchronously. Future echoAsyncNullableBool(bool? arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1418,7 +1452,7 @@ class HostIntegrationCoreApi { /// Returns the passed string asynchronously. Future echoAsyncNullableString(String? arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1443,7 +1477,7 @@ class HostIntegrationCoreApi { Future echoAsyncNullableUint8List( Uint8List? arg_aUint8List) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1467,7 +1501,7 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object asynchronously. Future echoAsyncNullableObject(Object? arg_anObject) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1491,7 +1525,7 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test serialization and deserialization asynchronously. Future?> echoAsyncNullableList(List? arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1516,7 +1550,8 @@ class HostIntegrationCoreApi { Future?> echoAsyncNullableMap( Map? arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aMap]) as List?; @@ -1538,7 +1573,8 @@ class HostIntegrationCoreApi { Future callFlutterNoop() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -1559,7 +1595,7 @@ class HostIntegrationCoreApi { Future callFlutterThrowError() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; @@ -1581,7 +1617,7 @@ class HostIntegrationCoreApi { Future callFlutterThrowErrorFromVoid() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; @@ -1603,7 +1639,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoAllTypes(AllTypes arg_everything) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1634,7 +1670,7 @@ class HostIntegrationCoreApi { int? arg_aNullableInt, String? arg_aNullableString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send( @@ -1663,7 +1699,8 @@ class HostIntegrationCoreApi { Future callFlutterEchoBool(bool arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aBool]) as List?; @@ -1690,7 +1727,8 @@ class HostIntegrationCoreApi { Future callFlutterEchoInt(int arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_anInt]) as List?; @@ -1717,7 +1755,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoDouble(double arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1745,7 +1783,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoString(String arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1773,7 +1811,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoUint8List(Uint8List arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1801,7 +1839,8 @@ class HostIntegrationCoreApi { Future> callFlutterEchoList(List arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aList]) as List?; @@ -1829,7 +1868,8 @@ class HostIntegrationCoreApi { Future> callFlutterEchoMap( Map arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aMap]) as List?; @@ -1856,7 +1896,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableBool(bool? arg_aBool) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1879,7 +1919,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableInt(int? arg_anInt) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1902,7 +1942,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableDouble(double? arg_aDouble) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1925,7 +1965,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableString(String? arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1949,7 +1989,7 @@ class HostIntegrationCoreApi { Future callFlutterEchoNullableUint8List( Uint8List? arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1973,7 +2013,7 @@ class HostIntegrationCoreApi { Future?> callFlutterEchoNullableList( List? arg_aList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -1997,7 +2037,7 @@ class HostIntegrationCoreApi { Future?> callFlutterEchoNullableMap( Map? arg_aMap) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap', + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap', codec, binaryMessenger: _binaryMessenger); final List? replyList = @@ -2137,7 +2177,8 @@ abstract class FlutterIntegrationCoreApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.noop', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); @@ -2151,7 +2192,8 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); @@ -2165,7 +2207,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2180,18 +2222,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes was null.'); final List args = (message as List?)!; final AllTypes? arg_everything = (args[0] as AllTypes?); assert(arg_everything != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes was null, expected non-null AllTypes.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes was null, expected non-null AllTypes.'); final AllTypes output = api.echoAllTypes(arg_everything!); return output; }); @@ -2199,7 +2242,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2207,12 +2250,12 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes was null.'); final List args = (message as List?)!; final AllNullableTypes? arg_everything = (args[0] as AllNullableTypes?); assert(arg_everything != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes was null, expected non-null AllNullableTypes.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes was null, expected non-null AllNullableTypes.'); final AllNullableTypes output = api.echoAllNullableTypes(arg_everything!); return output; @@ -2221,7 +2264,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2229,7 +2272,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes was null.'); final List args = (message as List?)!; final bool? arg_aNullableBool = (args[0] as bool?); final int? arg_aNullableInt = (args[1] as int?); @@ -2242,18 +2285,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool was null.'); final List args = (message as List?)!; final bool? arg_aBool = (args[0] as bool?); assert(arg_aBool != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool was null, expected non-null bool.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool was null, expected non-null bool.'); final bool output = api.echoBool(arg_aBool!); return output; }); @@ -2261,18 +2305,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt was null.'); final List args = (message as List?)!; final int? arg_anInt = (args[0] as int?); assert(arg_anInt != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt was null, expected non-null int.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt was null, expected non-null int.'); final int output = api.echoInt(arg_anInt!); return output; }); @@ -2280,18 +2325,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null.'); final List args = (message as List?)!; final double? arg_aDouble = (args[0] as double?); assert(arg_aDouble != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble was null, expected non-null double.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null, expected non-null double.'); final double output = api.echoDouble(arg_aDouble!); return output; }); @@ -2299,18 +2345,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null.'); final List args = (message as List?)!; final String? arg_aString = (args[0] as String?); assert(arg_aString != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null, expected non-null String.'); final String output = api.echoString(arg_aString!); return output; }); @@ -2318,18 +2365,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null.'); final List args = (message as List?)!; final Uint8List? arg_aList = (args[0] as Uint8List?); assert(arg_aList != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List was null, expected non-null Uint8List.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null, expected non-null Uint8List.'); final Uint8List output = api.echoUint8List(arg_aList!); return output; }); @@ -2337,19 +2385,20 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null.'); final List args = (message as List?)!; final List? arg_aList = (args[0] as List?)?.cast(); assert(arg_aList != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList was null, expected non-null List.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null, expected non-null List.'); final List output = api.echoList(arg_aList!); return output; }); @@ -2357,19 +2406,20 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null.'); final List args = (message as List?)!; final Map? arg_aMap = (args[0] as Map?)?.cast(); assert(arg_aMap != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap was null, expected non-null Map.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null, expected non-null Map.'); final Map output = api.echoMap(arg_aMap!); return output; }); @@ -2377,7 +2427,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2385,7 +2435,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool was null.'); final List args = (message as List?)!; final bool? arg_aBool = (args[0] as bool?); final bool? output = api.echoNullableBool(arg_aBool); @@ -2395,14 +2445,15 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt was null.'); final List args = (message as List?)!; final int? arg_anInt = (args[0] as int?); final int? output = api.echoNullableInt(arg_anInt); @@ -2412,7 +2463,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2420,7 +2471,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble was null.'); final List args = (message as List?)!; final double? arg_aDouble = (args[0] as double?); final double? output = api.echoNullableDouble(arg_aDouble); @@ -2430,7 +2481,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2438,7 +2489,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString was null.'); final List args = (message as List?)!; final String? arg_aString = (args[0] as String?); final String? output = api.echoNullableString(arg_aString); @@ -2448,7 +2499,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2456,7 +2507,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List was null.'); final List args = (message as List?)!; final Uint8List? arg_aList = (args[0] as Uint8List?); final Uint8List? output = api.echoNullableUint8List(arg_aList); @@ -2466,7 +2517,7 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList', codec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2474,7 +2525,7 @@ abstract class FlutterIntegrationCoreApi { } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList was null.'); final List args = (message as List?)!; final List? arg_aList = (args[0] as List?)?.cast(); @@ -2485,14 +2536,15 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap was null.'); final List args = (message as List?)!; final Map? arg_aMap = (args[0] as Map?)?.cast(); @@ -2503,7 +2555,8 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); @@ -2517,18 +2570,19 @@ abstract class FlutterIntegrationCoreApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString was null.'); final List args = (message as List?)!; final String? arg_aString = (args[0] as String?); assert(arg_aString != null, - 'Argument for dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString was null, expected non-null String.'); final String output = await api.echoAsyncString(arg_aString!); return output; }); @@ -2550,7 +2604,8 @@ class HostTrivialApi { Future noop() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostTrivialApi.noop', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -2583,7 +2638,7 @@ class HostSmallApi { Future echo(String arg_aString) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostSmallApi.echo', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_aString]) as List?; @@ -2610,7 +2665,8 @@ class HostSmallApi { Future voidVoid() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.HostSmallApi.voidVoid', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -2662,18 +2718,19 @@ abstract class FlutterSmallApi { static void setup(FlutterSmallApi? api, {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.FlutterSmallApi.echoWrappedList', codec, + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList', + codec, binaryMessenger: binaryMessenger); if (api == null) { channel.setMessageHandler(null); } else { channel.setMessageHandler((Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.FlutterSmallApi.echoWrappedList was null.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList was null.'); final List args = (message as List?)!; final TestMessage? arg_msg = (args[0] as TestMessage?); assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.FlutterSmallApi.echoWrappedList was null, expected non-null TestMessage.'); + 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList was null, expected non-null TestMessage.'); final TestMessage output = api.echoWrappedList(arg_msg!); return output; }); diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt index 34a7cc8a289..cb8aaddb4f8 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt @@ -437,7 +437,7 @@ interface HostIntegrationCoreApi { @Suppress("UNCHECKED_CAST") fun setUp(binaryMessenger: BinaryMessenger, api: HostIntegrationCoreApi?) { run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.noop", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop", codec) if (api != null) { channel.setMessageHandler { _, reply -> var wrapped: List @@ -454,7 +454,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -472,7 +472,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.throwError", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError", codec) if (api != null) { channel.setMessageHandler { _, reply -> var wrapped: List @@ -488,7 +488,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid", codec) if (api != null) { channel.setMessageHandler { _, reply -> var wrapped: List @@ -505,7 +505,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError", codec) if (api != null) { channel.setMessageHandler { _, reply -> var wrapped: List @@ -521,7 +521,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoInt", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -539,7 +539,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -557,7 +557,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoBool", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -575,7 +575,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -593,7 +593,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -611,7 +611,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoObject", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -629,7 +629,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -647,7 +647,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoMap", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -665,7 +665,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -683,7 +683,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -701,7 +701,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -719,7 +719,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -737,7 +737,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -757,7 +757,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -775,7 +775,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -793,7 +793,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -811,7 +811,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -829,7 +829,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -847,7 +847,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -865,7 +865,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -883,7 +883,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -901,7 +901,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync", codec) if (api != null) { channel.setMessageHandler { _, reply -> api.noopAsync() { result: Result -> @@ -918,7 +918,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -938,7 +938,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -958,7 +958,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -978,7 +978,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -998,7 +998,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1018,7 +1018,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1038,7 +1038,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1058,7 +1058,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1078,7 +1078,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError", codec) if (api != null) { channel.setMessageHandler { _, reply -> api.throwAsyncError() { result: Result -> @@ -1096,7 +1096,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid", codec) if (api != null) { channel.setMessageHandler { _, reply -> api.throwAsyncErrorFromVoid() { result: Result -> @@ -1113,7 +1113,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError", codec) if (api != null) { channel.setMessageHandler { _, reply -> api.throwAsyncFlutterError() { result: Result -> @@ -1131,7 +1131,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1151,7 +1151,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1171,7 +1171,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1191,7 +1191,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1211,7 +1211,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1231,7 +1231,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1251,7 +1251,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1271,7 +1271,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1291,7 +1291,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1311,7 +1311,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1331,7 +1331,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop", codec) if (api != null) { channel.setMessageHandler { _, reply -> api.callFlutterNoop() { result: Result -> @@ -1348,7 +1348,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError", codec) if (api != null) { channel.setMessageHandler { _, reply -> api.callFlutterThrowError() { result: Result -> @@ -1366,7 +1366,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", codec) if (api != null) { channel.setMessageHandler { _, reply -> api.callFlutterThrowErrorFromVoid() { result: Result -> @@ -1383,7 +1383,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1403,7 +1403,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1425,7 +1425,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1445,7 +1445,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1465,7 +1465,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1485,7 +1485,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1505,7 +1505,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1525,7 +1525,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1545,7 +1545,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1565,7 +1565,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1585,7 +1585,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1605,7 +1605,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1625,7 +1625,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1645,7 +1645,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1665,7 +1665,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1685,7 +1685,7 @@ interface HostIntegrationCoreApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -1776,14 +1776,14 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { * test basic calling. */ fun noop(callback: () -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.noop", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop", codec) channel.send(null) { callback() } } /** Responds with an error from an async function returning a value. */ fun throwError(callback: (Any?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError", codec) channel.send(null) { val result = it callback(result) @@ -1791,14 +1791,14 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Responds with an error from an async void function. */ fun throwErrorFromVoid(callback: () -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid", codec) channel.send(null) { callback() } } /** Returns the passed object, to test serialization and deserialization. */ fun echoAllTypes(everythingArg: AllTypes, callback: (AllTypes) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes", codec) channel.send(listOf(everythingArg)) { val result = it as AllTypes callback(result) @@ -1806,7 +1806,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed object, to test serialization and deserialization. */ fun echoAllNullableTypes(everythingArg: AllNullableTypes, callback: (AllNullableTypes) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes", codec) channel.send(listOf(everythingArg)) { val result = it as AllNullableTypes callback(result) @@ -1818,7 +1818,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { * Tests multiple-arity FlutterApi handling. */ fun sendMultipleNullableTypes(aNullableBoolArg: Boolean?, aNullableIntArg: Long?, aNullableStringArg: String?, callback: (AllNullableTypes) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes", codec) channel.send(listOf(aNullableBoolArg, aNullableIntArg, aNullableStringArg)) { val result = it as AllNullableTypes callback(result) @@ -1826,7 +1826,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed boolean, to test serialization and deserialization. */ fun echoBool(aBoolArg: Boolean, callback: (Boolean) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool", codec) channel.send(listOf(aBoolArg)) { val result = it as Boolean callback(result) @@ -1834,7 +1834,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed int, to test serialization and deserialization. */ fun echoInt(anIntArg: Long, callback: (Long) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt", codec) channel.send(listOf(anIntArg)) { val result = if (it is Int) it.toLong() else it as Long callback(result) @@ -1842,7 +1842,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed double, to test serialization and deserialization. */ fun echoDouble(aDoubleArg: Double, callback: (Double) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble", codec) channel.send(listOf(aDoubleArg)) { val result = it as Double callback(result) @@ -1850,7 +1850,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed string, to test serialization and deserialization. */ fun echoString(aStringArg: String, callback: (String) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString", codec) channel.send(listOf(aStringArg)) { val result = it as String callback(result) @@ -1858,7 +1858,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed byte list, to test serialization and deserialization. */ fun echoUint8List(aListArg: ByteArray, callback: (ByteArray) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List", codec) channel.send(listOf(aListArg)) { val result = it as ByteArray callback(result) @@ -1866,7 +1866,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed list, to test serialization and deserialization. */ fun echoList(aListArg: List, callback: (List) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList", codec) channel.send(listOf(aListArg)) { val result = it as List callback(result) @@ -1874,7 +1874,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed map, to test serialization and deserialization. */ fun echoMap(aMapArg: Map, callback: (Map) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap", codec) channel.send(listOf(aMapArg)) { val result = it as Map callback(result) @@ -1882,7 +1882,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed boolean, to test serialization and deserialization. */ fun echoNullableBool(aBoolArg: Boolean?, callback: (Boolean?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool", codec) channel.send(listOf(aBoolArg)) { val result = it as Boolean? callback(result) @@ -1890,7 +1890,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed int, to test serialization and deserialization. */ fun echoNullableInt(anIntArg: Long?, callback: (Long?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt", codec) channel.send(listOf(anIntArg)) { val result = if (it is Int) it.toLong() else it as Long? callback(result) @@ -1898,7 +1898,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed double, to test serialization and deserialization. */ fun echoNullableDouble(aDoubleArg: Double?, callback: (Double?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble", codec) channel.send(listOf(aDoubleArg)) { val result = it as Double? callback(result) @@ -1906,7 +1906,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed string, to test serialization and deserialization. */ fun echoNullableString(aStringArg: String?, callback: (String?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString", codec) channel.send(listOf(aStringArg)) { val result = it as String? callback(result) @@ -1914,7 +1914,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed byte list, to test serialization and deserialization. */ fun echoNullableUint8List(aListArg: ByteArray?, callback: (ByteArray?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List", codec) channel.send(listOf(aListArg)) { val result = it as ByteArray? callback(result) @@ -1922,7 +1922,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed list, to test serialization and deserialization. */ fun echoNullableList(aListArg: List?, callback: (List?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList", codec) channel.send(listOf(aListArg)) { val result = it as List? callback(result) @@ -1930,7 +1930,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed map, to test serialization and deserialization. */ fun echoNullableMap(aMapArg: Map?, callback: (Map?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap", codec) channel.send(listOf(aMapArg)) { val result = it as Map? callback(result) @@ -1941,14 +1941,14 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { * test basic asynchronous calling. */ fun noopAsync(callback: () -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync", codec) channel.send(null) { callback() } } /** Returns the passed in generic Object asynchronously. */ fun echoAsyncString(aStringArg: String, callback: (String) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString", codec) channel.send(listOf(aStringArg)) { val result = it as String callback(result) @@ -1972,7 +1972,7 @@ interface HostTrivialApi { @Suppress("UNCHECKED_CAST") fun setUp(binaryMessenger: BinaryMessenger, api: HostTrivialApi?) { run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostTrivialApi.noop", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", codec) if (api != null) { channel.setMessageHandler { _, reply -> var wrapped: List @@ -2009,7 +2009,7 @@ interface HostSmallApi { @Suppress("UNCHECKED_CAST") fun setUp(binaryMessenger: BinaryMessenger, api: HostSmallApi?) { run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostSmallApi.echo", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -2029,7 +2029,7 @@ interface HostSmallApi { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.HostSmallApi.voidVoid", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", codec) if (api != null) { channel.setMessageHandler { _, reply -> api.voidVoid() { result: Result -> @@ -2085,7 +2085,7 @@ class FlutterSmallApi(private val binaryMessenger: BinaryMessenger) { } } fun echoWrappedList(msgArg: TestMessage, callback: (TestMessage) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.FlutterSmallApi.echoWrappedList", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList", codec) channel.send(listOf(msgArg)) { val result = it as TestMessage callback(result) diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AsyncHandlersTest.kt b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AsyncHandlersTest.kt index 97c3bc5d91a..6d18434aa0b 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AsyncHandlersTest.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AsyncHandlersTest.kt @@ -42,7 +42,7 @@ internal class AsyncHandlersTest: TestCase() { verify { binaryMessenger.send( - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString", any(), any() ) @@ -58,10 +58,10 @@ internal class AsyncHandlersTest: TestCase() { val input = "Test" val output = input - val channelName = "dev.flutter.pigeon.HostSmallApi.echo" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo" every { - binaryMessenger.setMessageHandler("dev.flutter.pigeon.HostSmallApi.voidVoid", any()) + binaryMessenger.setMessageHandler("dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", any()) } returns Unit every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit every { api.echo(any(), any()) } answers { @@ -96,11 +96,11 @@ internal class AsyncHandlersTest: TestCase() { val handlerSlot = slot() - val channelName = "dev.flutter.pigeon.HostSmallApi.voidVoid" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid" every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit every { - binaryMessenger.setMessageHandler("dev.flutter.pigeon.HostSmallApi.echo", any()) + binaryMessenger.setMessageHandler("dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", any()) } returns Unit every { api.voidVoid(any()) } answers { val callback = arg<() -> Unit>(0) diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/EnumTest.kt b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/EnumTest.kt index 205f90a10a0..c673303967e 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/EnumTest.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/EnumTest.kt @@ -20,7 +20,7 @@ internal class EnumTest: TestCase() { val binaryMessenger = mockk() val api = mockk() - val channelName = "dev.flutter.pigeon.EnumApi2Host.echo" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Host.echo" val input = DataWithEnum(EnumState.SUCCESS) val handlerSlot = slot() diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/MultipleArityTests.kt b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/MultipleArityTests.kt index 55ff1638a89..76eeaae360d 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/MultipleArityTests.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/MultipleArityTests.kt @@ -22,7 +22,7 @@ class MultipleArityTests: TestCase() { val inputX = 10L val inputY = 5L - val channelName = "dev.flutter.pigeon.MultipleArityHostApi.subtract" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.MultipleArityHostApi.subtract" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/NullableReturnsTest.kt b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/NullableReturnsTest.kt index 14e09af8197..5d83fa24d93 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/NullableReturnsTest.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/NullableReturnsTest.kt @@ -20,7 +20,7 @@ class NullableReturnsTest: TestCase() { val output = 1L - val channelName = "dev.flutter.pigeon.NullableReturnHostApi.doit" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.NullableReturnHostApi.doit" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/PrimitiveTest.kt b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/PrimitiveTest.kt index 4deb3272c49..3ba267f7644 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/PrimitiveTest.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/PrimitiveTest.kt @@ -22,7 +22,7 @@ class PrimitiveTest: TestCase() { val input = 1 - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.anInt" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit @@ -70,7 +70,7 @@ class PrimitiveTest: TestCase() { val input = true - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.aBool" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aBool" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit @@ -118,7 +118,7 @@ class PrimitiveTest: TestCase() { val input = "Hello" - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.aString" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aString" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit @@ -150,7 +150,7 @@ class PrimitiveTest: TestCase() { val input = 1.0 - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.aDouble" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aDouble" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit @@ -198,7 +198,7 @@ class PrimitiveTest: TestCase() { val input = mapOf("a" to 1, "b" to 2) - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.aMap" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aMap" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit @@ -246,7 +246,7 @@ class PrimitiveTest: TestCase() { val input = listOf(1, 2, 3) - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.aList" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aList" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit @@ -294,7 +294,7 @@ class PrimitiveTest: TestCase() { val input = intArrayOf(1, 2, 3) - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.anInt32List" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt32List" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit @@ -342,7 +342,7 @@ class PrimitiveTest: TestCase() { val input = listOf(true, false, true) - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.aBoolList" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aBoolList" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit @@ -390,7 +390,7 @@ class PrimitiveTest: TestCase() { val input = mapOf("a" to 1, "b" to 2) - val channelName = "dev.flutter.pigeon.PrimitiveHostApi.aStringIntMap" + val channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aStringIntMap" val handlerSlot = slot() every { binaryMessenger.setMessageHandler(channelName, capture(handlerSlot)) } returns Unit diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AsyncHandlersTest.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AsyncHandlersTest.swift index ee64c085abe..015c6ab6127 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AsyncHandlersTest.swift +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AsyncHandlersTest.swift @@ -37,7 +37,7 @@ class AsyncHandlersTest: XCTestCase { let binaryMessenger = MockBinaryMessenger(codec: FlutterStandardMessageCodec.sharedInstance()) let mockHostSmallApi = MockHostSmallApi() HostSmallApiSetup.setUp(binaryMessenger: binaryMessenger, api: mockHostSmallApi) - let channelName = "dev.flutter.pigeon.HostSmallApi.voidVoid" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let expectation = XCTestExpectation(description: "voidvoid callback") @@ -55,7 +55,7 @@ class AsyncHandlersTest: XCTestCase { let value = "Test" mockHostSmallApi.output = value HostSmallApiSetup.setUp(binaryMessenger: binaryMessenger, api: mockHostSmallApi) - let channelName = "dev.flutter.pigeon.HostSmallApi.echo" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let inputEncoded = binaryMessenger.codec.encode([value]) diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/EnumTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/EnumTests.swift index 0247f888ae1..55ca025231c 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/EnumTests.swift +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/EnumTests.swift @@ -22,7 +22,7 @@ class EnumTests: XCTestCase { func testEchoHost() throws { let binaryMessenger = MockBinaryMessenger(codec: EnumApi2HostCodec.shared) EnumApi2HostSetup.setUp(binaryMessenger: binaryMessenger, api: MockEnumApi2Host()) - let channelName = "dev.flutter.pigeon.EnumApi2Host.echo" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Host.echo" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let input = DataWithEnum(state: .success) diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/MultipleArityTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/MultipleArityTests.swift index 19badb4014c..eca07303031 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/MultipleArityTests.swift +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/MultipleArityTests.swift @@ -17,7 +17,7 @@ class MultipleArityTests: XCTestCase { func testSimpleHost() throws { let binaryMessenger = MockBinaryMessenger(codec: EnumApi2HostCodec.shared) MultipleArityHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: MockMultipleArityHostApi()) - let channelName = "dev.flutter.pigeon.MultipleArityHostApi.subtract" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.MultipleArityHostApi.subtract" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let inputX = 10 diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/NullableReturnsTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/NullableReturnsTests.swift index 384c9a27ba1..95f04ca8874 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/NullableReturnsTests.swift +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/NullableReturnsTests.swift @@ -35,7 +35,7 @@ class NullableReturnsTests: XCTestCase { func testNullableParameterWithHostApi() { let api = MockNullableArgHostApi() let binaryMessenger = MockBinaryMessenger(codec: codec) - let channel = "dev.flutter.pigeon.NullableArgHostApi.doit" + let channel = "dev.flutter.pigeon.pigeon_integration_tests.NullableArgHostApi.doit" NullableArgHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: api) XCTAssertNotNil(binaryMessenger.handlers[channel]) diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/PrimitiveTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/PrimitiveTests.swift index 451b8d7481a..02d95421813 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/PrimitiveTests.swift +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/PrimitiveTests.swift @@ -24,7 +24,7 @@ class PrimitiveTests: XCTestCase { func testIntPrimitiveHost() throws { let binaryMessenger = MockBinaryMessenger(codec: codec) PrimitiveHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: MockPrimitiveHostApi()) - let channelName = "dev.flutter.pigeon.PrimitiveHostApi.anInt" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let input = 1 @@ -58,7 +58,7 @@ class PrimitiveTests: XCTestCase { func testBoolPrimitiveHost() throws { let binaryMessenger = MockBinaryMessenger(codec: codec) PrimitiveHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: MockPrimitiveHostApi()) - let channelName = "dev.flutter.pigeon.PrimitiveHostApi.aBool" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aBool" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let input = true @@ -92,7 +92,7 @@ class PrimitiveTests: XCTestCase { func testDoublePrimitiveHost() throws { let binaryMessenger = MockBinaryMessenger(codec: codec) PrimitiveHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: MockPrimitiveHostApi()) - let channelName = "dev.flutter.pigeon.PrimitiveHostApi.aDouble" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aDouble" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let input: Double = 1.0 @@ -127,7 +127,7 @@ class PrimitiveTests: XCTestCase { func testStringPrimitiveHost() throws { let binaryMessenger = MockBinaryMessenger(codec: codec) PrimitiveHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: MockPrimitiveHostApi()) - let channelName = "dev.flutter.pigeon.PrimitiveHostApi.aString" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aString" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let input: String = "hello" @@ -162,7 +162,7 @@ class PrimitiveTests: XCTestCase { func testListPrimitiveHost() throws { let binaryMessenger = MockBinaryMessenger<[Int]>(codec: codec) PrimitiveHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: MockPrimitiveHostApi()) - let channelName = "dev.flutter.pigeon.PrimitiveHostApi.aList" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aList" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let input: [Int] = [1, 2, 3] @@ -197,7 +197,7 @@ class PrimitiveTests: XCTestCase { func testMapPrimitiveHost() throws { let binaryMessenger = MockBinaryMessenger<[String: Int]>(codec: codec) PrimitiveHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: MockPrimitiveHostApi()) - let channelName = "dev.flutter.pigeon.PrimitiveHostApi.aMap" + let channelName = "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aMap" XCTAssertNotNil(binaryMessenger.handlers[channelName]) let input: [String: Int] = ["hello": 1, "world": 2] diff --git a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift index 4e59d20b85b..4a70e4a536a 100644 --- a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift +++ b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift @@ -432,7 +432,7 @@ class HostIntegrationCoreApiSetup { static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostIntegrationCoreApi?) { /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. - let noopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.noop", binaryMessenger: binaryMessenger, codec: codec) + let noopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop", binaryMessenger: binaryMessenger, codec: codec) if let api = api { noopChannel.setMessageHandler { _, reply in do { @@ -446,7 +446,7 @@ class HostIntegrationCoreApiSetup { noopChannel.setMessageHandler(nil) } /// Returns the passed object, to test serialization and deserialization. - let echoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec) + let echoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -462,7 +462,7 @@ class HostIntegrationCoreApiSetup { echoAllTypesChannel.setMessageHandler(nil) } /// Returns an error, to test error handling. - let throwErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwError", binaryMessenger: binaryMessenger, codec: codec) + let throwErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwErrorChannel.setMessageHandler { _, reply in do { @@ -476,7 +476,7 @@ class HostIntegrationCoreApiSetup { throwErrorChannel.setMessageHandler(nil) } /// Returns an error from a void function, to test error handling. - let throwErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) + let throwErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwErrorFromVoidChannel.setMessageHandler { _, reply in do { @@ -490,7 +490,7 @@ class HostIntegrationCoreApiSetup { throwErrorFromVoidChannel.setMessageHandler(nil) } /// Returns a Flutter error, to test error handling. - let throwFlutterErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError", binaryMessenger: binaryMessenger, codec: codec) + let throwFlutterErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwFlutterErrorChannel.setMessageHandler { _, reply in do { @@ -504,7 +504,7 @@ class HostIntegrationCoreApiSetup { throwFlutterErrorChannel.setMessageHandler(nil) } /// Returns passed in int. - let echoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec) + let echoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -520,7 +520,7 @@ class HostIntegrationCoreApiSetup { echoIntChannel.setMessageHandler(nil) } /// Returns passed in double. - let echoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec) + let echoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -536,7 +536,7 @@ class HostIntegrationCoreApiSetup { echoDoubleChannel.setMessageHandler(nil) } /// Returns the passed in boolean. - let echoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec) + let echoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -552,7 +552,7 @@ class HostIntegrationCoreApiSetup { echoBoolChannel.setMessageHandler(nil) } /// Returns the passed in string. - let echoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec) + let echoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -568,7 +568,7 @@ class HostIntegrationCoreApiSetup { echoStringChannel.setMessageHandler(nil) } /// Returns the passed in Uint8List. - let echoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec) + let echoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -584,7 +584,7 @@ class HostIntegrationCoreApiSetup { echoUint8ListChannel.setMessageHandler(nil) } /// Returns the passed in generic Object. - let echoObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoObject", binaryMessenger: binaryMessenger, codec: codec) + let echoObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoObjectChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -600,7 +600,7 @@ class HostIntegrationCoreApiSetup { echoObjectChannel.setMessageHandler(nil) } /// Returns the passed list, to test serialization and deserialization. - let echoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec) + let echoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -616,7 +616,7 @@ class HostIntegrationCoreApiSetup { echoListChannel.setMessageHandler(nil) } /// Returns the passed map, to test serialization and deserialization. - let echoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec) + let echoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -632,7 +632,7 @@ class HostIntegrationCoreApiSetup { echoMapChannel.setMessageHandler(nil) } /// Returns the passed map to test nested class serialization and deserialization. - let echoClassWrapperChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper", binaryMessenger: binaryMessenger, codec: codec) + let echoClassWrapperChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoClassWrapperChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -648,7 +648,7 @@ class HostIntegrationCoreApiSetup { echoClassWrapperChannel.setMessageHandler(nil) } /// Returns the passed object, to test serialization and deserialization. - let echoAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let echoAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllNullableTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -665,7 +665,7 @@ class HostIntegrationCoreApiSetup { } /// Returns the inner `aString` value from the wrapped object, to test /// sending of nested objects. - let extractNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString", binaryMessenger: binaryMessenger, codec: codec) + let extractNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { extractNestedNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -682,7 +682,7 @@ class HostIntegrationCoreApiSetup { } /// Returns the inner `aString` value from the wrapped object, to test /// sending of nested objects. - let createNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString", binaryMessenger: binaryMessenger, codec: codec) + let createNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { createNestedNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -698,7 +698,7 @@ class HostIntegrationCoreApiSetup { createNestedNullableStringChannel.setMessageHandler(nil) } /// Returns passed in arguments of multiple types. - let sendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let sendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendMultipleNullableTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -716,7 +716,7 @@ class HostIntegrationCoreApiSetup { sendMultipleNullableTypesChannel.setMessageHandler(nil) } /// Returns passed in int. - let echoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -732,7 +732,7 @@ class HostIntegrationCoreApiSetup { echoNullableIntChannel.setMessageHandler(nil) } /// Returns passed in double. - let echoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -748,7 +748,7 @@ class HostIntegrationCoreApiSetup { echoNullableDoubleChannel.setMessageHandler(nil) } /// Returns the passed in boolean. - let echoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -764,7 +764,7 @@ class HostIntegrationCoreApiSetup { echoNullableBoolChannel.setMessageHandler(nil) } /// Returns the passed in string. - let echoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -780,7 +780,7 @@ class HostIntegrationCoreApiSetup { echoNullableStringChannel.setMessageHandler(nil) } /// Returns the passed in Uint8List. - let echoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -796,7 +796,7 @@ class HostIntegrationCoreApiSetup { echoNullableUint8ListChannel.setMessageHandler(nil) } /// Returns the passed in generic Object. - let echoNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableObjectChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -812,7 +812,7 @@ class HostIntegrationCoreApiSetup { echoNullableObjectChannel.setMessageHandler(nil) } /// Returns the passed list, to test serialization and deserialization. - let echoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -828,7 +828,7 @@ class HostIntegrationCoreApiSetup { echoNullableListChannel.setMessageHandler(nil) } /// Returns the passed map, to test serialization and deserialization. - let echoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -845,7 +845,7 @@ class HostIntegrationCoreApiSetup { } /// A no-op function taking no arguments and returning no value, to sanity /// test basic asynchronous calling. - let noopAsyncChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync", binaryMessenger: binaryMessenger, codec: codec) + let noopAsyncChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync", binaryMessenger: binaryMessenger, codec: codec) if let api = api { noopAsyncChannel.setMessageHandler { _, reply in api.noopAsync() { result in @@ -861,7 +861,7 @@ class HostIntegrationCoreApiSetup { noopAsyncChannel.setMessageHandler(nil) } /// Returns passed in int asynchronously. - let echoAsyncIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -879,7 +879,7 @@ class HostIntegrationCoreApiSetup { echoAsyncIntChannel.setMessageHandler(nil) } /// Returns passed in double asynchronously. - let echoAsyncDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -897,7 +897,7 @@ class HostIntegrationCoreApiSetup { echoAsyncDoubleChannel.setMessageHandler(nil) } /// Returns the passed in boolean asynchronously. - let echoAsyncBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -915,7 +915,7 @@ class HostIntegrationCoreApiSetup { echoAsyncBoolChannel.setMessageHandler(nil) } /// Returns the passed string asynchronously. - let echoAsyncStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -933,7 +933,7 @@ class HostIntegrationCoreApiSetup { echoAsyncStringChannel.setMessageHandler(nil) } /// Returns the passed in Uint8List asynchronously. - let echoAsyncUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -951,7 +951,7 @@ class HostIntegrationCoreApiSetup { echoAsyncUint8ListChannel.setMessageHandler(nil) } /// Returns the passed in generic Object asynchronously. - let echoAsyncObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncObjectChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -969,7 +969,7 @@ class HostIntegrationCoreApiSetup { echoAsyncObjectChannel.setMessageHandler(nil) } /// Returns the passed list, to test serialization and deserialization asynchronously. - let echoAsyncListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -987,7 +987,7 @@ class HostIntegrationCoreApiSetup { echoAsyncListChannel.setMessageHandler(nil) } /// Returns the passed map, to test serialization and deserialization asynchronously. - let echoAsyncMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1005,7 +1005,7 @@ class HostIntegrationCoreApiSetup { echoAsyncMapChannel.setMessageHandler(nil) } /// Responds with an error from an async function returning a value. - let throwAsyncErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError", binaryMessenger: binaryMessenger, codec: codec) + let throwAsyncErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncErrorChannel.setMessageHandler { _, reply in api.throwAsyncError() { result in @@ -1021,7 +1021,7 @@ class HostIntegrationCoreApiSetup { throwAsyncErrorChannel.setMessageHandler(nil) } /// Responds with an error from an async void function. - let throwAsyncErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) + let throwAsyncErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncErrorFromVoidChannel.setMessageHandler { _, reply in api.throwAsyncErrorFromVoid() { result in @@ -1037,7 +1037,7 @@ class HostIntegrationCoreApiSetup { throwAsyncErrorFromVoidChannel.setMessageHandler(nil) } /// Responds with a Flutter error from an async function returning a value. - let throwAsyncFlutterErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError", binaryMessenger: binaryMessenger, codec: codec) + let throwAsyncFlutterErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncFlutterErrorChannel.setMessageHandler { _, reply in api.throwAsyncFlutterError() { result in @@ -1053,7 +1053,7 @@ class HostIntegrationCoreApiSetup { throwAsyncFlutterErrorChannel.setMessageHandler(nil) } /// Returns the passed object, to test async serialization and deserialization. - let echoAsyncAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncAllTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1071,7 +1071,7 @@ class HostIntegrationCoreApiSetup { echoAsyncAllTypesChannel.setMessageHandler(nil) } /// Returns the passed object, to test serialization and deserialization. - let echoAsyncNullableAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableAllNullableTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1089,7 +1089,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableAllNullableTypesChannel.setMessageHandler(nil) } /// Returns passed in int asynchronously. - let echoAsyncNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1107,7 +1107,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableIntChannel.setMessageHandler(nil) } /// Returns passed in double asynchronously. - let echoAsyncNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1125,7 +1125,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableDoubleChannel.setMessageHandler(nil) } /// Returns the passed in boolean asynchronously. - let echoAsyncNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1143,7 +1143,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableBoolChannel.setMessageHandler(nil) } /// Returns the passed string asynchronously. - let echoAsyncNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1161,7 +1161,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableStringChannel.setMessageHandler(nil) } /// Returns the passed in Uint8List asynchronously. - let echoAsyncNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1179,7 +1179,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableUint8ListChannel.setMessageHandler(nil) } /// Returns the passed in generic Object asynchronously. - let echoAsyncNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableObjectChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1197,7 +1197,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableObjectChannel.setMessageHandler(nil) } /// Returns the passed list, to test serialization and deserialization asynchronously. - let echoAsyncNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1215,7 +1215,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableListChannel.setMessageHandler(nil) } /// Returns the passed map, to test serialization and deserialization asynchronously. - let echoAsyncNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1232,7 +1232,7 @@ class HostIntegrationCoreApiSetup { } else { echoAsyncNullableMapChannel.setMessageHandler(nil) } - let callFlutterNoopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterNoopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterNoopChannel.setMessageHandler { _, reply in api.callFlutterNoop() { result in @@ -1247,7 +1247,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterNoopChannel.setMessageHandler(nil) } - let callFlutterThrowErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterThrowErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterThrowErrorChannel.setMessageHandler { _, reply in api.callFlutterThrowError() { result in @@ -1262,7 +1262,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterThrowErrorChannel.setMessageHandler(nil) } - let callFlutterThrowErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterThrowErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterThrowErrorFromVoidChannel.setMessageHandler { _, reply in api.callFlutterThrowErrorFromVoid() { result in @@ -1277,7 +1277,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterThrowErrorFromVoidChannel.setMessageHandler(nil) } - let callFlutterEchoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoAllTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1294,7 +1294,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoAllTypesChannel.setMessageHandler(nil) } - let callFlutterSendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterSendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1313,7 +1313,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterSendMultipleNullableTypesChannel.setMessageHandler(nil) } - let callFlutterEchoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1330,7 +1330,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoBoolChannel.setMessageHandler(nil) } - let callFlutterEchoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1347,7 +1347,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoIntChannel.setMessageHandler(nil) } - let callFlutterEchoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1364,7 +1364,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoDoubleChannel.setMessageHandler(nil) } - let callFlutterEchoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1381,7 +1381,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoStringChannel.setMessageHandler(nil) } - let callFlutterEchoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1398,7 +1398,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoUint8ListChannel.setMessageHandler(nil) } - let callFlutterEchoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1415,7 +1415,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoListChannel.setMessageHandler(nil) } - let callFlutterEchoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1432,7 +1432,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoMapChannel.setMessageHandler(nil) } - let callFlutterEchoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1449,7 +1449,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableBoolChannel.setMessageHandler(nil) } - let callFlutterEchoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1466,7 +1466,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableIntChannel.setMessageHandler(nil) } - let callFlutterEchoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1483,7 +1483,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableDoubleChannel.setMessageHandler(nil) } - let callFlutterEchoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1500,7 +1500,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableStringChannel.setMessageHandler(nil) } - let callFlutterEchoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1517,7 +1517,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableUint8ListChannel.setMessageHandler(nil) } - let callFlutterEchoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1534,7 +1534,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableListChannel.setMessageHandler(nil) } - let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1619,14 +1619,14 @@ class FlutterIntegrationCoreApi { /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. func noop(completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.noop", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { _ in completion() } } /// Responds with an error from an async function returning a value. func throwError(completion: @escaping (Any?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in let result: Any? = response completion(result) @@ -1634,14 +1634,14 @@ class FlutterIntegrationCoreApi { } /// Responds with an error from an async void function. func throwErrorFromVoid(completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { _ in completion() } } /// Returns the passed object, to test serialization and deserialization. func echo(_ everythingArg: AllTypes, completion: @escaping (AllTypes) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in let result = response as! AllTypes completion(result) @@ -1649,7 +1649,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed object, to test serialization and deserialization. func echoNullable(_ everythingArg: AllNullableTypes, completion: @escaping (AllNullableTypes) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in let result = response as! AllNullableTypes completion(result) @@ -1659,7 +1659,7 @@ class FlutterIntegrationCoreApi { /// /// Tests multiple-arity FlutterApi handling. func sendMultipleNullableTypes(aBool aNullableBoolArg: Bool?, anInt aNullableIntArg: Int64?, aString aNullableStringArg: String?, completion: @escaping (AllNullableTypes) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aNullableBoolArg, aNullableIntArg, aNullableStringArg] as [Any?]) { response in let result = response as! AllNullableTypes completion(result) @@ -1667,7 +1667,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed boolean, to test serialization and deserialization. func echo(_ aBoolArg: Bool, completion: @escaping (Bool) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aBoolArg] as [Any?]) { response in let result = response as! Bool completion(result) @@ -1675,7 +1675,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed int, to test serialization and deserialization. func echo(_ anIntArg: Int64, completion: @escaping (Int64) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anIntArg] as [Any?]) { response in let result = response is Int64 ? response as! Int64 : Int64(response as! Int32) completion(result) @@ -1683,7 +1683,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed double, to test serialization and deserialization. func echo(_ aDoubleArg: Double, completion: @escaping (Double) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aDoubleArg] as [Any?]) { response in let result = response as! Double completion(result) @@ -1691,7 +1691,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed string, to test serialization and deserialization. func echo(_ aStringArg: String, completion: @escaping (String) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in let result = response as! String completion(result) @@ -1699,7 +1699,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed byte list, to test serialization and deserialization. func echo(_ aListArg: FlutterStandardTypedData, completion: @escaping (FlutterStandardTypedData) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in let result = response as! FlutterStandardTypedData completion(result) @@ -1707,7 +1707,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed list, to test serialization and deserialization. func echo(_ aListArg: [Any?], completion: @escaping ([Any?]) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in let result = response as! [Any?] completion(result) @@ -1715,7 +1715,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed map, to test serialization and deserialization. func echo(_ aMapArg: [String?: Any?], completion: @escaping ([String?: Any?]) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aMapArg] as [Any?]) { response in let result = response as! [String?: Any?] completion(result) @@ -1723,7 +1723,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed boolean, to test serialization and deserialization. func echoNullable(_ aBoolArg: Bool?, completion: @escaping (Bool?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aBoolArg] as [Any?]) { response in let result: Bool? = nilOrValue(response) completion(result) @@ -1731,7 +1731,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed int, to test serialization and deserialization. func echoNullable(_ anIntArg: Int64?, completion: @escaping (Int64?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anIntArg] as [Any?]) { response in let result: Int64? = response is NSNull ? nil : (response is Int64? ? response as! Int64? : Int64(response as! Int32)) completion(result) @@ -1739,7 +1739,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed double, to test serialization and deserialization. func echoNullable(_ aDoubleArg: Double?, completion: @escaping (Double?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aDoubleArg] as [Any?]) { response in let result: Double? = nilOrValue(response) completion(result) @@ -1747,7 +1747,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed string, to test serialization and deserialization. func echoNullable(_ aStringArg: String?, completion: @escaping (String?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in let result: String? = nilOrValue(response) completion(result) @@ -1755,7 +1755,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed byte list, to test serialization and deserialization. func echoNullable(_ aListArg: FlutterStandardTypedData?, completion: @escaping (FlutterStandardTypedData?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in let result: FlutterStandardTypedData? = nilOrValue(response) completion(result) @@ -1763,7 +1763,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed list, to test serialization and deserialization. func echoNullable(_ aListArg: [Any?]?, completion: @escaping ([Any?]?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in let result: [Any?]? = nilOrValue(response) completion(result) @@ -1771,7 +1771,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed map, to test serialization and deserialization. func echoNullable(_ aMapArg: [String?: Any?]?, completion: @escaping ([String?: Any?]?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aMapArg] as [Any?]) { response in let result: [String?: Any?]? = nilOrValue(response) completion(result) @@ -1780,14 +1780,14 @@ class FlutterIntegrationCoreApi { /// A no-op function taking no arguments and returning no value, to sanity /// test basic asynchronous calling. func noopAsync(completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { _ in completion() } } /// Returns the passed in generic Object asynchronously. func echoAsync(_ aStringArg: String, completion: @escaping (String) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in let result = response as! String completion(result) @@ -1806,7 +1806,7 @@ class HostTrivialApiSetup { /// The codec used by HostTrivialApi. /// Sets up an instance of `HostTrivialApi` to handle messages through the `binaryMessenger`. static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostTrivialApi?) { - let noopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostTrivialApi.noop", binaryMessenger: binaryMessenger) + let noopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", binaryMessenger: binaryMessenger) if let api = api { noopChannel.setMessageHandler { _, reply in do { @@ -1834,7 +1834,7 @@ class HostSmallApiSetup { /// The codec used by HostSmallApi. /// Sets up an instance of `HostSmallApi` to handle messages through the `binaryMessenger`. static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostSmallApi?) { - let echoChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostSmallApi.echo", binaryMessenger: binaryMessenger) + let echoChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", binaryMessenger: binaryMessenger) if let api = api { echoChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1851,7 +1851,7 @@ class HostSmallApiSetup { } else { echoChannel.setMessageHandler(nil) } - let voidVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostSmallApi.voidVoid", binaryMessenger: binaryMessenger) + let voidVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", binaryMessenger: binaryMessenger) if let api = api { voidVoidChannel.setMessageHandler { _, reply in api.voidVoid() { result in @@ -1916,7 +1916,7 @@ class FlutterSmallApi { return FlutterSmallApiCodec.shared } func echo(_ msgArg: TestMessage, completion: @escaping (TestMessage) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterSmallApi.echoWrappedList", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([msgArg] as [Any?]) { response in let result = response as! TestMessage completion(result) diff --git a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift index 4e59d20b85b..4a70e4a536a 100644 --- a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift +++ b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift @@ -432,7 +432,7 @@ class HostIntegrationCoreApiSetup { static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostIntegrationCoreApi?) { /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. - let noopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.noop", binaryMessenger: binaryMessenger, codec: codec) + let noopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop", binaryMessenger: binaryMessenger, codec: codec) if let api = api { noopChannel.setMessageHandler { _, reply in do { @@ -446,7 +446,7 @@ class HostIntegrationCoreApiSetup { noopChannel.setMessageHandler(nil) } /// Returns the passed object, to test serialization and deserialization. - let echoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec) + let echoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -462,7 +462,7 @@ class HostIntegrationCoreApiSetup { echoAllTypesChannel.setMessageHandler(nil) } /// Returns an error, to test error handling. - let throwErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwError", binaryMessenger: binaryMessenger, codec: codec) + let throwErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwErrorChannel.setMessageHandler { _, reply in do { @@ -476,7 +476,7 @@ class HostIntegrationCoreApiSetup { throwErrorChannel.setMessageHandler(nil) } /// Returns an error from a void function, to test error handling. - let throwErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) + let throwErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwErrorFromVoidChannel.setMessageHandler { _, reply in do { @@ -490,7 +490,7 @@ class HostIntegrationCoreApiSetup { throwErrorFromVoidChannel.setMessageHandler(nil) } /// Returns a Flutter error, to test error handling. - let throwFlutterErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError", binaryMessenger: binaryMessenger, codec: codec) + let throwFlutterErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwFlutterErrorChannel.setMessageHandler { _, reply in do { @@ -504,7 +504,7 @@ class HostIntegrationCoreApiSetup { throwFlutterErrorChannel.setMessageHandler(nil) } /// Returns passed in int. - let echoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec) + let echoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -520,7 +520,7 @@ class HostIntegrationCoreApiSetup { echoIntChannel.setMessageHandler(nil) } /// Returns passed in double. - let echoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec) + let echoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -536,7 +536,7 @@ class HostIntegrationCoreApiSetup { echoDoubleChannel.setMessageHandler(nil) } /// Returns the passed in boolean. - let echoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec) + let echoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -552,7 +552,7 @@ class HostIntegrationCoreApiSetup { echoBoolChannel.setMessageHandler(nil) } /// Returns the passed in string. - let echoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec) + let echoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -568,7 +568,7 @@ class HostIntegrationCoreApiSetup { echoStringChannel.setMessageHandler(nil) } /// Returns the passed in Uint8List. - let echoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec) + let echoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -584,7 +584,7 @@ class HostIntegrationCoreApiSetup { echoUint8ListChannel.setMessageHandler(nil) } /// Returns the passed in generic Object. - let echoObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoObject", binaryMessenger: binaryMessenger, codec: codec) + let echoObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoObjectChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -600,7 +600,7 @@ class HostIntegrationCoreApiSetup { echoObjectChannel.setMessageHandler(nil) } /// Returns the passed list, to test serialization and deserialization. - let echoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec) + let echoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -616,7 +616,7 @@ class HostIntegrationCoreApiSetup { echoListChannel.setMessageHandler(nil) } /// Returns the passed map, to test serialization and deserialization. - let echoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec) + let echoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -632,7 +632,7 @@ class HostIntegrationCoreApiSetup { echoMapChannel.setMessageHandler(nil) } /// Returns the passed map to test nested class serialization and deserialization. - let echoClassWrapperChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper", binaryMessenger: binaryMessenger, codec: codec) + let echoClassWrapperChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoClassWrapperChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -648,7 +648,7 @@ class HostIntegrationCoreApiSetup { echoClassWrapperChannel.setMessageHandler(nil) } /// Returns the passed object, to test serialization and deserialization. - let echoAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let echoAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllNullableTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -665,7 +665,7 @@ class HostIntegrationCoreApiSetup { } /// Returns the inner `aString` value from the wrapped object, to test /// sending of nested objects. - let extractNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString", binaryMessenger: binaryMessenger, codec: codec) + let extractNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { extractNestedNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -682,7 +682,7 @@ class HostIntegrationCoreApiSetup { } /// Returns the inner `aString` value from the wrapped object, to test /// sending of nested objects. - let createNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString", binaryMessenger: binaryMessenger, codec: codec) + let createNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { createNestedNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -698,7 +698,7 @@ class HostIntegrationCoreApiSetup { createNestedNullableStringChannel.setMessageHandler(nil) } /// Returns passed in arguments of multiple types. - let sendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let sendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendMultipleNullableTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -716,7 +716,7 @@ class HostIntegrationCoreApiSetup { sendMultipleNullableTypesChannel.setMessageHandler(nil) } /// Returns passed in int. - let echoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -732,7 +732,7 @@ class HostIntegrationCoreApiSetup { echoNullableIntChannel.setMessageHandler(nil) } /// Returns passed in double. - let echoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -748,7 +748,7 @@ class HostIntegrationCoreApiSetup { echoNullableDoubleChannel.setMessageHandler(nil) } /// Returns the passed in boolean. - let echoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -764,7 +764,7 @@ class HostIntegrationCoreApiSetup { echoNullableBoolChannel.setMessageHandler(nil) } /// Returns the passed in string. - let echoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -780,7 +780,7 @@ class HostIntegrationCoreApiSetup { echoNullableStringChannel.setMessageHandler(nil) } /// Returns the passed in Uint8List. - let echoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -796,7 +796,7 @@ class HostIntegrationCoreApiSetup { echoNullableUint8ListChannel.setMessageHandler(nil) } /// Returns the passed in generic Object. - let echoNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableObjectChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -812,7 +812,7 @@ class HostIntegrationCoreApiSetup { echoNullableObjectChannel.setMessageHandler(nil) } /// Returns the passed list, to test serialization and deserialization. - let echoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -828,7 +828,7 @@ class HostIntegrationCoreApiSetup { echoNullableListChannel.setMessageHandler(nil) } /// Returns the passed map, to test serialization and deserialization. - let echoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec) + let echoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -845,7 +845,7 @@ class HostIntegrationCoreApiSetup { } /// A no-op function taking no arguments and returning no value, to sanity /// test basic asynchronous calling. - let noopAsyncChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync", binaryMessenger: binaryMessenger, codec: codec) + let noopAsyncChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync", binaryMessenger: binaryMessenger, codec: codec) if let api = api { noopAsyncChannel.setMessageHandler { _, reply in api.noopAsync() { result in @@ -861,7 +861,7 @@ class HostIntegrationCoreApiSetup { noopAsyncChannel.setMessageHandler(nil) } /// Returns passed in int asynchronously. - let echoAsyncIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -879,7 +879,7 @@ class HostIntegrationCoreApiSetup { echoAsyncIntChannel.setMessageHandler(nil) } /// Returns passed in double asynchronously. - let echoAsyncDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -897,7 +897,7 @@ class HostIntegrationCoreApiSetup { echoAsyncDoubleChannel.setMessageHandler(nil) } /// Returns the passed in boolean asynchronously. - let echoAsyncBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -915,7 +915,7 @@ class HostIntegrationCoreApiSetup { echoAsyncBoolChannel.setMessageHandler(nil) } /// Returns the passed string asynchronously. - let echoAsyncStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -933,7 +933,7 @@ class HostIntegrationCoreApiSetup { echoAsyncStringChannel.setMessageHandler(nil) } /// Returns the passed in Uint8List asynchronously. - let echoAsyncUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -951,7 +951,7 @@ class HostIntegrationCoreApiSetup { echoAsyncUint8ListChannel.setMessageHandler(nil) } /// Returns the passed in generic Object asynchronously. - let echoAsyncObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncObjectChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -969,7 +969,7 @@ class HostIntegrationCoreApiSetup { echoAsyncObjectChannel.setMessageHandler(nil) } /// Returns the passed list, to test serialization and deserialization asynchronously. - let echoAsyncListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -987,7 +987,7 @@ class HostIntegrationCoreApiSetup { echoAsyncListChannel.setMessageHandler(nil) } /// Returns the passed map, to test serialization and deserialization asynchronously. - let echoAsyncMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1005,7 +1005,7 @@ class HostIntegrationCoreApiSetup { echoAsyncMapChannel.setMessageHandler(nil) } /// Responds with an error from an async function returning a value. - let throwAsyncErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError", binaryMessenger: binaryMessenger, codec: codec) + let throwAsyncErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncErrorChannel.setMessageHandler { _, reply in api.throwAsyncError() { result in @@ -1021,7 +1021,7 @@ class HostIntegrationCoreApiSetup { throwAsyncErrorChannel.setMessageHandler(nil) } /// Responds with an error from an async void function. - let throwAsyncErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) + let throwAsyncErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncErrorFromVoidChannel.setMessageHandler { _, reply in api.throwAsyncErrorFromVoid() { result in @@ -1037,7 +1037,7 @@ class HostIntegrationCoreApiSetup { throwAsyncErrorFromVoidChannel.setMessageHandler(nil) } /// Responds with a Flutter error from an async function returning a value. - let throwAsyncFlutterErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError", binaryMessenger: binaryMessenger, codec: codec) + let throwAsyncFlutterErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncFlutterErrorChannel.setMessageHandler { _, reply in api.throwAsyncFlutterError() { result in @@ -1053,7 +1053,7 @@ class HostIntegrationCoreApiSetup { throwAsyncFlutterErrorChannel.setMessageHandler(nil) } /// Returns the passed object, to test async serialization and deserialization. - let echoAsyncAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncAllTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1071,7 +1071,7 @@ class HostIntegrationCoreApiSetup { echoAsyncAllTypesChannel.setMessageHandler(nil) } /// Returns the passed object, to test serialization and deserialization. - let echoAsyncNullableAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableAllNullableTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1089,7 +1089,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableAllNullableTypesChannel.setMessageHandler(nil) } /// Returns passed in int asynchronously. - let echoAsyncNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1107,7 +1107,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableIntChannel.setMessageHandler(nil) } /// Returns passed in double asynchronously. - let echoAsyncNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1125,7 +1125,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableDoubleChannel.setMessageHandler(nil) } /// Returns the passed in boolean asynchronously. - let echoAsyncNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1143,7 +1143,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableBoolChannel.setMessageHandler(nil) } /// Returns the passed string asynchronously. - let echoAsyncNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1161,7 +1161,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableStringChannel.setMessageHandler(nil) } /// Returns the passed in Uint8List asynchronously. - let echoAsyncNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1179,7 +1179,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableUint8ListChannel.setMessageHandler(nil) } /// Returns the passed in generic Object asynchronously. - let echoAsyncNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableObjectChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1197,7 +1197,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableObjectChannel.setMessageHandler(nil) } /// Returns the passed list, to test serialization and deserialization asynchronously. - let echoAsyncNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1215,7 +1215,7 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableListChannel.setMessageHandler(nil) } /// Returns the passed map, to test serialization and deserialization asynchronously. - let echoAsyncNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap", binaryMessenger: binaryMessenger, codec: codec) + let echoAsyncNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1232,7 +1232,7 @@ class HostIntegrationCoreApiSetup { } else { echoAsyncNullableMapChannel.setMessageHandler(nil) } - let callFlutterNoopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterNoopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterNoopChannel.setMessageHandler { _, reply in api.callFlutterNoop() { result in @@ -1247,7 +1247,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterNoopChannel.setMessageHandler(nil) } - let callFlutterThrowErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterThrowErrorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterThrowErrorChannel.setMessageHandler { _, reply in api.callFlutterThrowError() { result in @@ -1262,7 +1262,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterThrowErrorChannel.setMessageHandler(nil) } - let callFlutterThrowErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterThrowErrorFromVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterThrowErrorFromVoidChannel.setMessageHandler { _, reply in api.callFlutterThrowErrorFromVoid() { result in @@ -1277,7 +1277,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterThrowErrorFromVoidChannel.setMessageHandler(nil) } - let callFlutterEchoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoAllTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1294,7 +1294,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoAllTypesChannel.setMessageHandler(nil) } - let callFlutterSendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterSendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1313,7 +1313,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterSendMultipleNullableTypesChannel.setMessageHandler(nil) } - let callFlutterEchoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1330,7 +1330,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoBoolChannel.setMessageHandler(nil) } - let callFlutterEchoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1347,7 +1347,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoIntChannel.setMessageHandler(nil) } - let callFlutterEchoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1364,7 +1364,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoDoubleChannel.setMessageHandler(nil) } - let callFlutterEchoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1381,7 +1381,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoStringChannel.setMessageHandler(nil) } - let callFlutterEchoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1398,7 +1398,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoUint8ListChannel.setMessageHandler(nil) } - let callFlutterEchoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1415,7 +1415,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoListChannel.setMessageHandler(nil) } - let callFlutterEchoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1432,7 +1432,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoMapChannel.setMessageHandler(nil) } - let callFlutterEchoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1449,7 +1449,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableBoolChannel.setMessageHandler(nil) } - let callFlutterEchoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1466,7 +1466,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableIntChannel.setMessageHandler(nil) } - let callFlutterEchoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1483,7 +1483,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableDoubleChannel.setMessageHandler(nil) } - let callFlutterEchoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableStringChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1500,7 +1500,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableStringChannel.setMessageHandler(nil) } - let callFlutterEchoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableUint8ListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1517,7 +1517,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableUint8ListChannel.setMessageHandler(nil) } - let callFlutterEchoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableListChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1534,7 +1534,7 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableListChannel.setMessageHandler(nil) } - let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap", binaryMessenger: binaryMessenger, codec: codec) + let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableMapChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1619,14 +1619,14 @@ class FlutterIntegrationCoreApi { /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. func noop(completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.noop", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { _ in completion() } } /// Responds with an error from an async function returning a value. func throwError(completion: @escaping (Any?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in let result: Any? = response completion(result) @@ -1634,14 +1634,14 @@ class FlutterIntegrationCoreApi { } /// Responds with an error from an async void function. func throwErrorFromVoid(completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { _ in completion() } } /// Returns the passed object, to test serialization and deserialization. func echo(_ everythingArg: AllTypes, completion: @escaping (AllTypes) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in let result = response as! AllTypes completion(result) @@ -1649,7 +1649,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed object, to test serialization and deserialization. func echoNullable(_ everythingArg: AllNullableTypes, completion: @escaping (AllNullableTypes) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in let result = response as! AllNullableTypes completion(result) @@ -1659,7 +1659,7 @@ class FlutterIntegrationCoreApi { /// /// Tests multiple-arity FlutterApi handling. func sendMultipleNullableTypes(aBool aNullableBoolArg: Bool?, anInt aNullableIntArg: Int64?, aString aNullableStringArg: String?, completion: @escaping (AllNullableTypes) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aNullableBoolArg, aNullableIntArg, aNullableStringArg] as [Any?]) { response in let result = response as! AllNullableTypes completion(result) @@ -1667,7 +1667,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed boolean, to test serialization and deserialization. func echo(_ aBoolArg: Bool, completion: @escaping (Bool) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aBoolArg] as [Any?]) { response in let result = response as! Bool completion(result) @@ -1675,7 +1675,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed int, to test serialization and deserialization. func echo(_ anIntArg: Int64, completion: @escaping (Int64) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anIntArg] as [Any?]) { response in let result = response is Int64 ? response as! Int64 : Int64(response as! Int32) completion(result) @@ -1683,7 +1683,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed double, to test serialization and deserialization. func echo(_ aDoubleArg: Double, completion: @escaping (Double) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aDoubleArg] as [Any?]) { response in let result = response as! Double completion(result) @@ -1691,7 +1691,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed string, to test serialization and deserialization. func echo(_ aStringArg: String, completion: @escaping (String) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in let result = response as! String completion(result) @@ -1699,7 +1699,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed byte list, to test serialization and deserialization. func echo(_ aListArg: FlutterStandardTypedData, completion: @escaping (FlutterStandardTypedData) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in let result = response as! FlutterStandardTypedData completion(result) @@ -1707,7 +1707,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed list, to test serialization and deserialization. func echo(_ aListArg: [Any?], completion: @escaping ([Any?]) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in let result = response as! [Any?] completion(result) @@ -1715,7 +1715,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed map, to test serialization and deserialization. func echo(_ aMapArg: [String?: Any?], completion: @escaping ([String?: Any?]) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aMapArg] as [Any?]) { response in let result = response as! [String?: Any?] completion(result) @@ -1723,7 +1723,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed boolean, to test serialization and deserialization. func echoNullable(_ aBoolArg: Bool?, completion: @escaping (Bool?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aBoolArg] as [Any?]) { response in let result: Bool? = nilOrValue(response) completion(result) @@ -1731,7 +1731,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed int, to test serialization and deserialization. func echoNullable(_ anIntArg: Int64?, completion: @escaping (Int64?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anIntArg] as [Any?]) { response in let result: Int64? = response is NSNull ? nil : (response is Int64? ? response as! Int64? : Int64(response as! Int32)) completion(result) @@ -1739,7 +1739,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed double, to test serialization and deserialization. func echoNullable(_ aDoubleArg: Double?, completion: @escaping (Double?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aDoubleArg] as [Any?]) { response in let result: Double? = nilOrValue(response) completion(result) @@ -1747,7 +1747,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed string, to test serialization and deserialization. func echoNullable(_ aStringArg: String?, completion: @escaping (String?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in let result: String? = nilOrValue(response) completion(result) @@ -1755,7 +1755,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed byte list, to test serialization and deserialization. func echoNullable(_ aListArg: FlutterStandardTypedData?, completion: @escaping (FlutterStandardTypedData?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in let result: FlutterStandardTypedData? = nilOrValue(response) completion(result) @@ -1763,7 +1763,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed list, to test serialization and deserialization. func echoNullable(_ aListArg: [Any?]?, completion: @escaping ([Any?]?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in let result: [Any?]? = nilOrValue(response) completion(result) @@ -1771,7 +1771,7 @@ class FlutterIntegrationCoreApi { } /// Returns the passed map, to test serialization and deserialization. func echoNullable(_ aMapArg: [String?: Any?]?, completion: @escaping ([String?: Any?]?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aMapArg] as [Any?]) { response in let result: [String?: Any?]? = nilOrValue(response) completion(result) @@ -1780,14 +1780,14 @@ class FlutterIntegrationCoreApi { /// A no-op function taking no arguments and returning no value, to sanity /// test basic asynchronous calling. func noopAsync(completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { _ in completion() } } /// Returns the passed in generic Object asynchronously. func echoAsync(_ aStringArg: String, completion: @escaping (String) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in let result = response as! String completion(result) @@ -1806,7 +1806,7 @@ class HostTrivialApiSetup { /// The codec used by HostTrivialApi. /// Sets up an instance of `HostTrivialApi` to handle messages through the `binaryMessenger`. static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostTrivialApi?) { - let noopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostTrivialApi.noop", binaryMessenger: binaryMessenger) + let noopChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", binaryMessenger: binaryMessenger) if let api = api { noopChannel.setMessageHandler { _, reply in do { @@ -1834,7 +1834,7 @@ class HostSmallApiSetup { /// The codec used by HostSmallApi. /// Sets up an instance of `HostSmallApi` to handle messages through the `binaryMessenger`. static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostSmallApi?) { - let echoChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostSmallApi.echo", binaryMessenger: binaryMessenger) + let echoChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", binaryMessenger: binaryMessenger) if let api = api { echoChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -1851,7 +1851,7 @@ class HostSmallApiSetup { } else { echoChannel.setMessageHandler(nil) } - let voidVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostSmallApi.voidVoid", binaryMessenger: binaryMessenger) + let voidVoidChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", binaryMessenger: binaryMessenger) if let api = api { voidVoidChannel.setMessageHandler { _, reply in api.voidVoid() { result in @@ -1916,7 +1916,7 @@ class FlutterSmallApi { return FlutterSmallApiCodec.shared } func echo(_ msgArg: TestMessage, completion: @escaping (TestMessage) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterSmallApi.echoWrappedList", binaryMessenger: binaryMessenger, codec: codec) + let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList", binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([msgArg] as [Any?]) { response in let result = response as! TestMessage completion(result) diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp index 4967584f973..469250078d7 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp @@ -737,7 +737,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, HostIntegrationCoreApi* api) { { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostIntegrationCoreApi.noop", + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "noop", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -763,7 +765,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAllTypes", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -797,7 +801,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwError", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "throwError", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -828,7 +834,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "throwErrorFromVoid", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -854,7 +861,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "throwFlutterError", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -886,7 +894,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoInt", + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoInt", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -919,7 +929,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoDouble", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -951,7 +963,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoBool", + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoBool", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -984,7 +998,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoString", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoString", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -1017,7 +1033,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoUint8List", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -1051,7 +1069,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoObject", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoObject", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -1082,7 +1102,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoList", + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoList", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1115,7 +1137,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostIntegrationCoreApi.echoMap", + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoMap", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1149,7 +1173,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoClassWrapper", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoClassWrapper", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1185,7 +1210,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAllNullableTypes", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1224,7 +1250,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "extractNestedNullableString", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1265,7 +1292,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "createNestedNullableString", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1297,7 +1325,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "sendMultipleNullableTypes", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1342,7 +1371,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoNullableInt", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1385,7 +1415,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoNullableDouble", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1422,7 +1453,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoNullableBool", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1459,7 +1491,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoNullableString", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1496,7 +1529,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoNullableUint8List", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1534,7 +1568,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoNullableObject", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1571,7 +1606,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoNullableList", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1608,7 +1644,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoNullableMap", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1644,7 +1681,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostIntegrationCoreApi.noopAsync", + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "noopAsync", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1671,7 +1710,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncInt", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -1705,7 +1746,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncDouble", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1742,7 +1784,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncBool", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -1776,7 +1820,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncString", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1813,7 +1858,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncUint8List", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1851,7 +1897,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncObject", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1887,7 +1934,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncList", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -1923,7 +1972,9 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncMap", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -1959,7 +2010,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "throwAsyncError", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1993,7 +2045,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "throwAsyncErrorFromVoid", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2021,7 +2074,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.throwAsyncFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "throwAsyncFlutterError", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2055,7 +2109,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncAllTypes", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2092,7 +2147,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi." + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." "echoAsyncNullableAllNullableTypes", &GetCodec()); if (api != nullptr) { @@ -2134,7 +2189,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableInt", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2177,7 +2233,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableDouble", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2216,7 +2273,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableBool", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2253,7 +2311,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableString", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2292,7 +2351,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableUint8List", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2332,7 +2392,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableObject", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2370,7 +2431,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableList", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2409,7 +2471,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableMap", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2448,7 +2511,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterNoop", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterNoop", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2476,7 +2540,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterThrowError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterThrowError", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2510,7 +2575,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi." + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." "callFlutterThrowErrorFromVoid", &GetCodec()); if (api != nullptr) { @@ -2539,7 +2604,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoAllTypes", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2576,7 +2642,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi." + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." "callFlutterSendMultipleNullableTypes", &GetCodec()); if (api != nullptr) { @@ -2624,7 +2690,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoBool", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2660,7 +2727,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoInt", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2696,7 +2764,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoDouble", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2733,7 +2802,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoString", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2770,7 +2840,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoUint8List", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2807,7 +2878,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoList", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2844,7 +2916,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoMap", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2881,7 +2954,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoNullableBool", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2918,7 +2992,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoNullableInt", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -2961,7 +3036,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi." + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." "callFlutterEchoNullableDouble", &GetCodec()); if (api != nullptr) { @@ -3001,7 +3076,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi." + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." "callFlutterEchoNullableString", &GetCodec()); if (api != nullptr) { @@ -3041,7 +3116,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi." + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." "callFlutterEchoNullableUint8List", &GetCodec()); if (api != nullptr) { @@ -3082,7 +3157,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoNullableList", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -3121,7 +3197,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterEchoNullableMap", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -3248,7 +3325,9 @@ void FlutterIntegrationCoreApi::Noop( std::function&& on_success, std::function&& on_error) { auto channel = std::make_unique>( - binary_messenger_, "dev.flutter.pigeon.FlutterIntegrationCoreApi.noop", + binary_messenger_, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "noop", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(); channel->Send( @@ -3262,7 +3341,9 @@ void FlutterIntegrationCoreApi::ThrowError( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwError", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "throwError", + &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(); channel->Send( encoded_api_arguments, @@ -3281,7 +3362,8 @@ void FlutterIntegrationCoreApi::ThrowErrorFromVoid( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.throwErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "throwErrorFromVoid", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(); channel->Send( @@ -3296,7 +3378,9 @@ void FlutterIntegrationCoreApi::EchoAllTypes( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllTypes", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoAllTypes", + &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ CustomEncodableValue(everything_arg), }); @@ -3319,7 +3403,8 @@ void FlutterIntegrationCoreApi::EchoAllNullableTypes( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoAllNullableTypes", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ CustomEncodableValue(everything_arg), @@ -3344,7 +3429,8 @@ void FlutterIntegrationCoreApi::SendMultipleNullableTypes( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.sendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "sendMultipleNullableTypes", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_nullable_bool_arg ? EncodableValue(*a_nullable_bool_arg) @@ -3372,7 +3458,9 @@ void FlutterIntegrationCoreApi::EchoBool( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoBool", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoBool", + &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_bool_arg), }); @@ -3392,7 +3480,9 @@ void FlutterIntegrationCoreApi::EchoInt( int64_t an_int_arg, std::function&& on_success, std::function&& on_error) { auto channel = std::make_unique>( - binary_messenger_, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt", + binary_messenger_, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoInt", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(an_int_arg), @@ -3414,7 +3504,9 @@ void FlutterIntegrationCoreApi::EchoDouble( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoDouble", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoDouble", + &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_double_arg), }); @@ -3436,7 +3528,9 @@ void FlutterIntegrationCoreApi::EchoString( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoString", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoString", + &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_string_arg), }); @@ -3459,7 +3553,8 @@ void FlutterIntegrationCoreApi::EchoUint8List( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoUint8List", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_list_arg), @@ -3483,7 +3578,9 @@ void FlutterIntegrationCoreApi::EchoList( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoList", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoList", + &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_list_arg), }); @@ -3505,7 +3602,9 @@ void FlutterIntegrationCoreApi::EchoMap( std::function&& on_success, std::function&& on_error) { auto channel = std::make_unique>( - binary_messenger_, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoMap", + binary_messenger_, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoMap", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_map_arg), @@ -3528,7 +3627,8 @@ void FlutterIntegrationCoreApi::EchoNullableBool( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoNullableBool", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_bool_arg ? EncodableValue(*a_bool_arg) : EncodableValue(), @@ -3550,7 +3650,8 @@ void FlutterIntegrationCoreApi::EchoNullableInt( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoNullableInt", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ an_int_arg ? EncodableValue(*an_int_arg) : EncodableValue(), @@ -3577,7 +3678,8 @@ void FlutterIntegrationCoreApi::EchoNullableDouble( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoNullableDouble", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_double_arg ? EncodableValue(*a_double_arg) : EncodableValue(), @@ -3600,7 +3702,8 @@ void FlutterIntegrationCoreApi::EchoNullableString( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoNullableString", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_string_arg ? EncodableValue(*a_string_arg) : EncodableValue(), @@ -3624,7 +3727,8 @@ void FlutterIntegrationCoreApi::EchoNullableUint8List( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoNullableUint8List", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_list_arg ? EncodableValue(*a_list_arg) : EncodableValue(), @@ -3648,7 +3752,8 @@ void FlutterIntegrationCoreApi::EchoNullableList( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoNullableList", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_list_arg ? EncodableValue(*a_list_arg) : EncodableValue(), @@ -3672,7 +3777,8 @@ void FlutterIntegrationCoreApi::EchoNullableMap( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoNullableMap", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_map_arg ? EncodableValue(*a_map_arg) : EncodableValue(), @@ -3695,7 +3801,9 @@ void FlutterIntegrationCoreApi::NoopAsync( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.noopAsync", &GetCodec()); + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "noopAsync", + &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(); channel->Send( encoded_api_arguments, @@ -3709,7 +3817,8 @@ void FlutterIntegrationCoreApi::EchoAsyncString( std::function&& on_error) { auto channel = std::make_unique>( binary_messenger_, - "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoAsyncString", + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + "echoAsyncString", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_string_arg), @@ -3739,7 +3848,8 @@ void HostTrivialApi::SetUp(flutter::BinaryMessenger* binary_messenger, HostTrivialApi* api) { { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostTrivialApi.noop", + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -3788,7 +3898,9 @@ void HostSmallApi::SetUp(flutter::BinaryMessenger* binary_messenger, HostSmallApi* api) { { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostSmallApi.echo", &GetCodec()); + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -3822,7 +3934,8 @@ void HostSmallApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.HostSmallApi.voidVoid", + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -3904,7 +4017,9 @@ void FlutterSmallApi::EchoWrappedList( std::function&& on_success, std::function&& on_error) { auto channel = std::make_unique>( - binary_messenger_, "dev.flutter.pigeon.FlutterSmallApi.echoWrappedList", + binary_messenger_, + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi." + "echoWrappedList", &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ CustomEncodableValue(msg_arg), diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test/multiple_arity_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/multiple_arity_test.cpp index fc48a81f2f9..f4a89c4060d 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test/multiple_arity_test.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/multiple_arity_test.cpp @@ -35,14 +35,16 @@ TEST(MultipleArity, HostSimple) { MultipleArityHostApi::SetUp(&messenger, &api); int64_t result = 0; - messenger.SendHostMessage("dev.flutter.pigeon.MultipleArityHostApi.subtract", - EncodableValue(EncodableList({ - EncodableValue(30), - EncodableValue(10), - })), - [&result](const EncodableValue& reply) { - result = GetResult(reply).LongValue(); - }); + messenger.SendHostMessage( + "dev.flutter.pigeon.pigeon_integration_tests.MultipleArityHostApi." + "subtract", + EncodableValue(EncodableList({ + EncodableValue(30), + EncodableValue(10), + })), + [&result](const EncodableValue& reply) { + result = GetResult(reply).LongValue(); + }); EXPECT_EQ(result, 20); } diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test/nullable_returns_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/nullable_returns_test.cpp index 821df755ff5..89c0f3175ae 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test/nullable_returns_test.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/nullable_returns_test.cpp @@ -52,11 +52,12 @@ TEST(NullableReturns, HostNullableArgNull) { NullableArgHostApi::SetUp(&messenger, &api); int64_t result = 0; - messenger.SendHostMessage("dev.flutter.pigeon.NullableArgHostApi.doit", - EncodableValue(EncodableList({EncodableValue()})), - [&result](const EncodableValue& reply) { - result = GetResult(reply).LongValue(); - }); + messenger.SendHostMessage( + "dev.flutter.pigeon.pigeon_integration_tests.NullableArgHostApi.doit", + EncodableValue(EncodableList({EncodableValue()})), + [&result](const EncodableValue& reply) { + result = GetResult(reply).LongValue(); + }); EXPECT_EQ(result, 42); } @@ -67,11 +68,12 @@ TEST(NullableReturns, HostNullableArgNonNull) { NullableArgHostApi::SetUp(&messenger, &api); int64_t result = 0; - messenger.SendHostMessage("dev.flutter.pigeon.NullableArgHostApi.doit", - EncodableValue(EncodableList({EncodableValue(7)})), - [&result](const EncodableValue& reply) { - result = GetResult(reply).LongValue(); - }); + messenger.SendHostMessage( + "dev.flutter.pigeon.pigeon_integration_tests.NullableArgHostApi.doit", + EncodableValue(EncodableList({EncodableValue(7)})), + [&result](const EncodableValue& reply) { + result = GetResult(reply).LongValue(); + }); EXPECT_EQ(result, 7); } @@ -85,7 +87,7 @@ TEST(NullableReturns, HostNullableReturnNull) { // rather than just never set. EncodableValue result(true); messenger.SendHostMessage( - "dev.flutter.pigeon.NullableReturnHostApi.doit", + "dev.flutter.pigeon.pigeon_integration_tests.NullableReturnHostApi.doit", EncodableValue(EncodableList({})), [&result](const EncodableValue& reply) { result = GetResult(reply); }); @@ -99,7 +101,7 @@ TEST(NullableReturns, HostNullableReturnNonNull) { EncodableValue result; messenger.SendHostMessage( - "dev.flutter.pigeon.NullableReturnHostApi.doit", + "dev.flutter.pigeon.pigeon_integration_tests.NullableReturnHostApi.doit", EncodableValue(EncodableList({})), [&result](const EncodableValue& reply) { result = GetResult(reply); }); diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test/pigeon_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/pigeon_test.cpp index 5bc2ee4329f..89118efc10d 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test/pigeon_test.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/pigeon_test.cpp @@ -85,12 +85,16 @@ TEST(PigeonTests, CallInitialize) { flutter::BinaryMessageHandler handler; EXPECT_CALL( mock_messenger, - SetMessageHandler("dev.flutter.pigeon.MessageApi.initialize", testing::_)) + SetMessageHandler( + "dev.flutter.pigeon.pigeon_integration_tests.MessageApi.initialize", + testing::_)) .Times(1) .WillOnce(testing::SaveArg<1>(&handler)); EXPECT_CALL( mock_messenger, - SetMessageHandler("dev.flutter.pigeon.MessageApi.search", testing::_)) + SetMessageHandler( + "dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search", + testing::_)) .Times(1); EXPECT_CALL(mock_api, Initialize()); MessageApi::SetUp(&mock_messenger, &mock_api); @@ -109,11 +113,15 @@ TEST(PigeonTests, CallSearch) { flutter::BinaryMessageHandler handler; EXPECT_CALL( mock_messenger, - SetMessageHandler("dev.flutter.pigeon.MessageApi.initialize", testing::_)) + SetMessageHandler( + "dev.flutter.pigeon.pigeon_integration_tests.MessageApi.initialize", + testing::_)) .Times(1); EXPECT_CALL( mock_messenger, - SetMessageHandler("dev.flutter.pigeon.MessageApi.search", testing::_)) + SetMessageHandler( + "dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search", + testing::_)) .Times(1) .WillOnce(testing::SaveArg<1>(&handler)); EXPECT_CALL(mock_api, Search(testing::_)) diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test/primitive_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/primitive_test.cpp index 518c5398be8..4297d69dab0 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test/primitive_test.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/primitive_test.cpp @@ -60,11 +60,12 @@ TEST(Primitive, HostInt) { PrimitiveHostApi::SetUp(&messenger, &api); int64_t result = 0; - messenger.SendHostMessage("dev.flutter.pigeon.PrimitiveHostApi.anInt", - EncodableValue(EncodableList({EncodableValue(7)})), - [&result](const EncodableValue& reply) { - result = GetResult(reply).LongValue(); - }); + messenger.SendHostMessage( + "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt", + EncodableValue(EncodableList({EncodableValue(7)})), + [&result](const EncodableValue& reply) { + result = GetResult(reply).LongValue(); + }); EXPECT_EQ(result, 7); } @@ -76,7 +77,7 @@ TEST(Primitive, HostBool) { bool result = false; messenger.SendHostMessage( - "dev.flutter.pigeon.PrimitiveHostApi.aBool", + "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aBool", EncodableValue(EncodableList({EncodableValue(true)})), [&result](const EncodableValue& reply) { result = std::get(GetResult(reply)); @@ -92,7 +93,7 @@ TEST(Primitive, HostDouble) { double result = 0.0; messenger.SendHostMessage( - "dev.flutter.pigeon.PrimitiveHostApi.aDouble", + "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aDouble", EncodableValue(EncodableList({EncodableValue(3.0)})), [&result](const EncodableValue& reply) { result = std::get(GetResult(reply)); @@ -108,7 +109,7 @@ TEST(Primitive, HostString) { std::string result; messenger.SendHostMessage( - "dev.flutter.pigeon.PrimitiveHostApi.aString", + "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aString", EncodableValue(EncodableList({EncodableValue("hello")})), [&result](const EncodableValue& reply) { result = std::get(GetResult(reply)); @@ -124,7 +125,7 @@ TEST(Primitive, HostList) { EncodableList result; messenger.SendHostMessage( - "dev.flutter.pigeon.PrimitiveHostApi.aList", + "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aList", EncodableValue(EncodableList({EncodableValue(EncodableList({1, 2, 3}))})), [&result](const EncodableValue& reply) { result = std::get(GetResult(reply)); @@ -141,7 +142,7 @@ TEST(Primitive, HostMap) { EncodableMap result; messenger.SendHostMessage( - "dev.flutter.pigeon.PrimitiveHostApi.aMap", + "dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aMap", EncodableValue(EncodableList({EncodableValue(EncodableMap({ {EncodableValue("foo"), EncodableValue("bar")}, }))})), diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index b354fa2d357..a59786e19a7 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apigeon -version: 10.1.3 # This must match the version in lib/generator_tools.dart +version: 10.1.4 # This must match the version in lib/generator_tools.dart environment: sdk: ">=2.19.0 <4.0.0" diff --git a/packages/pigeon/test/cpp_generator_test.dart b/packages/pigeon/test/cpp_generator_test.dart index 8b08072fc06..b12565f7b98 100644 --- a/packages/pigeon/test/cpp_generator_test.dart +++ b/packages/pigeon/test/cpp_generator_test.dart @@ -8,6 +8,8 @@ import 'package:pigeon/generator_tools.dart'; import 'package:pigeon/pigeon.dart' show Error; import 'package:test/test.dart'; +const String DEFAULT_PACKAGE_NAME = 'test_package'; + void main() { test('gen one api', () { final Root root = Root(apis: [ @@ -52,7 +54,8 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate(generatorOptions, root, sink, + packageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); expect(code, contains('class Input')); expect(code, contains('class Output')); @@ -67,7 +70,8 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate(generatorOptions, root, sink, + packageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); expect(code, contains('Input::Input()')); expect(code, contains('Output::Output')); @@ -122,7 +126,8 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate(generatorOptions, root, sink, + packageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); // Method name and argument names should be adjusted. expect(code, contains(' DoSomething(const Input& some_input)')); @@ -143,7 +148,8 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate(generatorOptions, root, sink, + packageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); expect(code, contains('encodable_some_input')); expect(code, contains('Output::output_field()')); @@ -180,6 +186,7 @@ void main() { generatorOptions, root, sink, + packageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); @@ -226,7 +233,8 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate(generatorOptions, root, sink, + packageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); expect( @@ -286,7 +294,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains('){'))); expect(code, isNot(contains('const{'))); @@ -299,7 +312,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains('){'))); expect(code, isNot(contains('const{'))); @@ -331,7 +349,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(''' #include @@ -352,7 +375,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(headerIncludePath: 'a_header.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(''' #include "a_header.h" @@ -394,7 +422,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(namespace: 'foo'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('namespace foo {')); expect(code, contains('} // namespace foo')); @@ -407,7 +440,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(namespace: 'foo'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('namespace foo {')); expect(code, contains('} // namespace foo')); @@ -474,7 +512,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // There should be a default constructor. @@ -521,7 +564,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // There should be a default constructor. @@ -645,7 +693,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // There should not be a default constructor. @@ -683,7 +736,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // There should not be a default constructor. @@ -802,7 +860,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, contains('ErrorOr> ReturnNullableBool()')); @@ -913,7 +976,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('ErrorOr ReturnBool()')); expect(code, contains('ErrorOr ReturnInt()')); @@ -1001,7 +1069,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1022,7 +1095,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // Most types should just use get_if, since the parameter is a pointer, // and get_if will automatically handle null values (since a null @@ -1145,7 +1223,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1166,7 +1249,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // Most types should extract references. Since the type is non-nullable, // there's only one possible type. @@ -1287,7 +1375,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // Nullable arguments should all be pointers. This will make them somewhat // awkward for some uses (literals, values that could be inlined) but @@ -1323,7 +1416,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // All types pass nulls values when the pointer is null. // Standard types are wrapped an EncodableValues. @@ -1435,7 +1533,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1464,7 +1567,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // Standard types are wrapped an EncodableValues. expect(code, contains('EncodableValue(a_bool_arg)')); @@ -1502,7 +1610,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // A bare 'auto' here would create a copy, not a reference, which is // ineffecient. @@ -1618,7 +1731,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(headerIncludePath: 'foo'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); for (final String comment in comments) { expect(code, contains('//$comment')); @@ -1659,7 +1777,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains(' : public flutter::StandardCodecSerializer'))); }); @@ -1707,7 +1830,12 @@ void main() { fileType: FileType.header, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(' : public flutter::StandardCodecSerializer')); }); @@ -1782,7 +1910,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains('reply(wrap'))); expect(code, contains('reply(EncodableValue(')); @@ -1842,7 +1975,12 @@ void main() { fileType: FileType.source, languageOptions: const CppOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // Nothing should be captured by reference for async handlers, since their // lifetime is unknown (and expected to be longer than the stack's). diff --git a/packages/pigeon/test/dart_generator_test.dart b/packages/pigeon/test/dart_generator_test.dart index a164b23b441..7ff9964e9d9 100644 --- a/packages/pigeon/test/dart_generator_test.dart +++ b/packages/pigeon/test/dart_generator_test.dart @@ -10,6 +10,8 @@ import 'package:pigeon/dart_generator.dart'; import 'package:pigeon/generator_tools.dart'; import 'package:test/test.dart'; +const String DEFAULT_PACKAGE_NAME = 'test_package'; + void main() { test('gen one class', () { final Class klass = Class( @@ -30,7 +32,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Foobar')); expect(code, contains(' dataType1? field1;')); @@ -51,7 +58,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum Foobar')); expect(code, contains(' one,')); @@ -95,7 +107,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Api')); expect(code, contains('Future doSomething(Input arg_input)')); @@ -122,7 +139,12 @@ void main() { ], classes: [], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Api')); expect(code, contains('Future add(int arg_x, int arg_y)')); @@ -150,7 +172,12 @@ void main() { ], classes: [], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Api')); expect(code, contains('int add(int x, int y)')); @@ -188,7 +215,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -231,7 +263,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -247,7 +284,7 @@ void main() { ); }); - test('flutterapi', () { + test('flutterApi', () { final Root root = Root(apis: [ Api(name: 'Api', location: ApiLocation.flutter, methods: [ Method( @@ -284,7 +321,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('abstract class Api')); expect(code, contains('static void setup(Api')); @@ -319,7 +361,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Future doSomething')); expect(code, contains('return;')); @@ -353,7 +400,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // The next line verifies that we're not setting a variable to the value of "doSomething", but // ignores the line where we assert the value of the argument isn't null, since on that line @@ -384,7 +436,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('output.*=.*doSomething[(][)]')); expect(code, contains('Output doSomething();')); @@ -427,7 +484,12 @@ void main() { ]); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum1?.index,')); expect(code, contains('? Enum.values[result[0]! as int]')); @@ -455,7 +517,12 @@ void main() { ]); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum Foo {')); expect(code, contains('Future bar(Foo? arg_foo) async')); @@ -499,7 +566,12 @@ void main() { ]); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum1.index,')); expect(code, contains('enum1: Enum.values[result[0]! as int]')); @@ -527,7 +599,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('channel.send[(]null[)]')); }); @@ -586,7 +663,12 @@ void main() { final StringBuffer mainCodeSink = StringBuffer(); final StringBuffer testCodeSink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, mainCodeSink); + generator.generate( + const DartOptions(), + root, + mainCodeSink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String mainCode = mainCodeSink.toString(); expect(mainCode, isNot(contains(r"import 'fo\'o.dart';"))); expect(mainCode, contains('class Api {')); @@ -603,6 +685,7 @@ void main() { ), root, testCodeSink, + packageName: DEFAULT_PACKAGE_NAME, ); final String testCode = testCodeSink.toString(); expect(testCode, contains(r"import 'fo\'o.dart';")); @@ -651,7 +734,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('abstract class Api')); expect(code, contains('Future doSomething(Input arg0);')); @@ -696,7 +784,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(matches('=.s*doSomething'))); expect(code, contains('await api.doSomething(')); @@ -741,7 +834,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Api')); expect(code, matches('Output.*doSomething.*Input')); @@ -770,7 +868,12 @@ void main() { ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('channel.send[(]null[)]')); }); @@ -788,6 +891,7 @@ void main() { DartOptions(copyrightHeader: makeIterable('hello world')), root, sink, + packageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, startsWith('// hello world')); @@ -814,7 +918,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Foobar')); expect(code, contains(' List? field1;')); @@ -842,7 +951,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Foobar')); expect(code, contains(' Map? field1;')); @@ -872,7 +986,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doit(List arg')); }); @@ -901,7 +1020,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doit(List arg')); }); @@ -926,7 +1050,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Future> doit(')); expect(code, @@ -962,7 +1091,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('List doit(')); expect( @@ -990,7 +1124,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Future doit()')); expect(code, contains('return (replyList[0] as int?);')); @@ -1016,7 +1155,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Future?> doit()')); expect(code, @@ -1042,7 +1186,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Future doit()')); expect(code, contains('return (replyList[0] as int?);')); @@ -1066,7 +1215,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('int? doit();')); expect(code, contains('final int? output = api.doit();')); @@ -1091,7 +1245,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Future doit();')); expect(code, contains('final int? output = await api.doit();')); @@ -1115,7 +1274,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1145,7 +1309,12 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Future doit(int? arg_foo) async {')); }); @@ -1172,12 +1341,17 @@ void main() { ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('void doit(int? foo);')); }); - test('deduces package name', () { + test('uses defined package name', () { final Directory tempDir = Directory.systemTemp.createTempSync('pigeon'); try { final Directory foo = Directory(path.join(tempDir.path, 'lib', 'foo')); @@ -1197,9 +1371,10 @@ name: foobar ), root, sink, + packageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); - expect(code, contains("import 'package:foobar/foo/bar.dart';")); + expect(code, contains("import 'package:test_package/foo/bar.dart';")); } finally { tempDir.deleteSync(recursive: true); } @@ -1280,7 +1455,12 @@ name: foobar ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); for (final String comment in comments) { expect(code, contains('///$comment')); @@ -1288,7 +1468,7 @@ name: foobar expect(code, contains('/// ///')); }); - test('doesnt create codecs if no custom datatypes', () { + test("doesn't create codecs if no custom datatypes", () { final Root root = Root( apis: [ Api( @@ -1316,7 +1496,12 @@ name: foobar ); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains('extends StandardMessageCodec'))); expect(code, contains('StandardMessageCodec')); @@ -1360,7 +1545,12 @@ name: foobar ], enums: []); final StringBuffer sink = StringBuffer(); const DartGenerator generator = DartGenerator(); - generator.generate(const DartOptions(), root, sink); + generator.generate( + const DartOptions(), + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('extends StandardMessageCodec')); }); @@ -1407,6 +1597,7 @@ name: foobar ), root, sink, + packageName: DEFAULT_PACKAGE_NAME, ); final String testCode = sink.toString(); diff --git a/packages/pigeon/test/generator_tools_test.dart b/packages/pigeon/test/generator_tools_test.dart index 8c391446a63..0e592ec4daf 100644 --- a/packages/pigeon/test/generator_tools_test.dart +++ b/packages/pigeon/test/generator_tools_test.dart @@ -313,4 +313,10 @@ void main() { .length, 1); }); + + test('deduces package name successfully', () { + final String? packageName = deducePackageName('./pigeons/core_tests.dart'); + + expect(packageName, 'pigeon'); + }); } diff --git a/packages/pigeon/test/java_generator_test.dart b/packages/pigeon/test/java_generator_test.dart index 29bd9581ebb..a0f0e24c439 100644 --- a/packages/pigeon/test/java_generator_test.dart +++ b/packages/pigeon/test/java_generator_test.dart @@ -7,6 +7,8 @@ import 'package:pigeon/java_generator.dart'; import 'package:pigeon/pigeon.dart'; import 'package:test/test.dart'; +const String DEFAULT_PACKAGE_NAME = 'test_package'; + void main() { test('gen one class', () { final Class klass = Class( @@ -28,7 +30,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public class Messages')); expect(code, contains('public static final class Foobar')); @@ -59,7 +66,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public enum Foobar')); expect(code, contains(' ONE(0),')); @@ -91,7 +103,12 @@ void main() { const JavaOptions javaOptions = JavaOptions(className: 'Messages', package: 'com.google.foobar'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('package com.google.foobar;')); expect(code, contains('ArrayList toList()')); @@ -135,7 +152,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public interface Api')); expect(code, matches('Output.*doSomething.*Input')); @@ -207,7 +229,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('private @Nullable Boolean aBool;')); expect(code, contains('private @Nullable Long aInt;')); @@ -257,7 +284,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public static class Api')); expect(code, matches('doSomething.*Input.*Output')); @@ -292,7 +324,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(matches('=.*doSomething'))); expect(code, contains('doSomething(')); @@ -327,7 +364,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Reply')); expect(code, contains('callback.reply(null)')); @@ -356,7 +398,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Output doSomething()')); expect(code, contains('api.doSomething()')); @@ -385,7 +432,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doSomething(@NonNull Reply')); expect(code, contains(RegExp(r'channel.send\(\s*null'))); @@ -405,7 +457,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public static final class Foobar')); expect(code, contains('private @Nullable List field1;')); @@ -425,7 +482,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public static final class Foobar')); expect(code, contains('private @Nullable Map field1;')); @@ -462,7 +524,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public class Messages')); expect(code, contains('public static final class Outer')); @@ -514,7 +581,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public interface Api')); expect(code, contains('public interface Result {')); @@ -566,7 +638,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public static class Api')); expect(code, matches('doSomething.*Input.*Output')); @@ -600,7 +677,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public enum Enum1')); expect(code, contains(' ONE(0),')); @@ -640,7 +722,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('public enum Foo')); expect( @@ -661,7 +748,12 @@ void main() { copyrightHeader: makeIterable('hello world'), ); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, startsWith('// hello world')); }); @@ -688,7 +780,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Foobar')); expect(code, contains('List field1;')); @@ -717,7 +814,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Foobar')); expect(code, contains('Map field1;')); @@ -748,7 +850,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doit(@NonNull List arg')); }); @@ -778,7 +885,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doit(@NonNull List arg')); }); @@ -804,7 +916,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('List doit(')); expect(code, contains('List output =')); @@ -831,7 +948,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doit(@NonNull Reply> callback)')); expect(code, contains('List output =')); @@ -855,7 +977,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doit(@NonNull Reply callback)')); expect( @@ -886,7 +1013,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Messages')); expect(code, contains('Long add(@NonNull Long x, @NonNull Long y)')); @@ -918,7 +1050,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Api'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('Object xArg = args.get(0)')); }); @@ -945,7 +1082,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Messages')); expect(code, contains('BasicMessageChannel channel')); @@ -978,7 +1120,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1005,7 +1152,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(RegExp(r'@Nullable\s*Long doit\(\);'))); }); @@ -1030,7 +1182,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); // Java doesn't accept nullability annotations in type arguments. expect(code, contains('Result')); @@ -1059,7 +1216,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(' void doit(@Nullable Long foo);')); }); @@ -1087,7 +1249,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1119,7 +1286,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1128,7 +1300,7 @@ void main() { expect( code, contains(RegExp( - r'new BasicMessageChannel<>\(\s*binaryMessenger, "dev.flutter.pigeon.Api.doit", getCodec\(\), taskQueue\)'))); + r'new BasicMessageChannel<>\(\s*binaryMessenger, "dev.flutter.pigeon.test_package.Api.doit", getCodec\(\), taskQueue\)'))); }); test('generated annotation', () { @@ -1145,7 +1317,12 @@ void main() { const JavaOptions javaOptions = JavaOptions(className: 'Messages', useGeneratedAnnotation: true); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@javax.annotation.Generated("dev.flutter.pigeon")')); }); @@ -1163,7 +1340,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains('@javax.annotation.Generated("dev.flutter.pigeon")'))); @@ -1246,7 +1428,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); for (final String comment in comments) { // This regex finds the comment only between the open and close comment block @@ -1258,7 +1445,7 @@ void main() { expect(code, isNot(contains('*//'))); }); - test('doesnt create codecs if no custom datatypes', () { + test("doesn't create codecs if no custom datatypes", () { final Root root = Root( apis: [ Api( @@ -1287,7 +1474,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains(' extends StandardMessageCodec'))); expect(code, contains('StandardMessageCodec')); @@ -1332,7 +1524,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(' extends StandardMessageCodec')); }); @@ -1348,7 +1545,12 @@ void main() { final StringBuffer sink = StringBuffer(); const JavaOptions javaOptions = JavaOptions(className: 'Messages'); const JavaGenerator generator = JavaGenerator(); - generator.generate(javaOptions, root, sink); + generator.generate( + javaOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class FlutterError')); expect(code, contains('if (exception instanceof FlutterError)')); diff --git a/packages/pigeon/test/kotlin_generator_test.dart b/packages/pigeon/test/kotlin_generator_test.dart index 5acb4c64e91..e3bf5a13cda 100644 --- a/packages/pigeon/test/kotlin_generator_test.dart +++ b/packages/pigeon/test/kotlin_generator_test.dart @@ -6,6 +6,8 @@ import 'package:pigeon/ast.dart'; import 'package:pigeon/kotlin_generator.dart'; import 'package:test/test.dart'; +const String DEFAULT_PACKAGE_NAME = 'test_package'; + void main() { test('gen one class', () { final Class klass = Class( @@ -28,7 +30,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('data class Foobar (')); expect(code, contains('val field1: Long? = null')); @@ -52,7 +59,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum class Foobar(val raw: Int) {')); expect(code, contains('ONE(0)')); @@ -96,7 +108,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum class Foo(val raw: Int) {')); expect(code, contains('data class Bar (')); @@ -130,7 +147,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum class Foo(val raw: Int) {')); expect(code, contains('val fooArg = Foo.ofRaw(args[0] as Int)')); @@ -177,7 +199,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('interface Api')); expect(code, contains('fun doSomething(input: Input): Output')); @@ -323,7 +350,12 @@ void main() { const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('val aBool: Boolean')); expect(code, contains('val aInt: Long')); @@ -392,7 +424,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Api(private val binaryMessenger: BinaryMessenger)')); @@ -430,7 +467,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(matches('.*doSomething(.*) ->'))); expect(code, matches('doSomething(.*)')); @@ -467,7 +509,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('callback: () -> Unit')); expect(code, contains('callback()')); @@ -497,7 +544,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doSomething(): Output')); expect(code, contains('wrapped = listOf(api.doSomething())')); @@ -529,7 +581,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doSomething(callback: (Output) -> Unit)')); expect(code, contains('channel.send(null)')); @@ -550,7 +607,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('data class Foobar')); expect(code, contains('val field1: List? = null')); @@ -571,7 +633,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('data class Foobar')); expect(code, contains('val field1: Map? = null')); @@ -610,7 +677,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('data class Outer')); expect(code, contains('data class Nested')); @@ -664,7 +736,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('interface Api')); expect(code, contains('api.doSomething(argArg) {')); @@ -713,7 +790,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Api')); expect(code, matches('fun doSomething.*Input.*callback.*Output.*Unit')); @@ -747,7 +829,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum class Enum1(val raw: Int)')); expect(code, contains('ONE(0)')); @@ -765,7 +852,12 @@ void main() { copyrightHeader: makeIterable('hello world'), ); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, startsWith('// hello world')); }); @@ -793,7 +885,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('data class Foobar')); expect(code, contains('val field1: List')); @@ -823,7 +920,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('data class Foobar')); expect(code, contains('val field1: Map')); @@ -855,7 +957,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doit(arg: List')); }); @@ -886,7 +993,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doit(argArg: List')); }); @@ -912,7 +1024,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doit(): List')); expect(code, contains('wrapped = listOf(api.doit())')); @@ -940,7 +1057,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doit(callback: (List) -> Unit')); expect(code, contains('val result = it as List')); @@ -969,7 +1091,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun add(x: Long, y: Long): Long')); expect(code, contains('val args = message as List')); @@ -1007,7 +1134,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('val channel = BasicMessageChannel')); expect(code, @@ -1037,7 +1169,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doit(): Long?')); }); @@ -1062,7 +1199,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doit(callback: (Result) -> Unit')); }); @@ -1090,7 +1232,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1121,7 +1268,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('fun doit(fooArg: Long?, callback: () -> Unit')); }); @@ -1157,7 +1309,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('val input: String\n')); }); @@ -1239,7 +1396,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); for (final String comment in comments) { // This regex finds the comment only between the open and close comment block @@ -1251,7 +1413,7 @@ void main() { expect(code, isNot(contains('*//'))); }); - test('doesnt create codecs if no custom datatypes', () { + test("doesn't create codecs if no custom datatypes", () { final Root root = Root( apis: [ Api( @@ -1280,7 +1442,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains(' : StandardMessageCodec() '))); expect(code, contains('StandardMessageCodec')); @@ -1325,7 +1492,12 @@ void main() { final StringBuffer sink = StringBuffer(); const KotlinOptions kotlinOptions = KotlinOptions(); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(' : StandardMessageCodec() ')); }); @@ -1346,7 +1518,12 @@ void main() { const KotlinOptions kotlinOptions = KotlinOptions(errorClassName: 'SomeError'); const KotlinGenerator generator = KotlinGenerator(); - generator.generate(kotlinOptions, root, sink); + generator.generate( + kotlinOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class SomeError')); expect(code, contains('if (exception is SomeError)')); diff --git a/packages/pigeon/test/objc_generator_test.dart b/packages/pigeon/test/objc_generator_test.dart index 539a53e1e25..b852066f25f 100644 --- a/packages/pigeon/test/objc_generator_test.dart +++ b/packages/pigeon/test/objc_generator_test.dart @@ -8,6 +8,8 @@ import 'package:pigeon/objc_generator.dart'; import 'package:pigeon/pigeon_lib.dart'; import 'package:test/test.dart'; +const String DEFAULT_PACKAGE_NAME = 'test_package'; + void main() { test('gen one class header', () { final Root root = Root(apis: [], classes: [ @@ -24,7 +26,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); expect(code, matches('@property.*NSString.*field1')); @@ -45,7 +52,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('#import "foo.h"')); expect(code, contains('@implementation Foobar')); @@ -68,7 +80,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('typedef NS_ENUM(NSUInteger, Enum1) {')); expect(code, contains(' Enum1One = 0,')); @@ -92,7 +109,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(prefix: 'PREFIX'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('typedef NS_ENUM(NSUInteger, PREFIXEnum1) {')); expect(code, contains(' PREFIXEnum1One = 0,')); @@ -134,7 +156,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('#import "foo.h"')); expect(code, contains('@implementation Foobar')); @@ -173,7 +200,12 @@ void main() { fileType: FileType.header, languageOptions: options, ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('typedef NS_ENUM(NSUInteger, ACFoo)')); expect(code, contains(':(ACFoo)foo error:')); @@ -185,7 +217,12 @@ void main() { fileType: FileType.source, languageOptions: options, ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -254,7 +291,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@property(nonatomic, assign) Enum1 enum1')); }); @@ -292,7 +334,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface Input')); expect(code, contains('@interface Output')); @@ -338,7 +385,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('#import "foo.h"')); expect(code, contains('@implementation Input')); @@ -392,7 +444,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); expect(code, contains('@class FlutterStandardTypedData;')); @@ -426,7 +483,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@implementation Foobar')); expect(code, @@ -453,7 +515,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@property(nonatomic, strong, nullable) Input * nested;')); @@ -479,7 +546,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -504,7 +576,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface ABCFoobar')); }); @@ -524,7 +601,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@implementation ABCFoobar')); }); @@ -564,7 +646,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('property.*ABCInput')); expect(code, matches('ABCNested.*doSomething.*ABCInput')); @@ -606,7 +693,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('ABCInput fromList')); expect(code, matches(r'ABCInput.*=.*args.*0.*\;')); @@ -648,7 +740,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface Api : NSObject')); expect( @@ -694,7 +791,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(headerIncludePath: 'foo.h'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@implementation Api')); expect(code, matches('void.*doSomething.*Input.*Output.*{')); @@ -731,7 +833,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('(void)doSomething:')); }); @@ -766,7 +873,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(matches('=.*doSomething'))); expect(code, matches('[.*doSomething:.*]')); @@ -803,7 +915,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('completion:(void (^)(FlutterError *_Nullable))')); }); @@ -838,7 +955,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('completion:(void (^)(FlutterError *_Nullable))')); expect(code, contains('completion(nil)')); @@ -868,7 +990,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('ABCOutput.*doSomethingWithError:[(]FlutterError')); }); @@ -897,7 +1024,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('output.*=.*api doSomethingWithError:&error')); }); @@ -926,7 +1058,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -958,7 +1095,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -982,7 +1124,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); expect(code, matches('@property.*NSArray.*field1')); @@ -1003,7 +1150,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); expect(code, matches('@property.*NSDictionary.*field1')); @@ -1030,7 +1182,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); expect( @@ -1065,7 +1222,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('(NSDictionary *)foo')); }); @@ -1106,7 +1268,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1151,7 +1318,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1184,7 +1356,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1210,7 +1387,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1255,7 +1437,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1299,7 +1486,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1325,7 +1517,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1358,7 +1555,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1382,7 +1584,12 @@ void main() { prefix: 'ABC', copyrightHeader: makeIterable('hello world')), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, startsWith('// hello world')); }); @@ -1399,7 +1606,12 @@ void main() { prefix: 'ABC', copyrightHeader: makeIterable('hello world')), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, startsWith('// hello world')); }); @@ -1431,7 +1643,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('NSArray * field1')); }); @@ -1467,7 +1684,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doitArg:(NSArray *)arg')); } @@ -1480,7 +1702,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1520,7 +1747,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doitArg:(NSArray *)arg')); } @@ -1533,7 +1765,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doitArg:(NSArray *)arg')); } @@ -1576,7 +1813,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doitArg:(NSArray *> *)arg')); } @@ -1609,7 +1851,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, contains('- (nullable NSArray *)doitWithError:')); @@ -1623,7 +1870,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('NSArray *output =')); } @@ -1656,7 +1908,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, contains('doitWithCompletion:(void (^)(NSArray *')); @@ -1670,7 +1927,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, contains('doitWithCompletion:(void (^)(NSArray *')); @@ -1705,7 +1967,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1721,7 +1988,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('NSArray *args = message;')); expect(code, @@ -1762,7 +2034,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1778,7 +2055,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('NSArray *args = message;')); expect(code, @@ -1817,7 +2099,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1833,7 +2120,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -1883,7 +2175,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, divideRoot, sink); + generator.generate( + generatorOptions, + divideRoot, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('divideValue:.*by:.*error.*;')); } @@ -1896,7 +2193,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, divideRoot, sink); + generator.generate( + generatorOptions, + divideRoot, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('divideValue:.*by:.*error.*;')); } @@ -1913,7 +2215,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, divideRoot, sink); + generator.generate( + generatorOptions, + divideRoot, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('divideValue:.*by:.*completion.*;')); } @@ -1926,7 +2233,12 @@ void main() { languageOptions: const ObjcOptions(headerIncludePath: 'foo.h', prefix: 'ABC'), ); - generator.generate(generatorOptions, divideRoot, sink); + generator.generate( + generatorOptions, + divideRoot, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches('divideValue:.*by:.*completion.*{')); } @@ -1947,7 +2259,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); expect(code, contains('@property(nonatomic, copy) NSString * field1')); @@ -1976,7 +2293,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -2007,7 +2329,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches(r'doitWithCompletion.*NSNumber \*_Nullable')); }); @@ -2035,7 +2362,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, matches(r'nullable NSNumber.*doitWithError')); }); @@ -2068,7 +2400,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doitFoo:(nullable NSNumber *)foo')); } @@ -2080,7 +2417,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('NSNumber *arg_foo = GetNullableObjectAtIndex(args, 0);')); @@ -2115,7 +2457,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('doitFoo:(nullable NSNumber *)foo')); } @@ -2127,7 +2474,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('- (void)doitFoo:(nullable NSNumber *)arg_foo')); } @@ -2157,7 +2509,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -2247,7 +2604,12 @@ void main() { fileType: FileType.header, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); for (final String comment in comments) { expect(code, contains('///$comment')); @@ -2255,7 +2617,7 @@ void main() { expect(code, contains('/// ///')); }); - test('doesnt create codecs if no custom datatypes', () { + test("doesn't create codecs if no custom datatypes", () { final Root root = Root( apis: [ Api( @@ -2288,7 +2650,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains(' : FlutterStandardReader'))); }); @@ -2336,7 +2703,12 @@ void main() { fileType: FileType.source, languageOptions: const ObjcOptions(), ); - generator.generate(generatorOptions, root, sink); + generator.generate( + generatorOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(' : FlutterStandardReader')); }); diff --git a/packages/pigeon/test/swift_generator_test.dart b/packages/pigeon/test/swift_generator_test.dart index 257cadbd56c..4c53dc332ff 100644 --- a/packages/pigeon/test/swift_generator_test.dart +++ b/packages/pigeon/test/swift_generator_test.dart @@ -6,6 +6,8 @@ import 'package:pigeon/ast.dart'; import 'package:pigeon/swift_generator.dart'; import 'package:test/test.dart'; +import 'dart_generator_test.dart'; + void main() { test('gen one class', () { final Class klass = Class( @@ -27,7 +29,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('struct Foobar')); expect(code, contains('var field1: Int64? = nil')); @@ -51,7 +58,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum Foobar: Int')); expect(code, contains(' case one = 0')); @@ -80,7 +92,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum Foo: Int')); expect(code, contains('let fooArg = Foo(rawValue: args[0] as! Int)!')); @@ -124,7 +141,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('protocol Api')); expect(code, matches('func doSomething.*Input.*Output')); @@ -188,7 +210,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('var aBool: Bool? = nil')); expect(code, contains('var aInt: Int64? = nil')); @@ -238,7 +265,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Api')); expect(code, contains('init(binaryMessenger: FlutterBinaryMessenger)')); @@ -274,7 +306,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(matches('.*doSomething(.*) ->'))); expect(code, matches('doSomething(.*)')); @@ -309,7 +346,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('completion: @escaping () -> Void')); expect(code, contains('completion()')); @@ -338,7 +380,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func doSomething() throws -> Output')); expect(code, contains('let result = try api.doSomething()')); @@ -368,7 +415,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func doSomething(completion: @escaping (Output) -> Void)')); @@ -389,7 +441,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('struct Foobar')); expect(code, contains('var field1: [Any?]? = nil')); @@ -409,7 +466,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('struct Foobar')); expect(code, contains('var field1: [AnyHashable: Any?]? = nil')); @@ -446,7 +508,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('struct Outer')); expect(code, contains('struct Nested')); @@ -495,7 +562,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('protocol Api')); expect(code, contains('api.doSomething(arg: argArg) { result in')); @@ -541,7 +613,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('class Api')); expect(code, matches('func doSomething.*Input.*completion.*Output.*Void')); @@ -574,7 +651,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('enum Enum1: Int')); expect(code, contains('case one = 0')); @@ -592,7 +674,12 @@ void main() { copyrightHeader: makeIterable('hello world'), ); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, startsWith('// hello world')); }); @@ -619,7 +706,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('struct Foobar')); expect(code, contains('var field1: [Int64?]')); @@ -648,7 +740,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('struct Foobar')); expect(code, contains('var field1: [String?: String?]')); @@ -679,7 +776,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func doit(arg: [Int64?]')); }); @@ -709,7 +811,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func doit(arg argArg: [Int64?]')); }); @@ -735,7 +842,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func doit() throws -> [Int64?]')); expect(code, contains('let result = try api.doit()')); @@ -763,7 +875,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, contains('func doit(completion: @escaping ([Int64?]) -> Void')); @@ -793,7 +910,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func add(x: Int64, y: Int64) throws -> Int64')); expect(code, contains('let args = message as! [Any?]')); @@ -831,7 +953,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('let channel = FlutterBasicMessageChannel')); expect( @@ -866,7 +993,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func doit() throws -> Int64?')); }); @@ -891,7 +1023,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -922,7 +1059,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -953,7 +1095,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect( code, @@ -990,7 +1137,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('var input: String\n')); }); @@ -1072,7 +1224,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); for (final String comment in comments) { expect(code, contains('///$comment')); @@ -1080,7 +1237,7 @@ void main() { expect(code, contains('/// ///')); }); - test('doesnt create codecs if no custom datatypes', () { + test("doesn't create codecs if no custom datatypes", () { final Root root = Root( apis: [ Api( @@ -1109,7 +1266,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, isNot(contains(': FlutterStandardReader '))); }); @@ -1153,7 +1315,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains(': FlutterStandardReader ')); }); @@ -1191,7 +1358,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func setValue(_ value: Int64, for key: String)')); }); @@ -1222,7 +1394,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func removeValue(key: String)')); }); @@ -1245,7 +1422,12 @@ void main() { final StringBuffer sink = StringBuffer(); const SwiftOptions swiftOptions = SwiftOptions(); const SwiftGenerator generator = SwiftGenerator(); - generator.generate(swiftOptions, root, sink); + generator.generate( + swiftOptions, + root, + sink, + packageName: DEFAULT_PACKAGE_NAME, + ); final String code = sink.toString(); expect(code, contains('func removeAll()')); }); diff --git a/packages/pigeon/tool/generate.dart b/packages/pigeon/tool/generate.dart index 99be94b83e1..ecb465c1394 100644 --- a/packages/pigeon/tool/generate.dart +++ b/packages/pigeon/tool/generate.dart @@ -19,6 +19,7 @@ import 'shared/generation.dart'; const String _helpFlag = 'help'; const String _formatFlag = 'format'; +const String _noFormatFlag = 'no-format'; const String _files = 'files'; const String _test = 'test'; const String _example = 'example'; @@ -27,7 +28,19 @@ const List _fileGroups = [_test, _example]; Future main(List args) async { final ArgParser parser = ArgParser() - ..addFlag(_formatFlag, abbr: 'f', help: 'Autoformats after generation.') + ..addFlag( + _formatFlag, + abbr: 'f', + help: + 'Autoformat after generation. This flag is no longer needed, as this behavior is the default', + defaultsTo: true, + hide: true, + ) + ..addFlag( + _noFormatFlag, + abbr: 'n', + help: 'Do not autoformat after generation.', + ) ..addFlag(_helpFlag, negatable: false, abbr: 'h', help: 'Print this reference.') ..addMultiOption(_files, @@ -46,10 +59,11 @@ ${parser.usage}'''); final String baseDir = p.dirname(p.dirname(Platform.script.toFilePath())); - final List? toGenerate = - argResults.wasParsed(_files) ? argResults[_files] as List : null; + final List toGenerate = argResults.wasParsed(_files) + ? argResults[_files] as List + : _fileGroups; - if (toGenerate == null || toGenerate.contains(_test)) { + if (toGenerate.contains(_test)) { print('Generating platform_test/ output...'); final int generateExitCode = await generateTestPigeons(baseDir: baseDir); if (generateExitCode == 0) { @@ -60,7 +74,7 @@ ${parser.usage}'''); } } - if (toGenerate == null || toGenerate.contains(_example)) { + if (toGenerate.contains(_example)) { print('Generating example/ output...'); final int generateExitCode = await generateExamplePigeons(); if (generateExitCode == 0) { @@ -71,7 +85,7 @@ ${parser.usage}'''); } } - if (argResults.wasParsed(_formatFlag)) { + if (!argResults.wasParsed(_noFormatFlag)) { print('Formatting generated output...'); final int formatExitCode = await formatAllFiles(repositoryRoot: p.dirname(p.dirname(baseDir))); diff --git a/packages/pigeon/tool/shared/generation.dart b/packages/pigeon/tool/shared/generation.dart index 14370ad14af..ae4c90b7ff2 100644 --- a/packages/pigeon/tool/shared/generation.dart +++ b/packages/pigeon/tool/shared/generation.dart @@ -103,6 +103,7 @@ Future generateTestPigeons({required String baseDir}) async { : '$outputBase/windows/pigeon/$input.gen.cpp', cppNamespace: '${input}_pigeontest', suppressVersion: true, + packageName: 'pigeon_integration_tests', ); if (generateCode != 0) { return generateCode; @@ -117,6 +118,7 @@ Future generateTestPigeons({required String baseDir}) async { ? null : '$outputBase/macos/Classes/$pascalCaseName.gen.swift', suppressVersion: true, + packageName: 'pigeon_integration_tests', ); if (generateCode != 0) { return generateCode; @@ -141,6 +143,7 @@ Future generateTestPigeons({required String baseDir}) async { ? null : '$alternateOutputBase/ios/Classes/$pascalCaseName.gen.m', suppressVersion: true, + packageName: 'pigeon_integration_tests', ); if (generateCode != 0) { return generateCode; @@ -158,6 +161,7 @@ Future generateTestPigeons({required String baseDir}) async { ? null : '$alternateOutputBase/macos/Classes/$pascalCaseName.gen.m', suppressVersion: true, + packageName: 'pigeon_integration_tests', ); if (generateCode != 0) { return generateCode; @@ -185,6 +189,7 @@ Future runPigeon({ bool suppressVersion = false, String copyrightHeader = './copyright_header.txt', String? basePath, + String? packageName, }) async { // Temporarily suppress the version output via the global flag if requested. // This is done because having the version in all the generated test output @@ -218,6 +223,7 @@ Future runPigeon({ swiftOut: swiftOut, swiftOptions: const SwiftOptions(), basePath: basePath, + packageName: packageName, )); includeVersionInGeneratedWarning = originalWarningSetting; return result; From db1478b5d5d469a63044599be15d158572ff1ba6 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Fri, 21 Jul 2023 09:26:54 -0700 Subject: [PATCH 2/2] dartPackageName --- packages/pigeon/CHANGELOG.md | 2 +- packages/pigeon/example/README.md | 2 +- .../pigeon/example/app/pigeons/messages.dart | 2 +- packages/pigeon/lib/cpp_generator.dart | 51 +++--- packages/pigeon/lib/dart_generator.dart | 33 ++-- packages/pigeon/lib/generator.dart | 56 +++---- packages/pigeon/lib/generator_tools.dart | 4 +- packages/pigeon/lib/java_generator.dart | 39 ++--- packages/pigeon/lib/kotlin_generator.dart | 31 ++-- packages/pigeon/lib/objc_generator.dart | 65 ++++---- packages/pigeon/lib/pigeon_lib.dart | 32 ++-- packages/pigeon/lib/swift_generator.dart | 32 ++-- .../example/android/build.gradle | 2 +- .../test_plugin/example/android/build.gradle | 2 +- packages/pigeon/test/cpp_generator_test.dart | 64 ++++---- packages/pigeon/test/dart_generator_test.dart | 82 +++++----- .../pigeon/test/generator_tools_test.dart | 5 +- packages/pigeon/test/java_generator_test.dart | 80 +++++----- .../pigeon/test/kotlin_generator_test.dart | 70 ++++----- packages/pigeon/test/objc_generator_test.dart | 148 +++++++++--------- .../pigeon/test/swift_generator_test.dart | 72 ++++----- packages/pigeon/tool/shared/generation.dart | 12 +- 22 files changed, 447 insertions(+), 439 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 6e2b0acbe51..cdf4c488f2d 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,7 +1,7 @@ ## 10.1.4 * Adds package name to method channel strings to avoid potential collisions between plugins. -* Adds packageName option to `pigeonOptions`. +* Adds dartPackageName option to `pigeonOptions`. ## 10.1.3 diff --git a/packages/pigeon/example/README.md b/packages/pigeon/example/README.md index e533f5dff51..f0574df814a 100644 --- a/packages/pigeon/example/README.md +++ b/packages/pigeon/example/README.md @@ -31,7 +31,7 @@ needed for your project. // Set this to a unique prefix for your plugin or application, per Objective-C naming conventions. objcOptions: ObjcOptions(prefix: 'PGN'), copyrightHeader: 'pigeons/copyright.txt', - packageName: 'pigeon_example_package', + dartPackageName: 'pigeon_example_package', )) ``` Then make a simple call to run pigeon on the Dart file containing your definitions. diff --git a/packages/pigeon/example/app/pigeons/messages.dart b/packages/pigeon/example/app/pigeons/messages.dart index b564d0f9a7d..da66c0e8553 100644 --- a/packages/pigeon/example/app/pigeons/messages.dart +++ b/packages/pigeon/example/app/pigeons/messages.dart @@ -23,7 +23,7 @@ import 'package:pigeon/pigeon.dart'; // Set this to a unique prefix for your plugin or application, per Objective-C naming conventions. objcOptions: ObjcOptions(prefix: 'PGN'), copyrightHeader: 'pigeons/copyright.txt', - packageName: 'pigeon_example_package', + dartPackageName: 'pigeon_example_package', )) // #enddocregion config diff --git a/packages/pigeon/lib/cpp_generator.dart b/packages/pigeon/lib/cpp_generator.dart index 15e0cb23516..6284f532ac8 100644 --- a/packages/pigeon/lib/cpp_generator.dart +++ b/packages/pigeon/lib/cpp_generator.dart @@ -83,7 +83,7 @@ class CppGenerator extends Generator> { OutputFileOptions generatorOptions, Root root, StringSink sink, { - required String packageName, + required String dartPackageName, }) { assert(generatorOptions.fileType == FileType.header || generatorOptions.fileType == FileType.source); @@ -92,14 +92,14 @@ class CppGenerator extends Generator> { generatorOptions.languageOptions, root, sink, - packageName: packageName, + dartPackageName: dartPackageName, ); } else if (generatorOptions.fileType == FileType.source) { const CppSourceGenerator().generate( generatorOptions.languageOptions, root, sink, - packageName: packageName, + dartPackageName: dartPackageName, ); } } @@ -115,7 +115,7 @@ class CppHeaderGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); @@ -130,7 +130,7 @@ class CppHeaderGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { final String guardName = _getGuardName(generatorOptions.headerIncludePath); indent.writeln('#ifndef $guardName'); @@ -168,7 +168,7 @@ class CppHeaderGenerator extends StructuredGenerator { Root root, Indent indent, Enum anEnum, { - required String packageName, + required String dartPackageName, }) { indent.newln(); addDocumentationComments( @@ -189,7 +189,7 @@ class CppHeaderGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { _writeErrorOr(indent, friends: root.apis.map((Api api) => api.name)); } @@ -200,7 +200,7 @@ class CppHeaderGenerator extends StructuredGenerator { Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }) { // When generating for a Pigeon unit test, add a test fixture friend class to // allow unit testing private methods, since testing serialization via public @@ -307,7 +307,7 @@ class CppHeaderGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.flutter); if (getCodecClasses(api, root).isNotEmpty) { @@ -359,7 +359,7 @@ class CppHeaderGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.host); if (getCodecClasses(api, root).isNotEmpty) { @@ -551,7 +551,7 @@ $friendLines CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.namespace != null) { indent.writeln('} // namespace ${generatorOptions.namespace}'); @@ -571,7 +571,7 @@ class CppSourceGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); @@ -588,7 +588,7 @@ class CppSourceGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.writeln('#include "${generatorOptions.headerIncludePath}"'); indent.newln(); @@ -612,7 +612,7 @@ class CppSourceGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.namespace != null) { indent.writeln('namespace ${generatorOptions.namespace} {'); @@ -624,7 +624,7 @@ class CppSourceGenerator extends StructuredGenerator { CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { final List usingDirectives = [ 'flutter::BasicMessageChannel', @@ -646,7 +646,7 @@ class CppSourceGenerator extends StructuredGenerator { Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); @@ -680,7 +680,7 @@ class CppSourceGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); // Deserialization. @@ -691,7 +691,7 @@ class CppSourceGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); } @@ -703,7 +703,7 @@ class CppSourceGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { _writeFunctionDefinition(indent, 'ToEncodableList', scope: klass.name, @@ -731,7 +731,7 @@ class CppSourceGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { // Returns the expression to convert the given EncodableValue to a field // value. @@ -809,7 +809,7 @@ class CppSourceGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.flutter); if (getCodecClasses(api, root).isNotEmpty) { @@ -831,7 +831,7 @@ class CppSourceGenerator extends StructuredGenerator { 'return flutter::StandardMessageCodec::GetInstance(&$codeSerializerName::GetInstance());'); }); for (final Method func in api.methods) { - final String channelName = makeChannelName(api, func, packageName); + final String channelName = makeChannelName(api, func, dartPackageName); final HostDatatype returnType = getHostDatatype(func.returnType, root.classes, root.enums, _shortBaseCppTypeForBuiltinDartType); @@ -904,7 +904,7 @@ class CppSourceGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.host); if (getCodecClasses(api, root).isNotEmpty) { @@ -931,7 +931,8 @@ class CppSourceGenerator extends StructuredGenerator { '${api.name}* api' ], body: () { for (final Method method in api.methods) { - final String channelName = makeChannelName(api, method, packageName); + final String channelName = + makeChannelName(api, method, dartPackageName); indent.writeScoped('{', '}', () { indent.writeln( 'auto channel = std::make_unique>(binary_messenger, ' @@ -1243,7 +1244,7 @@ ${prefix}reply(EncodableValue(std::move(wrapped)));'''; CppOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.namespace != null) { indent.writeln('} // namespace ${generatorOptions.namespace}'); diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart index a66ebacc59e..2c40a8ddece 100644 --- a/packages/pigeon/lib/dart_generator.dart +++ b/packages/pigeon/lib/dart_generator.dart @@ -77,7 +77,7 @@ class DartGenerator extends StructuredGenerator { DartOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); @@ -95,7 +95,7 @@ class DartGenerator extends StructuredGenerator { DartOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.writeln("import 'dart:async';"); indent.writeln( @@ -113,7 +113,7 @@ class DartGenerator extends StructuredGenerator { Root root, Indent indent, Enum anEnum, { - required String packageName, + required String dartPackageName, }) { indent.newln(); addDocumentationComments( @@ -134,7 +134,7 @@ class DartGenerator extends StructuredGenerator { Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); @@ -164,7 +164,7 @@ class DartGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); indent.newln(); writeClassDecode( @@ -174,7 +174,7 @@ class DartGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); }); } @@ -197,7 +197,7 @@ class DartGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { indent.write('Object encode() '); indent.addScoped('{', '}', () { @@ -231,7 +231,7 @@ class DartGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { void writeValueDecode(NamedType field, int index) { final String resultAt = 'result[$index]'; @@ -311,7 +311,7 @@ $resultAt != null Api api, { String Function(Method)? channelNameFunc, bool isMockHandler = false, - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.flutter); final List customEnumNames = @@ -359,7 +359,7 @@ $resultAt != null 'final BasicMessageChannel channel = BasicMessageChannel(', ); final String channelName = channelNameFunc == null - ? makeChannelName(api, func, packageName) + ? makeChannelName(api, func, dartPackageName) : channelNameFunc(func); indent.nest(2, () { indent.writeln("'$channelName', codec,"); @@ -479,7 +479,7 @@ $resultAt != null Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.host); String codecName = _standardMessageCodec; @@ -536,7 +536,8 @@ final BinaryMessenger? _binaryMessenger; 'Future<${_addGenericTypesNullable(func.returnType)}> ${func.name}($argSignature) async ', ); indent.addScoped('{', '}', () { - final String channelName = makeChannelName(api, func, packageName); + final String channelName = + makeChannelName(api, func, dartPackageName); indent.writeln( 'final BasicMessageChannel channel = BasicMessageChannel('); indent.nest(2, () { @@ -597,7 +598,7 @@ if (replyList == null) { DartOptions generatorOptions, Root root, StringSink sink, { - required String packageName, + required String dartPackageName, }) { final Indent indent = Indent(sink); final String sourceOutPath = generatorOptions.sourceOutPath ?? ''; @@ -619,7 +620,7 @@ if (replyList == null) { } else { final String path = relativeDartPath.replaceFirst(RegExp(r'^.*/lib/'), ''); - indent.writeln("import 'package:$packageName/$path';"); + indent.writeln("import 'package:$dartPackageName/$path';"); } for (final Api api in root.apis) { if (api.location == ApiLocation.host && api.dartHostTestHandler != null) { @@ -636,9 +637,9 @@ if (replyList == null) { indent, mockApi, channelNameFunc: (Method func) => - makeChannelName(api, func, packageName), + makeChannelName(api, func, dartPackageName), isMockHandler: true, - packageName: packageName, + dartPackageName: dartPackageName, ); } } diff --git a/packages/pigeon/lib/generator.dart b/packages/pigeon/lib/generator.dart index 14829cc57c2..cf9dc78cdb2 100644 --- a/packages/pigeon/lib/generator.dart +++ b/packages/pigeon/lib/generator.dart @@ -17,7 +17,7 @@ abstract class Generator { T generatorOptions, Root root, StringSink sink, { - required String packageName, + required String dartPackageName, }); } @@ -31,7 +31,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, StringSink sink, { - required String packageName, + required String dartPackageName, }) { final Indent indent = Indent(sink); @@ -39,56 +39,56 @@ abstract class StructuredGenerator extends Generator { generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); writeFileImports( generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); writeOpenNamespace( generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); writeGeneralUtilities( generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); writeEnums( generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); writeDataClasses( generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); writeApis( generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); writeCloseNamespace( generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); } @@ -97,7 +97,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }); /// Writes specified imports to [indent]. @@ -105,7 +105,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }); /// Writes code to [indent] that opens file namespace if needed. @@ -115,7 +115,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) {} /// Writes code to [indent] that closes file namespace if needed. @@ -125,7 +125,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) {} /// Writes any necessary helper utilities to [indent] if needed. @@ -135,7 +135,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) {} /// Writes all enums to [indent]. @@ -145,7 +145,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { for (final Enum anEnum in root.enums) { writeEnum( @@ -153,7 +153,7 @@ abstract class StructuredGenerator extends Generator { root, indent, anEnum, - packageName: packageName, + dartPackageName: dartPackageName, ); } } @@ -164,7 +164,7 @@ abstract class StructuredGenerator extends Generator { Root root, Indent indent, Enum anEnum, { - required String packageName, + required String dartPackageName, }) {} /// Writes all data classes to [indent]. @@ -174,7 +174,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { for (final Class klass in root.classes) { writeDataClass( @@ -182,7 +182,7 @@ abstract class StructuredGenerator extends Generator { root, indent, klass, - packageName: packageName, + dartPackageName: dartPackageName, ); } } @@ -193,7 +193,7 @@ abstract class StructuredGenerator extends Generator { Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }); /// Writes a single class encode method to [indent]. @@ -204,7 +204,7 @@ abstract class StructuredGenerator extends Generator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) {} /// Writes a single class decode method to [indent]. @@ -215,7 +215,7 @@ abstract class StructuredGenerator extends Generator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) {} /// Writes all apis to [indent]. @@ -225,7 +225,7 @@ abstract class StructuredGenerator extends Generator { T generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { for (final Api api in root.apis) { if (api.location == ApiLocation.host) { @@ -234,7 +234,7 @@ abstract class StructuredGenerator extends Generator { root, indent, api, - packageName: packageName, + dartPackageName: dartPackageName, ); } else if (api.location == ApiLocation.flutter) { writeFlutterApi( @@ -242,7 +242,7 @@ abstract class StructuredGenerator extends Generator { root, indent, api, - packageName: packageName, + dartPackageName: dartPackageName, ); } } @@ -254,7 +254,7 @@ abstract class StructuredGenerator extends Generator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }); /// Writes a single Host Api to [indent]. @@ -263,6 +263,6 @@ abstract class StructuredGenerator extends Generator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }); } diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index a7fd2528dce..b7b9107b805 100644 --- a/packages/pigeon/lib/generator_tools.dart +++ b/packages/pigeon/lib/generator_tools.dart @@ -165,8 +165,8 @@ class Indent { } /// Create the generated channel name for a [func] on a [api]. -String makeChannelName(Api api, Method func, String packageName) { - return 'dev.flutter.pigeon.$packageName.${api.name}.${func.name}'; +String makeChannelName(Api api, Method func, String dartPackageName) { + return 'dev.flutter.pigeon.$dartPackageName.${api.name}.${func.name}'; } /// Represents the mapping of a Dart datatype to a Host datatype. diff --git a/packages/pigeon/lib/java_generator.dart b/packages/pigeon/lib/java_generator.dart index a14afa7080c..ac8d69ccbf5 100644 --- a/packages/pigeon/lib/java_generator.dart +++ b/packages/pigeon/lib/java_generator.dart @@ -95,7 +95,7 @@ class JavaGenerator extends StructuredGenerator { JavaOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); @@ -110,7 +110,7 @@ class JavaGenerator extends StructuredGenerator { JavaOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.package != null) { indent.writeln('package ${generatorOptions.package};'); @@ -139,7 +139,7 @@ class JavaGenerator extends StructuredGenerator { JavaOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.writeln( '$_docCommentPrefix Generated class from Pigeon.$_docCommentSuffix'); @@ -158,7 +158,7 @@ class JavaGenerator extends StructuredGenerator { Root root, Indent indent, Enum anEnum, { - required String packageName, + required String dartPackageName, }) { String camelToSnake(String camelCase) { final RegExp regex = RegExp('([a-z])([A-Z]+)'); @@ -197,7 +197,7 @@ class JavaGenerator extends StructuredGenerator { Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); @@ -236,7 +236,7 @@ class JavaGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); writeClassDecode( generatorOptions, @@ -245,7 +245,7 @@ class JavaGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); }); } @@ -328,7 +328,7 @@ class JavaGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { indent.newln(); indent.writeln('@NonNull'); @@ -367,7 +367,7 @@ class JavaGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { indent.newln(); indent.write( @@ -407,7 +407,7 @@ class JavaGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.flutter); if (getCodecClasses(api, root).isNotEmpty) { @@ -453,7 +453,7 @@ class JavaGenerator extends StructuredGenerator { }); for (final Method func in api.methods) { - final String channelName = makeChannelName(api, func, packageName); + final String channelName = makeChannelName(api, func, dartPackageName); final String returnType = func.returnType.isVoid ? 'Void' : _javaTypeForDartType(func.returnType); @@ -522,7 +522,7 @@ class JavaGenerator extends StructuredGenerator { JavaOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (root.apis.any((Api api) => api.location == ApiLocation.host && @@ -530,7 +530,8 @@ class JavaGenerator extends StructuredGenerator { indent.newln(); _writeResultInterface(indent); } - super.writeApis(generatorOptions, root, indent, packageName: packageName); + super.writeApis(generatorOptions, root, indent, + dartPackageName: dartPackageName); } /// Write the java code that represents a host [Api], [api]. @@ -545,7 +546,7 @@ class JavaGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.host); if (getCodecClasses(api, root).isNotEmpty) { @@ -587,7 +588,7 @@ class JavaGenerator extends StructuredGenerator { indent, api, method, - packageName: packageName, + dartPackageName: dartPackageName, ); } }); @@ -643,9 +644,9 @@ class JavaGenerator extends StructuredGenerator { Indent indent, Api api, final Method method, { - required String packageName, + required String dartPackageName, }) { - final String channelName = makeChannelName(api, method, packageName); + final String channelName = makeChannelName(api, method, dartPackageName); indent.write(''); indent.addScoped('{', '}', () { String? taskQueue; @@ -880,7 +881,7 @@ protected static ArrayList wrapError(@NonNull Throwable exception) { JavaOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.newln(); _writeErrorClass(indent); @@ -893,7 +894,7 @@ protected static ArrayList wrapError(@NonNull Throwable exception) { JavaOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.dec(); indent.addln('}'); diff --git a/packages/pigeon/lib/kotlin_generator.dart b/packages/pigeon/lib/kotlin_generator.dart index e6e94ff3dcc..78472df269f 100644 --- a/packages/pigeon/lib/kotlin_generator.dart +++ b/packages/pigeon/lib/kotlin_generator.dart @@ -81,7 +81,7 @@ class KotlinGenerator extends StructuredGenerator { KotlinOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); @@ -95,7 +95,7 @@ class KotlinGenerator extends StructuredGenerator { KotlinOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.newln(); if (generatorOptions.package != null) { @@ -117,7 +117,7 @@ class KotlinGenerator extends StructuredGenerator { Root root, Indent indent, Enum anEnum, { - required String packageName, + required String dartPackageName, }) { indent.newln(); addDocumentationComments( @@ -152,7 +152,7 @@ class KotlinGenerator extends StructuredGenerator { Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); @@ -187,7 +187,7 @@ class KotlinGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); writeClassEncode( generatorOptions, @@ -196,7 +196,7 @@ class KotlinGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); }); } @@ -209,7 +209,7 @@ class KotlinGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { indent.write('fun toList(): List '); indent.addScoped('{', '}', () { @@ -243,7 +243,7 @@ class KotlinGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { final String className = klass.name; @@ -331,14 +331,15 @@ class KotlinGenerator extends StructuredGenerator { KotlinOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (root.apis.any((Api api) => api.location == ApiLocation.host && api.methods.any((Method it) => it.isAsynchronous))) { indent.newln(); } - super.writeApis(generatorOptions, root, indent, packageName: packageName); + super.writeApis(generatorOptions, root, indent, + dartPackageName: dartPackageName); } /// Writes the code for a flutter [Api], [api]. @@ -352,7 +353,7 @@ class KotlinGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.flutter); final bool isCustomCodec = getCodecClasses(api, root).isNotEmpty; @@ -385,7 +386,7 @@ class KotlinGenerator extends StructuredGenerator { }); for (final Method func in api.methods) { - final String channelName = makeChannelName(api, func, packageName); + final String channelName = makeChannelName(api, func, dartPackageName); final String returnType = func.returnType.isVoid ? '' : _nullsafeKotlinTypeForDartType(func.returnType); @@ -449,7 +450,7 @@ class KotlinGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.host); @@ -530,7 +531,7 @@ class KotlinGenerator extends StructuredGenerator { } final String channelName = - makeChannelName(api, method, packageName); + makeChannelName(api, method, dartPackageName); indent.write( 'val channel = BasicMessageChannel(binaryMessenger, "$channelName", codec'); @@ -716,7 +717,7 @@ class KotlinGenerator extends StructuredGenerator { KotlinOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { _writeWrapResult(indent); _writeWrapError(generatorOptions, indent); diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc_generator.dart index e1e1ed379ad..53e46725cff 100644 --- a/packages/pigeon/lib/objc_generator.dart +++ b/packages/pigeon/lib/objc_generator.dart @@ -75,21 +75,21 @@ class ObjcGenerator extends Generator> { OutputFileOptions generatorOptions, Root root, StringSink sink, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.fileType == FileType.header) { const ObjcHeaderGenerator().generate( generatorOptions.languageOptions, root, sink, - packageName: packageName, + dartPackageName: dartPackageName, ); } else if (generatorOptions.fileType == FileType.source) { const ObjcSourceGenerator().generate( generatorOptions.languageOptions, root, sink, - packageName: packageName, + dartPackageName: dartPackageName, ); } } @@ -105,7 +105,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); @@ -120,7 +120,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.writeln('#import '); indent.newln(); @@ -139,7 +139,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { Root root, Indent indent, Enum anEnum, { - required String packageName, + required String dartPackageName, }) { final String enumName = _className(generatorOptions.prefix, anEnum.name); indent.newln(); @@ -163,7 +163,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.newln(); for (final Class klass in root.classes) { @@ -175,7 +175,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); } @@ -185,7 +185,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }) { final List classes = root.classes; final List enums = root.enums; @@ -242,7 +242,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) {} @override @@ -253,7 +253,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) {} @override @@ -261,9 +261,10 @@ class ObjcHeaderGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { - super.writeApis(generatorOptions, root, indent, packageName: packageName); + super.writeApis(generatorOptions, root, indent, + dartPackageName: dartPackageName); indent.writeln('NS_ASSUME_NONNULL_END'); } @@ -273,7 +274,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { indent.writeln( '$_docCommentPrefix The codec used by ${_className(generatorOptions.prefix, api.name)}.'); @@ -313,7 +314,7 @@ class ObjcHeaderGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { indent.writeln( '$_docCommentPrefix The codec used by ${_className(generatorOptions.prefix, api.name)}.'); @@ -387,7 +388,7 @@ class ObjcSourceGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); @@ -402,7 +403,7 @@ class ObjcSourceGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.writeln('#import "${generatorOptions.headerIncludePath}"'); indent.newln(); @@ -424,7 +425,7 @@ class ObjcSourceGenerator extends StructuredGenerator { ObjcOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { _writeObjcSourceHelperFunctions(indent, hasHostApiMethods: root.apis.any((Api api) => @@ -438,7 +439,7 @@ class ObjcSourceGenerator extends StructuredGenerator { generatorOptions, root, indent, - packageName: packageName, + dartPackageName: dartPackageName, ); } @@ -448,7 +449,7 @@ class ObjcSourceGenerator extends StructuredGenerator { Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); @@ -466,7 +467,7 @@ class ObjcSourceGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); writeClassEncode( generatorOptions, @@ -475,7 +476,7 @@ class ObjcSourceGenerator extends StructuredGenerator { klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); indent.writeln('@end'); indent.newln(); @@ -489,7 +490,7 @@ class ObjcSourceGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { indent.write('- (NSArray *)toList '); indent.addScoped('{', '}', () { @@ -511,7 +512,7 @@ class ObjcSourceGenerator extends StructuredGenerator { Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { final String className = _className(generatorOptions.prefix, klass.name); indent.write('+ ($className *)fromList:(NSArray *)list '); @@ -557,7 +558,7 @@ class ObjcSourceGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.flutter); final String apiName = _className(generatorOptions.prefix, api.name); @@ -576,7 +577,7 @@ class ObjcSourceGenerator extends StructuredGenerator { indent, api, func, - packageName: packageName, + dartPackageName: dartPackageName, ); } indent.writeln('@end'); @@ -589,7 +590,7 @@ class ObjcSourceGenerator extends StructuredGenerator { Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.host); final String apiName = _className(generatorOptions.prefix, api.name); @@ -618,7 +619,7 @@ class ObjcSourceGenerator extends StructuredGenerator { func, channelName, taskQueue, - packageName: packageName, + dartPackageName: dartPackageName, ); indent.write('if (api) '); indent.addScoped('{', '}', () { @@ -737,14 +738,14 @@ class ObjcSourceGenerator extends StructuredGenerator { Method func, String varName, String? taskQueue, { - required String packageName, + required String dartPackageName, }) { indent.writeln('FlutterBasicMessageChannel *$varName ='); indent.nest(1, () { indent.writeln('[[FlutterBasicMessageChannel alloc]'); indent.nest(1, () { indent.writeln( - 'initWithName:@"${makeChannelName(api, func, packageName)}"'); + 'initWithName:@"${makeChannelName(api, func, dartPackageName)}"'); indent.writeln('binaryMessenger:binaryMessenger'); indent.write('codec:'); indent @@ -922,7 +923,7 @@ static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) { Indent indent, Api api, Method func, { - required String packageName, + required String dartPackageName, }) { final _ObjcPtr returnType = _objcTypeForDartType(languageOptions.prefix, func.returnType); @@ -952,7 +953,7 @@ static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) { indent.writeln('[FlutterBasicMessageChannel'); indent.nest(1, () { indent.writeln( - 'messageChannelWithName:@"${makeChannelName(api, func, packageName)}"'); + 'messageChannelWithName:@"${makeChannelName(api, func, dartPackageName)}"'); indent.writeln('binaryMessenger:self.binaryMessenger'); indent.write( 'codec:${_getCodecGetterName(languageOptions.prefix, api.name)}()'); diff --git a/packages/pigeon/lib/pigeon_lib.dart b/packages/pigeon/lib/pigeon_lib.dart index b8cff04414e..2fca07a05bc 100644 --- a/packages/pigeon/lib/pigeon_lib.dart +++ b/packages/pigeon/lib/pigeon_lib.dart @@ -190,8 +190,8 @@ class PigeonOptions { this.astOut, this.debugGenerators, this.basePath, - String? packageName, - }) : _packageName = packageName; + String? dartPackageName, + }) : _dartPackageName = dartPackageName; /// Path to the file which will be processed. final String? input; @@ -257,7 +257,7 @@ class PigeonOptions { final String? basePath; /// The name of the package the pigeon files will be used in. - final String? _packageName; + final String? _dartPackageName; /// Creates a [PigeonOptions] from a Map representation where: /// `x = PigeonOptions.fromMap(x.toMap())`. @@ -296,7 +296,7 @@ class PigeonOptions { astOut: map['astOut'] as String?, debugGenerators: map['debugGenerators'] as bool?, basePath: map['basePath'] as String?, - packageName: map['packageName'] as String?, + dartPackageName: map['dartPackageName'] as String?, ); } @@ -325,7 +325,7 @@ class PigeonOptions { if (oneLanguage != null) 'oneLanguage': oneLanguage!, if (debugGenerators != null) 'debugGenerators': debugGenerators!, if (basePath != null) 'basePath': basePath!, - if (_packageName != null) 'packageName': _packageName!, + if (_dartPackageName != null) 'dartPackageName': _dartPackageName!, }; return result; } @@ -338,12 +338,12 @@ class PigeonOptions { /// Returns provided or deduced package name, throws `Exception` if none found. String getPackageName() { - final String? name = _packageName ?? deducePackageName(dartOut ?? ''); + final String? name = _dartPackageName ?? deducePackageName(dartOut ?? ''); if (name == null) { throw Exception( 'Unable to deduce package name, and no package name supplied.\n' - 'Add a `packageName` property to your `PigeonOptions` config,\n' - 'or add --packageName={name_of_package} to your command line pigeon call.', + 'Add a `dartPackageName` property to your `PigeonOptions` config,\n' + 'or add --dartPackageName={name_of_package} to your command line pigeon call.', ); } return name; @@ -479,7 +479,7 @@ class DartGeneratorAdapter implements GeneratorAdapter { dartOptionsWithHeader, root, sink, - packageName: options.getPackageName(), + dartPackageName: options.getPackageName(), ); } @@ -514,7 +514,7 @@ class DartTestGeneratorAdapter implements GeneratorAdapter { dartOptionsWithHeader, root, sink, - packageName: options.getPackageName(), + dartPackageName: options.getPackageName(), ); } @@ -558,7 +558,7 @@ class ObjcGeneratorAdapter implements GeneratorAdapter { outputFileOptions, root, sink, - packageName: options.getPackageName(), + dartPackageName: options.getPackageName(), ); } @@ -600,7 +600,7 @@ class JavaGeneratorAdapter implements GeneratorAdapter { javaOptions, root, sink, - packageName: options.getPackageName(), + dartPackageName: options.getPackageName(), ); } @@ -635,7 +635,7 @@ class SwiftGeneratorAdapter implements GeneratorAdapter { swiftOptions, root, sink, - packageName: options.getPackageName(), + dartPackageName: options.getPackageName(), ); } @@ -674,7 +674,7 @@ class CppGeneratorAdapter implements GeneratorAdapter { outputFileOptions, root, sink, - packageName: options.getPackageName(), + dartPackageName: options.getPackageName(), ); } @@ -716,7 +716,7 @@ class KotlinGeneratorAdapter implements GeneratorAdapter { kotlinOptions, root, sink, - packageName: options.getPackageName(), + dartPackageName: options.getPackageName(), ); } @@ -1481,7 +1481,7 @@ ${_argParser.usage}'''; astOut: results['ast_out'] as String?, debugGenerators: results['debug_generators'] as bool?, basePath: results['base_path'] as String?, - packageName: results['package_name'] as String?, + dartPackageName: results['package_name'] as String?, ); return opts; } diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart index d5b10911038..e996a779b03 100644 --- a/packages/pigeon/lib/swift_generator.dart +++ b/packages/pigeon/lib/swift_generator.dart @@ -58,7 +58,7 @@ class SwiftGenerator extends StructuredGenerator { SwiftOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (generatorOptions.copyrightHeader != null) { addLines(indent, generatorOptions.copyrightHeader!, linePrefix: '// '); @@ -73,7 +73,7 @@ class SwiftGenerator extends StructuredGenerator { SwiftOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { indent.writeln('import Foundation'); indent.format(''' @@ -92,7 +92,7 @@ import FlutterMacOS Root root, Indent indent, Enum anEnum, { - required String packageName, + required String dartPackageName, }) { indent.newln(); addDocumentationComments( @@ -114,7 +114,7 @@ import FlutterMacOS Root root, Indent indent, Class klass, { - required String packageName, + required String dartPackageName, }) { final Set customClassNames = root.classes.map((Class x) => x.name).toSet(); @@ -143,7 +143,7 @@ import FlutterMacOS klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); writeClassEncode( generatorOptions, @@ -152,7 +152,7 @@ import FlutterMacOS klass, customClassNames, customEnumNames, - packageName: packageName, + dartPackageName: dartPackageName, ); }); } @@ -165,7 +165,7 @@ import FlutterMacOS Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { indent.write('func toList() -> [Any?] '); indent.addScoped('{', '}', () { @@ -200,7 +200,7 @@ import FlutterMacOS Class klass, Set customClassNames, Set customEnumNames, { - required String packageName, + required String dartPackageName, }) { final String className = klass.name; indent.write('static func fromList(_ list: [Any?]) -> $className? '); @@ -248,14 +248,15 @@ import FlutterMacOS SwiftOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { if (root.apis.any((Api api) => api.location == ApiLocation.host && api.methods.any((Method it) => it.isAsynchronous))) { indent.newln(); } - super.writeApis(generatorOptions, root, indent, packageName: packageName); + super.writeApis(generatorOptions, root, indent, + dartPackageName: dartPackageName); } /// Writes the code for a flutter [Api], [api]. @@ -271,7 +272,7 @@ import FlutterMacOS Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.flutter); final bool isCustomCodec = getCodecClasses(api, root).isNotEmpty; @@ -304,7 +305,7 @@ import FlutterMacOS final _SwiftFunctionComponents components = _SwiftFunctionComponents.fromMethod(func); - final String channelName = makeChannelName(api, func, packageName); + final String channelName = makeChannelName(api, func, dartPackageName); final String returnType = func.returnType.isVoid ? '' : _nullsafeSwiftTypeForDartType(func.returnType); @@ -378,7 +379,7 @@ import FlutterMacOS Root root, Indent indent, Api api, { - required String packageName, + required String dartPackageName, }) { assert(api.location == ApiLocation.host); @@ -453,7 +454,8 @@ import FlutterMacOS final _SwiftFunctionComponents components = _SwiftFunctionComponents.fromMethod(method); - final String channelName = makeChannelName(api, method, packageName); + final String channelName = + makeChannelName(api, method, dartPackageName); final String varChannelName = '${method.name}Channel'; addDocumentationComments( indent, method.documentationComments, _docCommentSpec); @@ -741,7 +743,7 @@ private func nilOrValue(_ value: Any?) -> T? { SwiftOptions generatorOptions, Root root, Indent indent, { - required String packageName, + required String dartPackageName, }) { _writeWrapResult(indent); _writeWrapError(indent); diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/build.gradle index f0b162c8f7d..51e204962c0 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/build.gradle +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/build.gradle @@ -26,7 +26,7 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/example/android/build.gradle index 13b8bdf3109..13270f694c5 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/example/android/build.gradle @@ -26,7 +26,7 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/pigeon/test/cpp_generator_test.dart b/packages/pigeon/test/cpp_generator_test.dart index b12565f7b98..d7e3dbdaab1 100644 --- a/packages/pigeon/test/cpp_generator_test.dart +++ b/packages/pigeon/test/cpp_generator_test.dart @@ -55,7 +55,7 @@ void main() { languageOptions: const CppOptions(), ); generator.generate(generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME); + dartPackageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); expect(code, contains('class Input')); expect(code, contains('class Output')); @@ -71,7 +71,7 @@ void main() { languageOptions: const CppOptions(), ); generator.generate(generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME); + dartPackageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); expect(code, contains('Input::Input()')); expect(code, contains('Output::Output')); @@ -127,7 +127,7 @@ void main() { languageOptions: const CppOptions(), ); generator.generate(generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME); + dartPackageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); // Method name and argument names should be adjusted. expect(code, contains(' DoSomething(const Input& some_input)')); @@ -149,7 +149,7 @@ void main() { languageOptions: const CppOptions(), ); generator.generate(generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME); + dartPackageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); expect(code, contains('encodable_some_input')); expect(code, contains('Output::output_field()')); @@ -186,7 +186,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); @@ -234,7 +234,7 @@ void main() { languageOptions: const CppOptions(), ); generator.generate(generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME); + dartPackageName: DEFAULT_PACKAGE_NAME); final String code = sink.toString(); expect( @@ -298,7 +298,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains('){'))); @@ -316,7 +316,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains('){'))); @@ -353,7 +353,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(''' @@ -379,7 +379,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(''' @@ -426,7 +426,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('namespace foo {')); @@ -444,7 +444,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('namespace foo {')); @@ -516,7 +516,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); @@ -568,7 +568,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); @@ -697,7 +697,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); @@ -740,7 +740,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); @@ -864,7 +864,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -980,7 +980,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('ErrorOr ReturnBool()')); @@ -1073,7 +1073,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1099,7 +1099,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // Most types should just use get_if, since the parameter is a pointer, @@ -1227,7 +1227,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1253,7 +1253,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // Most types should extract references. Since the type is non-nullable, @@ -1379,7 +1379,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // Nullable arguments should all be pointers. This will make them somewhat @@ -1420,7 +1420,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // All types pass nulls values when the pointer is null. @@ -1537,7 +1537,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1571,7 +1571,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // Standard types are wrapped an EncodableValues. @@ -1614,7 +1614,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // A bare 'auto' here would create a copy, not a reference, which is @@ -1735,7 +1735,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); for (final String comment in comments) { @@ -1781,7 +1781,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains(' : public flutter::StandardCodecSerializer'))); @@ -1834,7 +1834,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(' : public flutter::StandardCodecSerializer')); @@ -1914,7 +1914,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains('reply(wrap'))); @@ -1979,7 +1979,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // Nothing should be captured by reference for async handlers, since their diff --git a/packages/pigeon/test/dart_generator_test.dart b/packages/pigeon/test/dart_generator_test.dart index 7ff9964e9d9..9fbd5b53ff3 100644 --- a/packages/pigeon/test/dart_generator_test.dart +++ b/packages/pigeon/test/dart_generator_test.dart @@ -36,7 +36,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Foobar')); @@ -62,7 +62,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum Foobar')); @@ -111,7 +111,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Api')); @@ -143,7 +143,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Api')); @@ -176,7 +176,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Api')); @@ -219,7 +219,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -267,7 +267,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -325,7 +325,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('abstract class Api')); @@ -365,7 +365,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Future doSomething')); @@ -404,7 +404,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // The next line verifies that we're not setting a variable to the value of "doSomething", but @@ -440,7 +440,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('output.*=.*doSomething[(][)]')); @@ -488,7 +488,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum1?.index,')); @@ -521,7 +521,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum Foo {')); @@ -570,7 +570,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum1.index,')); @@ -603,7 +603,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('channel.send[(]null[)]')); @@ -667,7 +667,7 @@ void main() { const DartOptions(), root, mainCodeSink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String mainCode = mainCodeSink.toString(); expect(mainCode, isNot(contains(r"import 'fo\'o.dart';"))); @@ -685,7 +685,7 @@ void main() { ), root, testCodeSink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String testCode = testCodeSink.toString(); expect(testCode, contains(r"import 'fo\'o.dart';")); @@ -738,7 +738,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('abstract class Api')); @@ -788,7 +788,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(matches('=.s*doSomething'))); @@ -838,7 +838,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Api')); @@ -872,7 +872,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('channel.send[(]null[)]')); @@ -891,7 +891,7 @@ void main() { DartOptions(copyrightHeader: makeIterable('hello world')), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, startsWith('// hello world')); @@ -922,7 +922,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Foobar')); @@ -955,7 +955,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Foobar')); @@ -990,7 +990,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doit(List arg')); @@ -1024,7 +1024,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doit(List arg')); @@ -1054,7 +1054,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Future> doit(')); @@ -1095,7 +1095,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('List doit(')); @@ -1128,7 +1128,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Future doit()')); @@ -1159,7 +1159,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Future?> doit()')); @@ -1190,7 +1190,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Future doit()')); @@ -1219,7 +1219,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('int? doit();')); @@ -1249,7 +1249,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Future doit();')); @@ -1278,7 +1278,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1313,7 +1313,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Future doit(int? arg_foo) async {')); @@ -1345,7 +1345,7 @@ void main() { const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('void doit(int? foo);')); @@ -1371,7 +1371,7 @@ name: foobar ), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains("import 'package:test_package/foo/bar.dart';")); @@ -1459,7 +1459,7 @@ name: foobar const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); for (final String comment in comments) { @@ -1500,7 +1500,7 @@ name: foobar const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains('extends StandardMessageCodec'))); @@ -1549,7 +1549,7 @@ name: foobar const DartOptions(), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('extends StandardMessageCodec')); @@ -1597,7 +1597,7 @@ name: foobar ), root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String testCode = sink.toString(); diff --git a/packages/pigeon/test/generator_tools_test.dart b/packages/pigeon/test/generator_tools_test.dart index 0e592ec4daf..82b23ae1c5e 100644 --- a/packages/pigeon/test/generator_tools_test.dart +++ b/packages/pigeon/test/generator_tools_test.dart @@ -315,8 +315,9 @@ void main() { }); test('deduces package name successfully', () { - final String? packageName = deducePackageName('./pigeons/core_tests.dart'); + final String? dartPackageName = + deducePackageName('./pigeons/core_tests.dart'); - expect(packageName, 'pigeon'); + expect(dartPackageName, 'pigeon'); }); } diff --git a/packages/pigeon/test/java_generator_test.dart b/packages/pigeon/test/java_generator_test.dart index a0f0e24c439..bc6c8f12ceb 100644 --- a/packages/pigeon/test/java_generator_test.dart +++ b/packages/pigeon/test/java_generator_test.dart @@ -34,7 +34,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public class Messages')); @@ -70,7 +70,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public enum Foobar')); @@ -107,7 +107,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('package com.google.foobar;')); @@ -156,7 +156,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public interface Api')); @@ -233,7 +233,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('private @Nullable Boolean aBool;')); @@ -288,7 +288,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public static class Api')); @@ -328,7 +328,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(matches('=.*doSomething'))); @@ -368,7 +368,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Reply')); @@ -402,7 +402,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Output doSomething()')); @@ -436,7 +436,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doSomething(@NonNull Reply')); @@ -461,7 +461,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public static final class Foobar')); @@ -486,7 +486,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public static final class Foobar')); @@ -528,7 +528,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public class Messages')); @@ -585,7 +585,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public interface Api')); @@ -642,7 +642,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public static class Api')); @@ -681,7 +681,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public enum Enum1')); @@ -726,7 +726,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('public enum Foo')); @@ -752,7 +752,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, startsWith('// hello world')); @@ -784,7 +784,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Foobar')); @@ -818,7 +818,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Foobar')); @@ -854,7 +854,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doit(@NonNull List arg')); @@ -889,7 +889,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doit(@NonNull List arg')); @@ -920,7 +920,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('List doit(')); @@ -952,7 +952,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doit(@NonNull Reply> callback)')); @@ -981,7 +981,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doit(@NonNull Reply callback)')); @@ -1017,7 +1017,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Messages')); @@ -1054,7 +1054,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('Object xArg = args.get(0)')); @@ -1086,7 +1086,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Messages')); @@ -1124,7 +1124,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1156,7 +1156,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(RegExp(r'@Nullable\s*Long doit\(\);'))); @@ -1186,7 +1186,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); // Java doesn't accept nullability annotations in type arguments. @@ -1220,7 +1220,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(' void doit(@Nullable Long foo);')); @@ -1253,7 +1253,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1290,7 +1290,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1321,7 +1321,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@javax.annotation.Generated("dev.flutter.pigeon")')); @@ -1344,7 +1344,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, @@ -1432,7 +1432,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); for (final String comment in comments) { @@ -1478,7 +1478,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains(' extends StandardMessageCodec'))); @@ -1528,7 +1528,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(' extends StandardMessageCodec')); @@ -1549,7 +1549,7 @@ void main() { javaOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class FlutterError')); diff --git a/packages/pigeon/test/kotlin_generator_test.dart b/packages/pigeon/test/kotlin_generator_test.dart index e3bf5a13cda..b2e9d65f333 100644 --- a/packages/pigeon/test/kotlin_generator_test.dart +++ b/packages/pigeon/test/kotlin_generator_test.dart @@ -34,7 +34,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('data class Foobar (')); @@ -63,7 +63,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum class Foobar(val raw: Int) {')); @@ -112,7 +112,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum class Foo(val raw: Int) {')); @@ -151,7 +151,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum class Foo(val raw: Int) {')); @@ -203,7 +203,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('interface Api')); @@ -354,7 +354,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('val aBool: Boolean')); @@ -428,7 +428,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, @@ -471,7 +471,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(matches('.*doSomething(.*) ->'))); @@ -513,7 +513,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('callback: () -> Unit')); @@ -548,7 +548,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doSomething(): Output')); @@ -585,7 +585,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doSomething(callback: (Output) -> Unit)')); @@ -611,7 +611,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('data class Foobar')); @@ -637,7 +637,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('data class Foobar')); @@ -681,7 +681,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('data class Outer')); @@ -740,7 +740,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('interface Api')); @@ -794,7 +794,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Api')); @@ -833,7 +833,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum class Enum1(val raw: Int)')); @@ -856,7 +856,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, startsWith('// hello world')); @@ -889,7 +889,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('data class Foobar')); @@ -924,7 +924,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('data class Foobar')); @@ -961,7 +961,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doit(arg: List')); @@ -997,7 +997,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doit(argArg: List')); @@ -1028,7 +1028,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doit(): List')); @@ -1061,7 +1061,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doit(callback: (List) -> Unit')); @@ -1095,7 +1095,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun add(x: Long, y: Long): Long')); @@ -1138,7 +1138,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('val channel = BasicMessageChannel')); @@ -1173,7 +1173,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doit(): Long?')); @@ -1203,7 +1203,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doit(callback: (Result) -> Unit')); @@ -1236,7 +1236,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1272,7 +1272,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('fun doit(fooArg: Long?, callback: () -> Unit')); @@ -1313,7 +1313,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('val input: String\n')); @@ -1400,7 +1400,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); for (final String comment in comments) { @@ -1446,7 +1446,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains(' : StandardMessageCodec() '))); @@ -1496,7 +1496,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(' : StandardMessageCodec() ')); @@ -1522,7 +1522,7 @@ void main() { kotlinOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class SomeError')); diff --git a/packages/pigeon/test/objc_generator_test.dart b/packages/pigeon/test/objc_generator_test.dart index b852066f25f..3d30cc9ba57 100644 --- a/packages/pigeon/test/objc_generator_test.dart +++ b/packages/pigeon/test/objc_generator_test.dart @@ -30,7 +30,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); @@ -56,7 +56,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('#import "foo.h"')); @@ -84,7 +84,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('typedef NS_ENUM(NSUInteger, Enum1) {')); @@ -113,7 +113,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('typedef NS_ENUM(NSUInteger, PREFIXEnum1) {')); @@ -160,7 +160,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('#import "foo.h"')); @@ -204,7 +204,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('typedef NS_ENUM(NSUInteger, ACFoo)')); @@ -221,7 +221,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -295,7 +295,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@property(nonatomic, assign) Enum1 enum1')); @@ -338,7 +338,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface Input')); @@ -389,7 +389,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('#import "foo.h"')); @@ -448,7 +448,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); @@ -487,7 +487,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@implementation Foobar')); @@ -519,7 +519,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, @@ -550,7 +550,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -580,7 +580,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface ABCFoobar')); @@ -605,7 +605,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@implementation ABCFoobar')); @@ -650,7 +650,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('property.*ABCInput')); @@ -697,7 +697,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('ABCInput fromList')); @@ -744,7 +744,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface Api : NSObject')); @@ -795,7 +795,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@implementation Api')); @@ -837,7 +837,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('(void)doSomething:')); @@ -877,7 +877,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(matches('=.*doSomething'))); @@ -919,7 +919,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('completion:(void (^)(FlutterError *_Nullable))')); @@ -959,7 +959,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('completion:(void (^)(FlutterError *_Nullable))')); @@ -994,7 +994,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('ABCOutput.*doSomethingWithError:[(]FlutterError')); @@ -1028,7 +1028,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('output.*=.*api doSomethingWithError:&error')); @@ -1062,7 +1062,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1099,7 +1099,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1128,7 +1128,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); @@ -1154,7 +1154,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); @@ -1186,7 +1186,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); @@ -1226,7 +1226,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('(NSDictionary *)foo')); @@ -1272,7 +1272,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1322,7 +1322,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1360,7 +1360,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1391,7 +1391,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1441,7 +1441,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1490,7 +1490,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1521,7 +1521,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1559,7 +1559,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1588,7 +1588,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, startsWith('// hello world')); @@ -1610,7 +1610,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, startsWith('// hello world')); @@ -1647,7 +1647,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('NSArray * field1')); @@ -1688,7 +1688,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doitArg:(NSArray *)arg')); @@ -1706,7 +1706,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1751,7 +1751,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doitArg:(NSArray *)arg')); @@ -1769,7 +1769,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doitArg:(NSArray *)arg')); @@ -1817,7 +1817,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doitArg:(NSArray *> *)arg')); @@ -1855,7 +1855,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1874,7 +1874,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('NSArray *output =')); @@ -1912,7 +1912,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1931,7 +1931,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1971,7 +1971,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1992,7 +1992,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('NSArray *args = message;')); @@ -2038,7 +2038,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -2059,7 +2059,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('NSArray *args = message;')); @@ -2103,7 +2103,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -2124,7 +2124,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -2179,7 +2179,7 @@ void main() { generatorOptions, divideRoot, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('divideValue:.*by:.*error.*;')); @@ -2197,7 +2197,7 @@ void main() { generatorOptions, divideRoot, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('divideValue:.*by:.*error.*;')); @@ -2219,7 +2219,7 @@ void main() { generatorOptions, divideRoot, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('divideValue:.*by:.*completion.*;')); @@ -2237,7 +2237,7 @@ void main() { generatorOptions, divideRoot, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches('divideValue:.*by:.*completion.*{')); @@ -2263,7 +2263,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('@interface Foobar')); @@ -2297,7 +2297,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -2333,7 +2333,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches(r'doitWithCompletion.*NSNumber \*_Nullable')); @@ -2366,7 +2366,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, matches(r'nullable NSNumber.*doitWithError')); @@ -2404,7 +2404,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doitFoo:(nullable NSNumber *)foo')); @@ -2421,7 +2421,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, @@ -2461,7 +2461,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('doitFoo:(nullable NSNumber *)foo')); @@ -2478,7 +2478,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('- (void)doitFoo:(nullable NSNumber *)arg_foo')); @@ -2513,7 +2513,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -2608,7 +2608,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); for (final String comment in comments) { @@ -2654,7 +2654,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains(' : FlutterStandardReader'))); @@ -2707,7 +2707,7 @@ void main() { generatorOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(' : FlutterStandardReader')); diff --git a/packages/pigeon/test/swift_generator_test.dart b/packages/pigeon/test/swift_generator_test.dart index 4c53dc332ff..2870f5788e4 100644 --- a/packages/pigeon/test/swift_generator_test.dart +++ b/packages/pigeon/test/swift_generator_test.dart @@ -33,7 +33,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('struct Foobar')); @@ -62,7 +62,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum Foobar: Int')); @@ -96,7 +96,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum Foo: Int')); @@ -145,7 +145,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('protocol Api')); @@ -214,7 +214,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('var aBool: Bool? = nil')); @@ -269,7 +269,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Api')); @@ -310,7 +310,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(matches('.*doSomething(.*) ->'))); @@ -350,7 +350,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('completion: @escaping () -> Void')); @@ -384,7 +384,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func doSomething() throws -> Output')); @@ -419,7 +419,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, @@ -445,7 +445,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('struct Foobar')); @@ -470,7 +470,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('struct Foobar')); @@ -512,7 +512,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('struct Outer')); @@ -566,7 +566,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('protocol Api')); @@ -617,7 +617,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('class Api')); @@ -655,7 +655,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('enum Enum1: Int')); @@ -678,7 +678,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, startsWith('// hello world')); @@ -710,7 +710,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('struct Foobar')); @@ -744,7 +744,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('struct Foobar')); @@ -780,7 +780,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func doit(arg: [Int64?]')); @@ -815,7 +815,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func doit(arg argArg: [Int64?]')); @@ -846,7 +846,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func doit() throws -> [Int64?]')); @@ -879,7 +879,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -914,7 +914,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func add(x: Int64, y: Int64) throws -> Int64')); @@ -957,7 +957,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('let channel = FlutterBasicMessageChannel')); @@ -997,7 +997,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func doit() throws -> Int64?')); @@ -1027,7 +1027,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1063,7 +1063,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1099,7 +1099,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect( @@ -1141,7 +1141,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('var input: String\n')); @@ -1228,7 +1228,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); for (final String comment in comments) { @@ -1270,7 +1270,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, isNot(contains(': FlutterStandardReader '))); @@ -1319,7 +1319,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains(': FlutterStandardReader ')); @@ -1362,7 +1362,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func setValue(_ value: Int64, for key: String)')); @@ -1398,7 +1398,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func removeValue(key: String)')); @@ -1426,7 +1426,7 @@ void main() { swiftOptions, root, sink, - packageName: DEFAULT_PACKAGE_NAME, + dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); expect(code, contains('func removeAll()')); diff --git a/packages/pigeon/tool/shared/generation.dart b/packages/pigeon/tool/shared/generation.dart index ae4c90b7ff2..825f395e23a 100644 --- a/packages/pigeon/tool/shared/generation.dart +++ b/packages/pigeon/tool/shared/generation.dart @@ -103,7 +103,7 @@ Future generateTestPigeons({required String baseDir}) async { : '$outputBase/windows/pigeon/$input.gen.cpp', cppNamespace: '${input}_pigeontest', suppressVersion: true, - packageName: 'pigeon_integration_tests', + dartPackageName: 'pigeon_integration_tests', ); if (generateCode != 0) { return generateCode; @@ -118,7 +118,7 @@ Future generateTestPigeons({required String baseDir}) async { ? null : '$outputBase/macos/Classes/$pascalCaseName.gen.swift', suppressVersion: true, - packageName: 'pigeon_integration_tests', + dartPackageName: 'pigeon_integration_tests', ); if (generateCode != 0) { return generateCode; @@ -143,7 +143,7 @@ Future generateTestPigeons({required String baseDir}) async { ? null : '$alternateOutputBase/ios/Classes/$pascalCaseName.gen.m', suppressVersion: true, - packageName: 'pigeon_integration_tests', + dartPackageName: 'pigeon_integration_tests', ); if (generateCode != 0) { return generateCode; @@ -161,7 +161,7 @@ Future generateTestPigeons({required String baseDir}) async { ? null : '$alternateOutputBase/macos/Classes/$pascalCaseName.gen.m', suppressVersion: true, - packageName: 'pigeon_integration_tests', + dartPackageName: 'pigeon_integration_tests', ); if (generateCode != 0) { return generateCode; @@ -189,7 +189,7 @@ Future runPigeon({ bool suppressVersion = false, String copyrightHeader = './copyright_header.txt', String? basePath, - String? packageName, + String? dartPackageName, }) async { // Temporarily suppress the version output via the global flag if requested. // This is done because having the version in all the generated test output @@ -223,7 +223,7 @@ Future runPigeon({ swiftOut: swiftOut, swiftOptions: const SwiftOptions(), basePath: basePath, - packageName: packageName, + dartPackageName: dartPackageName, )); includeVersionInGeneratedWarning = originalWarningSetting; return result;