Refactored tests to expose private interface in separate test header.

Refactored the existing unit tests to expose private interfaces in a
separate test header instead of an inline interface. This was first
introduced in the google_sign_in plugin (flutter#4157) and after that also
applied in the camera plugin (flutter#4426) and the webview_flutter plugin
(flutter#4480).

Author: mvanbeusekom

packages/image_picker/image_picker/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.4+6
+
+* Refactores unit test to expose private interface via a separate test header instead of the inline declaration.
+
 ## 0.8.4+5
 
 * Improves the documentation on handling MainActivity being killed by the Android OS.

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

@@ -5,6 +5,7 @@
 #import "ImagePickerTestImages.h"
 
 @import image_picker;
+@import image_picker.Test;
 @import XCTest;
 #import <OCMock/OCMock.h>
 
@@ -21,12 +22,6 @@ - (UIViewController *)presentedViewController {
 
 @end
 
-@interface FLTImagePickerPlugin (Test)
-@property(copy, nonatomic) FlutterResult result;
-- (void)handleSavedPathList:(NSMutableArray *)pathList;
-- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker;
-@end
-
 @interface ImagePickerPluginTests : XCTestCase
 @property(readonly, nonatomic) id mockUIImagePicker;
 @property(readonly, nonatomic) id mockAVCaptureDevice;
@@ -49,7 +44,7 @@ - (void)testPluginPickImageDeviceBack {
   OCMStub(ClassMethod(
               [_mockUIImagePicker isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
       .andReturn(YES);
-
+  
   // AVAuthorizationStatusAuthorized is supported
   OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
       .andReturn(AVAuthorizationStatusAuthorized);
@@ -77,7 +72,7 @@ - (void)testPluginPickImageDeviceFront {
   OCMStub(ClassMethod([_mockUIImagePicker
               isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
       .andReturn(YES);
-
+  
   // AVAuthorizationStatusAuthorized is supported
   OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
       .andReturn(AVAuthorizationStatusAuthorized);
@@ -105,7 +100,7 @@ - (void)testPluginPickVideoDeviceBack {
   OCMStub(ClassMethod(
               [_mockUIImagePicker isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
       .andReturn(YES);
-
+  
   // AVAuthorizationStatusAuthorized is supported
   OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
       .andReturn(AVAuthorizationStatusAuthorized);
@@ -133,7 +128,7 @@ - (void)testPluginPickVideoDeviceFront {
   OCMStub(ClassMethod([_mockUIImagePicker
               isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
       .andReturn(YES);
-
+  
   // AVAuthorizationStatusAuthorized is supported
   OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
       .andReturn(AVAuthorizationStatusAuthorized);

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

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #import "FLTImagePickerPlugin.h"
+#import "FLTImagePickerPlugin_Test.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <MobileCoreServices/MobileCoreServices.h>
@@ -21,8 +22,6 @@ @interface FLTImagePickerPlugin () <UINavigationControllerDelegate,
                                     PHPickerViewControllerDelegate,
                                     UIAdaptivePresentationControllerDelegate>
 
-@property(copy, nonatomic) FlutterResult result;
-
 @property(assign, nonatomic) int maxImagesAllowed;
 
 @property(copy, nonatomic) NSDictionary *arguments;

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

@@ -0,0 +1,16 @@
+// 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.
+
+// This header is available in the Test module. Import via "@import image_picker.Test;"
+
+#import <image_picker/FLTImagePickerPlugin.h>
+
+/// Methods exposed for unit testing.
+@interface FLTImagePickerPlugin ()
+
+@property(copy, nonatomic) FlutterResult result;
+- (void)handleSavedPathList:(NSArray *)pathList;
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker;
+
+@end

packages/image_picker/image_picker/ios/Classes/ImagePickerPlugin.modulemap

@@ -0,0 +1,10 @@
+framework module image_picker {
+  umbrella header "image_picker-umbrella.h"
+  
+  export *
+  module * { export * }
+
+  explicit module Test {
+    header "FLTImagePickerPlugin_Test.h"
+  }
+}

packages/image_picker/image_picker/ios/Classes/image_picker-umbrella.h

@@ -0,0 +1,10 @@
+// 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 <Foundation/Foundation.h>
+#import <image_picker/FLTImagePickerImageUtil.h>
+#import <image_picker/FLTImagePickerMetaDataUtil.h>
+#import <image_picker/FLTImagePickerPhotoAssetUtil.h>
+#import <image_picker/FLTImagePickerPlugin.h>
+#import <image_picker/FLTPHPickerSaveImageToPathOperation.h>

packages/image_picker/image_picker/ios/image_picker.podspec

@@ -14,8 +14,9 @@ Downloaded by pub (not CocoaPods).
   s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
   s.source           = { :http => 'https://github.com/flutter/plugins/tree/main/packages/image_picker' }
   s.documentation_url = 'https://pub.dev/packages/image_picker'
-  s.source_files = 'Classes/**/*'
+  s.source_files = 'Classes/**/*.{h,m}'
   s.public_header_files = 'Classes/**/*.h'
+  s.module_map = 'Classes/ImagePickerPlugin.modulemap'
   s.dependency 'Flutter'
   s.platform = :ios, '9.0'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }

packages/image_picker/image_picker/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/main/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.4+5
+version: 0.8.4+6
 
 environment:
   sdk: ">=2.14.0 <3.0.0"