[camera] Run iOS methods on UI thread by default

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.1+5
+
+* Fix registerTexture and result being called on background thread on iOS. 
+
 ## 0.8.1+4
 
 * Silenced warnings that may occur during build when using a very

packages/camera/camera/example/ios/Runner.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		033B94BE269C40A200B4DF97 /* CameraMethodChannelTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 033B94BD269C40A200B4DF97 /* CameraMethodChannelTests.m */; };
 		03BB766B2665316900CE5A93 /* CameraFocusTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03BB766A2665316900CE5A93 /* CameraFocusTests.m */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		334733EA2668111C00DCC49E /* CameraOrientationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03BB767226653ABE00CE5A93 /* CameraOrientationTests.m */; };
@@ -44,6 +45,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		033B94BD269C40A200B4DF97 /* CameraMethodChannelTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CameraMethodChannelTests.m; sourceTree = "<group>"; };
 		03BB76682665316900CE5A93 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		03BB766A2665316900CE5A93 /* CameraFocusTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CameraFocusTests.m; sourceTree = "<group>"; };
 		03BB766C2665316900CE5A93 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -96,6 +98,7 @@
 				03BB766A2665316900CE5A93 /* CameraFocusTests.m */,
 				03BB767226653ABE00CE5A93 /* CameraOrientationTests.m */,
 				03BB766C2665316900CE5A93 /* Info.plist */,
+				033B94BD269C40A200B4DF97 /* CameraMethodChannelTests.m */,
 			);
 			path = RunnerTests;
 			sourceTree = "<group>";
@@ -358,6 +361,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				033B94BE269C40A200B4DF97 /* CameraMethodChannelTests.m in Sources */,
 				03BB766B2665316900CE5A93 /* CameraFocusTests.m in Sources */,
 				334733EA2668111C00DCC49E /* CameraOrientationTests.m in Sources */,
 			);

packages/camera/camera/example/ios/RunnerTests/CameraMethodChannelTests.m

@@ -0,0 +1,101 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@import camera;
+@import XCTest;
+@import AVFoundation;
+#import <OCMock/OCMock.h>
+
+@interface FLTThreadSafeFlutterResult : NSObject
+@property(readonly, nonatomic) FlutterResult flutterResult;
+@end
+
+@interface MockFLTThreadSafeFlutterResult : FLTThreadSafeFlutterResult
+@property(readonly, nonatomic) NSNotificationCenter *notificationCenter;
+@property(nonatomic, nullable) id receivedResult;
+@end
+
+@implementation MockFLTThreadSafeFlutterResult
+/**
+ Initialize with a notification center.
+ */
+- (id)initWithNotificationCenter:(NSNotificationCenter *)notificationCenter {
+  self = [super init];
+  _notificationCenter = notificationCenter;
+  return self;
+}
+
+/**
+ Called when result is successful. Sends "successWithData" to the notification center.
+ */
+- (void)successWithData:(id)data {
+  _receivedResult = data;
+  [self->_notificationCenter postNotificationName:@"successWithData" object:nil];
+}
+@end
+
+@interface CameraPlugin (Test)
+- (void)handleMethodCallWithThreadSafeResult:(FlutterMethodCall *)call
+                                      result:(FLTThreadSafeFlutterResult *)result;
+@end
+
+@interface CameraMethodChannelTests : XCTestCase
+@property(readonly, nonatomic) CameraPlugin *camera;
+@property(readonly, nonatomic) MockFLTThreadSafeFlutterResult *resultObject;
+@property(readonly, nonatomic) NSNotificationCenter *notificationCenter;
+@end
+
+@implementation CameraMethodChannelTests
+
+- (void)setUp {
+  _camera = [[CameraPlugin alloc] init];
+  _notificationCenter = [[NSNotificationCenter alloc] init];
+
+  // Setup mocks for initWithCameraName method
+  id avCaptureDeviceInputMock = OCMClassMock([AVCaptureDeviceInput class]);
+  OCMStub([avCaptureDeviceInputMock deviceInputWithDevice:[OCMArg any] error:[OCMArg anyObjectRef]])
+      .andReturn([AVCaptureInput alloc]);
+
+  id avCaptureSessionMock = OCMClassMock([AVCaptureSession class]);
+  OCMStub([avCaptureSessionMock alloc]).andReturn(avCaptureSessionMock);
+  OCMStub([avCaptureSessionMock canSetSessionPreset:[OCMArg any]]).andReturn(YES);
+
+  _resultObject =
+      [[MockFLTThreadSafeFlutterResult alloc] initWithNotificationCenter:_notificationCenter];
+}
+
+- (void)tearDown {
+  // Put teardown code here. This method is called after the invocation of each test method in the
+  // class.
+}
+
+- (void)testCreate_ShouldCallResultOnMainThread {
+  // Setup method call
+  XCTNSNotificationExpectation *notificationExpectation =
+      [[XCTNSNotificationExpectation alloc] initWithName:@"successWithData"
+                                                  object:nil
+                                      notificationCenter:_notificationCenter];
+
+  FlutterMethodCall *call = [FlutterMethodCall
+      methodCallWithMethodName:@"create"
+                     arguments:@{@"resolutionPreset" : @"medium", @"enableAudio" : @(1)}];
+
+  // Call handleMethodCall
+  [_camera handleMethodCallWithThreadSafeResult:call result:_resultObject];
+
+  // Don't expect a result yet
+  XCTAssertNil(_resultObject.receivedResult);
+
+  [self waitForExpectations:[NSArray arrayWithObject:notificationExpectation] timeout:0.1];
+
+  // Expect a result after waiting for thread to switch
+  XCTAssertNotNil(_resultObject.receivedResult);
+
+  // Verify the result
+  NSDictionary *dictionaryResult = (NSDictionary *)_resultObject.receivedResult;
+  XCTAssertNotNil(dictionaryResult);
+  XCTAssert([[dictionaryResult allKeys] containsObject:@"cameraId"]);
+}
+
+@end