Applied feedback from PR

Author: mvanbeusekom

packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m

@@ -22,6 +22,9 @@ - (UIViewController *)presentedViewController {
 
 @end
 
+// Set a long timeout to avoid flake due to slow CI.
+static const NSTimeInterval kTimeout = 30.0;
+
 @interface ImagePickerPluginTests : XCTestCase
 @property(readonly, nonatomic) id mockUIImagePicker;
 @property(readonly, nonatomic) id mockAVCaptureDevice;
@@ -146,6 +149,33 @@ - (void)testPluginPickVideoDeviceFront {
                  UIImagePickerControllerCameraDeviceFront);
 }
 
+- (void)testPickMultiImageShouldUseUIImagePickerControllerOnPreiOS14 {
+  if (@available(iOS 14, *)) {
+    return;
+  }
+  
+  id photoLibrary = OCMClassMock([PHPhotoLibrary class]);
+  OCMStub(ClassMethod([photoLibrary authorizationStatus]))
+    .andReturn(PHAuthorizationStatusAuthorized);
+  
+  FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
+  [plugin setImagePickerControllerOverride: _mockUIImagePicker];
+  FlutterMethodCall *call =
+      [FlutterMethodCall methodCallWithMethodName:@"pickMultiImage"
+                                        arguments:@{
+        @"maxWidth" : @(100),
+        @"maxHeight" : @(200),
+        @"imageQuality" : @(50),
+      }];
+  
+  [plugin handleMethodCall:call
+                    result:^(id _Nullable r){
+                    }];
+  
+  OCMVerify(times(1),
+            [self->_mockUIImagePicker setSourceType:UIImagePickerControllerSourceTypePhotoLibrary]);
+}
+
 #pragma mark - Test camera devices, no op on simulators
 
 - (void)testPluginPickImageDeviceCancelClickMultipleTimes {
@@ -167,61 +197,6 @@ - (void)testPluginPickImageDeviceCancelClickMultipleTimes {
   [plugin imagePickerControllerDidCancel:[plugin getImagePickerController]];
 }
 
-#pragma mark - Test that arguments and results are set for all method calls
-- (void)testPickImageShouldSetArgumentsAndResult {
-  FlutterResult expectedResult = ^(id _Nullable r) {
-  };
-  NSDictionary *expectedArguments =
-      @{@"source" : @(1), @"maxWidth" : @(200), @"maxHeight" : @(200), @"imageQuality" : @(50)};
-
-  // Run test
-  FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
-  FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"pickImage"
-                                                              arguments:expectedArguments];
-
-  [plugin handleMethodCall:call result:expectedResult];
-
-  XCTAssertEqual(plugin.result, expectedResult);
-  XCTAssertEqual(plugin.arguments, expectedArguments);
-}
-
-- (void)testPickMultiImageShouldSetArgumentsAndResult {
-  FlutterResult expectedResult = ^(id _Nullable r) {
-  };
-  NSDictionary *expectedArguments =
-      @{@"maxWidth" : @(200), @"maxHeight" : @(200), @"imageQuality" : @(50)};
-
-  // Run test
-  FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
-  FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"pickMultiImage"
-                                                              arguments:expectedArguments];
-
-  [plugin handleMethodCall:call result:expectedResult];
-
-  XCTAssertEqual(plugin.result, expectedResult);
-  XCTAssertEqual(plugin.arguments, expectedArguments);
-}
-
-- (void)testPickVideoShouldSetArgumentsAndResult {
-  // AVAuthorizationStatusAuthorized is supported
-  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
-      .andReturn(AVAuthorizationStatusAuthorized);
-
-  FlutterResult expectedResult = ^(id _Nullable r) {
-  };
-  NSDictionary *expectedArguments = @{@"source" : @(1), @"maxDuration" : @(200)};
-
-  // Run test
-  FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
-  FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"pickVideo"
-                                                              arguments:expectedArguments];
-
-  [plugin handleMethodCall:call result:expectedResult];
-
-  XCTAssertEqual(plugin.result, expectedResult);
-  XCTAssertEqual(plugin.arguments, expectedArguments);
-}
-
 #pragma mark - Test video duration
 
 - (void)testPickingVideoWithDuration {

packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m

@@ -18,7 +18,7 @@
 #import "FLTPHPickerSaveImageToPathOperation.h"
 
 @interface FLTImagePickerPlugin () <UINavigationControllerDelegate,
-                                    UIImagePickerControllerDelegate,
+UIImagePickerControllerDelegate,
                                     PHPickerViewControllerDelegate,
                                     UIAdaptivePresentationControllerDelegate>
 
@@ -36,6 +36,7 @@ @interface FLTImagePickerPlugin () <UINavigationControllerDelegate,
 typedef NS_ENUM(NSInteger, ImagePickerClassType) { UIImagePickerClassType, PHPickerClassType };
 
 @implementation FLTImagePickerPlugin {
+  UIImagePickerController *_imagePickerControllerOverride;
   UIImagePickerController *_imagePickerController;
 }
 
@@ -47,10 +48,32 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 
+/**
+ * Initializes the _imagePickerController member with a new instance of the
+ * UIImagePickerController class.
+ *
+ * A new instance of the UIImagePickerController is created every time the
+ * initImagePickerController method is called. For testing purposes this can
+ * be overriden using the setImagePickerControllerOverride method, in which
+ * case the set instance of the UIImagePickerController is used to initialize
+ * the _imagePickerController member.
+ */
+- (void)initImagePickerController {
+  if (_imagePickerControllerOverride) {
+    _imagePickerController = _imagePickerControllerOverride;
+  } else {
+    _imagePickerController = [[UIImagePickerController alloc] init];
+  }
+}
+
 - (UIImagePickerController *)getImagePickerController {
   return _imagePickerController;
 }
 
+- (void)setImagePickerControllerOverride:(UIImagePickerController *)imagePickerController {
+  _imagePickerControllerOverride = imagePickerController;
+}
+
 - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
   UIWindow *windowToUse = window;
   if (windowToUse == nil) {
@@ -106,7 +129,7 @@ - (void)pickImageWithUIImagePicker {
 }
 
 - (void)launchUIImagePickerWithSource:(int)imageSource {
-  _imagePickerController = [[UIImagePickerController alloc] init];
+  [self initImagePickerController];
   _imagePickerController.modalPresentationStyle = UIModalPresentationCurrentContext;
   _imagePickerController.delegate = self;
   _imagePickerController.mediaTypes = @[ (NSString *)kUTTypeImage ];
@@ -160,7 +183,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
       [self launchUIImagePickerWithSource:SOURCE_GALLERY];
     }
   } else if ([@"pickVideo" isEqualToString:call.method]) {
-    _imagePickerController = [[UIImagePickerController alloc] init];
+    [self initImagePickerController];
     _imagePickerController.modalPresentationStyle = UIModalPresentationCurrentContext;
     _imagePickerController.delegate = self;
     _imagePickerController.mediaTypes = @[

packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin_Test.h

@@ -40,4 +40,11 @@
  */
 -(void)imagePickerControllerDidCancel : (UIImagePickerController *)picker;
 
+/**
+ * Sets the UIImagePickerController instance that should be used by the
+ * image_picker plugin.
+ *
+ * Should be used for testing purposes only. 
+ */
+- (void)setImagePickerControllerOverride:(UIImagePickerController *)imagePickerController;
 @end