From dd71e7be8edb95a7e65d4216fba4e8ea45baa89d Mon Sep 17 00:00:00 2001 From: xster Date: Thu, 5 Sep 2019 11:13:04 -0700 Subject: [PATCH] remove extra redundant channels setup in iOS embedding engine (#11886) --- .../ios/framework/Source/FlutterEngine.mm | 1 - .../ScenariosTests/FlutterEngineTest.m | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm index ad7cfc263ee5d..165315e11f8bc 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm @@ -93,7 +93,6 @@ - (instancetype)initWithName:(NSString*)labelPrefix _pluginPublications = [NSMutableDictionary new]; _platformViewsController.reset(new flutter::FlutterPlatformViewsController()); - [self setupChannels]; _binaryMessenger = [[FlutterBinaryMessengerRelay alloc] initWithParent:self]; NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; diff --git a/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterEngineTest.m b/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterEngineTest.m index 82c93a2033839..f875764e99e2b 100644 --- a/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterEngineTest.m +++ b/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterEngineTest.m @@ -28,4 +28,23 @@ - (void)testIsolateId { XCTAssertNil(engine.isolateId); } +- (void)testChannelSetup { + FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil]; + XCTAssertNil(engine.navigationChannel); + XCTAssertNil(engine.platformChannel); + XCTAssertNil(engine.lifecycleChannel); + + XCTAssertTrue([engine runWithEntrypoint:nil]); + + XCTAssertNotNil(engine.navigationChannel); + XCTAssertNotNil(engine.platformChannel); + XCTAssertNotNil(engine.lifecycleChannel); + + [engine destroyContext]; + + XCTAssertNil(engine.navigationChannel); + XCTAssertNil(engine.platformChannel); + XCTAssertNil(engine.lifecycleChannel); +} + @end