Merged in unit test refactoring

Author: mvanbeusekom

packages/image_picker/image_picker/CHANGELOG.md

@@ -1,9 +1,13 @@
-## 0.8.4+6
+## 0.8.4+7
 
 * Ensures the `result` callback and method call `arguments` send to iOS are 
 taken into consideration when picking multiple images on pre-iOS 14 devices;
-* Configures the `UIImagePicker` to default to gallery instead of camera on 
-pre-iOS 14 devices when picking multiple images on pre-iOS 14 devices.
+* Configures the `UIImagePicker` to default to gallery instead of camera when
+picking multiple images on pre-iOS 14 devices.
+
+## 0.8.4+6
+
+* Refactors unit test to expose private interface via a separate test header instead of the inline declaration.
 
 ## 0.8.4+5
 

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,13 +22,6 @@ - (UIViewController *)presentedViewController {
 
 @end
 
-@interface FLTImagePickerPlugin (Test)
-@property(copy, nonatomic) FlutterResult result;
-@property(copy, nonatomic) NSDictionary *arguments;
-- (void)handleSavedPathList:(NSMutableArray *)pathList;
-- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker;
-@end
-
 @interface ImagePickerPluginTests : XCTestCase
 @property(readonly, nonatomic) id mockUIImagePicker;
 @property(readonly, nonatomic) id mockAVCaptureDevice;

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,43 @@
+// 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 ()
+
+/** The Flutter result callback use to report results back to Flutter App. */
+@property(copy, nonatomic) FlutterResult result;
+
+/**
+ * Applies NSMutableArray on the FLutterResult.
+ *
+ * NSString must be returned by FlutterResult if the single image
+ * mode is active. It is checked by maxImagesAllowed and
+ * returns the first object of the pathlist.
+ *
+ * NSMutableArray must be returned by FlutterResult if the multi-image
+ * mode is active. After the pathlist count is checked then it returns
+ * the pathlist.
+ *
+ * @param pathList that should be applied to FlutterResult.
+ */
+- (void)handleSavedPathList:(NSArray *)pathList;
+
+/**
+ * Tells the delegate that the user cancelled the pick operation.
+ *
+ * Your delegate’s implementation of this method should dismiss the picker view
+ * by calling the dismissModalViewControllerAnimated: method of the parent
+ * view controller.
+ *
+ * Implementation of this method is optional, but expected.
+ *
+ * @param picker The controller object managing the image picker interface.
+ */
+-(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+6
+version: 0.8.4+7
 
 environment:
   sdk: ">=2.14.0 <3.0.0"

packages/video_player/video_player/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.17
+
+* Avoid blocking the main thread loading video count on iOS.
+
 ## 2.2.16
 
 * Introduces `setCaptionOffset` to offset the caption display based on a Duration.

packages/video_player/video_player/example/ios/RunnerTests/VideoPlayerTests.m

@@ -8,7 +8,7 @@
 
 #import <OCMock/OCMock.h>
 
-@interface FLTVideoPlayer : NSObject
+@interface FLTVideoPlayer : NSObject <FlutterStreamHandler>
 @property(readonly, nonatomic) AVPlayer *player;
 @end
 
@@ -70,4 +70,91 @@ - (void)testDeregistersFromPlayer {
   [self waitForExpectationsWithTimeout:1 handler:nil];
 }
 
+- (void)testVideoControls {
+  NSObject<FlutterPluginRegistry> *registry =
+      (NSObject<FlutterPluginRegistry> *)[[UIApplication sharedApplication] delegate];
+  NSObject<FlutterPluginRegistrar> *registrar = [registry registrarForPlugin:@"TestVideoControls"];
+
+  FLTVideoPlayerPlugin *videoPlayerPlugin =
+      (FLTVideoPlayerPlugin *)[[FLTVideoPlayerPlugin alloc] initWithRegistrar:registrar];
+
+  NSDictionary<NSString *, id> *videoInitialization =
+      [self testPlugin:videoPlayerPlugin
+                   uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"];
+  XCTAssertEqualObjects(videoInitialization[@"height"], @720);
+  XCTAssertEqualObjects(videoInitialization[@"width"], @1280);
+  XCTAssertEqualWithAccuracy([videoInitialization[@"duration"] intValue], 4000, 200);
+}
+
+- (void)testAudioControls {
+  NSObject<FlutterPluginRegistry> *registry =
+      (NSObject<FlutterPluginRegistry> *)[[UIApplication sharedApplication] delegate];
+  NSObject<FlutterPluginRegistrar> *registrar = [registry registrarForPlugin:@"TestAudioControls"];
+
+  FLTVideoPlayerPlugin *videoPlayerPlugin =
+      (FLTVideoPlayerPlugin *)[[FLTVideoPlayerPlugin alloc] initWithRegistrar:registrar];
+
+  NSDictionary<NSString *, id> *audioInitialization =
+      [self testPlugin:videoPlayerPlugin
+                   uri:@"https://cdn.pixabay.com/audio/2021/09/06/audio_bacd4d6020.mp3"];
+  XCTAssertEqualObjects(audioInitialization[@"height"], @0);
+  XCTAssertEqualObjects(audioInitialization[@"width"], @0);
+  // Perfect precision not guaranteed.
+  XCTAssertEqualWithAccuracy([audioInitialization[@"duration"] intValue], 68500, 200);
+}
+
+- (NSDictionary<NSString *, id> *)testPlugin:(FLTVideoPlayerPlugin *)videoPlayerPlugin
+                                         uri:(NSString *)uri {
+  FlutterError *error;
+  [videoPlayerPlugin initialize:&error];
+  XCTAssertNil(error);
+
+  FLTCreateMessage *create = [[FLTCreateMessage alloc] init];
+  create.uri = uri;
+  FLTTextureMessage *textureMessage = [videoPlayerPlugin create:create error:&error];
+
+  NSNumber *textureId = textureMessage.textureId;
+  FLTVideoPlayer *player = videoPlayerPlugin.playersByTextureId[textureId];
+  XCTAssertNotNil(player);
+
+  XCTestExpectation *initializedExpectation = [self expectationWithDescription:@"initialized"];
+  __block NSDictionary<NSString *, id> *initializationEvent;
+  [player onListenWithArguments:nil
+                      eventSink:^(NSDictionary<NSString *, id> *event) {
+                        if ([event[@"event"] isEqualToString:@"initialized"]) {
+                          initializationEvent = event;
+                          XCTAssertEqual(event.count, 4);
+                          [initializedExpectation fulfill];
+                        }
+                      }];
+  [self waitForExpectationsWithTimeout:1.0 handler:nil];
+
+  // Starts paused.
+  AVPlayer *avPlayer = player.player;
+  XCTAssertEqual(avPlayer.rate, 0);
+  XCTAssertEqual(avPlayer.volume, 1);
+  XCTAssertEqual(avPlayer.timeControlStatus, AVPlayerTimeControlStatusPaused);
+
+  // Change playback speed.
+  FLTPlaybackSpeedMessage *playback = [[FLTPlaybackSpeedMessage alloc] init];
+  playback.textureId = textureId;
+  playback.speed = @2;
+  [videoPlayerPlugin setPlaybackSpeed:playback error:&error];
+  XCTAssertNil(error);
+  XCTAssertEqual(avPlayer.rate, 2);
+  XCTAssertEqual(avPlayer.timeControlStatus, AVPlayerTimeControlStatusWaitingToPlayAtSpecifiedRate);
+
+  // Volume
+  FLTVolumeMessage *volume = [[FLTVolumeMessage alloc] init];
+  volume.textureId = textureId;
+  volume.volume = @(0.1);
+  [videoPlayerPlugin setVolume:volume error:&error];
+  XCTAssertNil(error);
+  XCTAssertEqual(avPlayer.volume, 0.1f);
+
+  [player onCancelWithArguments:nil];
+
+  return initializationEvent;
+}
+
 @end

packages/video_player/video_player/ios/Classes/FLTVideoPlayerPlugin.m

@@ -331,25 +331,44 @@ - (void)updatePlayingState {
 
 - (void)setupEventSinkIfReadyToPlay {
   if (_eventSink && !_isInitialized) {
-    BOOL hasVideoTracks =
-        [[self.player.currentItem.asset tracksWithMediaType:AVMediaTypeVideo] count] != 0;
-    CGSize size = [self.player currentItem].presentationSize;
+    AVPlayerItem *currentItem = self.player.currentItem;
+    CGSize size = currentItem.presentationSize;
     CGFloat width = size.width;
     CGFloat height = size.height;
 
+    // Wait until tracks are loaded to check duration or if there are any videos.
+    AVAsset *asset = currentItem.asset;
+    if ([asset statusOfValueForKey:@"tracks" error:nil] != AVKeyValueStatusLoaded) {
+      void (^trackCompletionHandler)(void) = ^{
+        if ([asset statusOfValueForKey:@"tracks" error:nil] != AVKeyValueStatusLoaded) {
+          // Cancelled, or something failed.
+          return;
+        }
+        // This completion block will run on an AVFoundation background queue.
+        // Hop back to the main thread to set up event sink.
+        [self performSelector:_cmd onThread:NSThread.mainThread withObject:self waitUntilDone:NO];
+      };
+      [asset loadValuesAsynchronouslyForKeys:@[ @"tracks" ]
+                           completionHandler:trackCompletionHandler];
+      return;
+    }
+
+    BOOL hasVideoTracks = [asset tracksWithMediaType:AVMediaTypeVideo].count != 0;
+
     // The player has not yet initialized when it contains video tracks.
     if (hasVideoTracks && height == CGSizeZero.height && width == CGSizeZero.width) {
       return;
     }
     // The player may be initialized but still needs to determine the duration.
-    if ([self duration] == 0) {
+    int64_t duration = [self duration];
+    if (duration == 0) {
       return;
     }
 
     _isInitialized = YES;
     _eventSink(@{
       @"event" : @"initialized",
-      @"duration" : @([self duration]),
+      @"duration" : @(duration),
       @"width" : @(width),
       @"height" : @(height)
     });

packages/video_player/video_player/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android, iOS, and web.
 repository: https://github.com/flutter/plugins/tree/main/packages/video_player/video_player
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.2.16
+version: 2.2.17
 
 environment:
   sdk: ">=2.14.0 <3.0.0"