move interface

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

@@ -8,7 +8,7 @@
 
 #import <OCMock/OCMock.h>
 #import <video_player_avfoundation/AVAssetTrackUtils.h>
-#import <video_player_avfoundation/FLTVideoPlayerPlugin_test.h>
+#import <video_player_avfoundation/FLTVideoPlayerPlugin_Test.h>
 
 @interface FLTVideoPlayer : NSObject <FlutterStreamHandler>
 @property(readonly, nonatomic) AVPlayer *player;
@@ -78,7 +78,12 @@ - (void)seekToTime:(CMTime)time
 
 @end
 
-@implementation AVPlayerFactory
+
+@interface AVPlayerFactoryFake : NSObject <AVPlayerFactoryProtocol>
+
+@end
+
+@implementation AVPlayerFactoryFake
 - (AVPlayer *)playerWithPlayerItem:(AVPlayerItem *)playerItem {
   return [AVPlayerMock playerWithPlayerItem:playerItem];
 }
@@ -254,7 +259,7 @@ - (void)testSeekToleranceWhenSeekingToEndFix {
   NSObject<FlutterPluginRegistry> *registry =
       (NSObject<FlutterPluginRegistry> *)[[UIApplication sharedApplication] delegate];
   NSObject<FlutterPluginRegistrar> *registrar = [registry registrarForPlugin:@"TestSeekTolerance"];
-    FLTVideoPlayerPlugin *pluginWithMockAVPlayer = [[FLTVideoPlayerPlugin alloc] initWithAVPlayerFactory:[[AVPlayerFactory alloc] init] registrar: registrar];
+    FLTVideoPlayerPlugin *pluginWithMockAVPlayer = [[FLTVideoPlayerPlugin alloc] initWithAVPlayerFactory:[[AVPlayerFactoryFake alloc] init] registrar: registrar];
 
     FlutterError *error;
   [pluginWithMockAVPlayer initialize:&error];

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

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #import "FLTVideoPlayerPlugin.h"
-#import "FLTVideoPlayerPlugin_test.h"
+#import "FLTVideoPlayerPlugin_Test.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <GLKit/GLKit.h>
@@ -34,6 +34,16 @@ - (void)onDisplayLink:(CADisplayLink *)link {
 }
 @end
 
+@interface AVPlayerFactory : NSObject <AVPlayerFactoryProtocol>
+@end
+
+@implementation AVPlayerFactory
+- (AVPlayer *)playerWithPlayerItem:(AVPlayerItem *)playerItem {
+  return [AVPlayer playerWithPlayerItem:playerItem];
+}
+
+@end
+
 @interface FLTVideoPlayer : NSObject <FlutterTexture, FlutterStreamHandler>
 @property(readonly, nonatomic) AVPlayer *player;
 @property(readonly, nonatomic) AVPlayerItemVideoOutput *videoOutput;
@@ -54,7 +64,7 @@ @interface FLTVideoPlayer : NSObject <FlutterTexture, FlutterStreamHandler>
 - (instancetype)initWithURL:(NSURL *)url
                frameUpdater:(FLTFrameUpdater *)frameUpdater
                 httpHeaders:(nonnull NSDictionary<NSString *, NSString *> *)headers
-              playerFactory:(AVPlayerFactory *)playerFactory;
+              playerFactory:(id<AVPlayerFactoryProtocol> *)playerFactory;
 @end
 
 static void *timeRangeContext = &timeRangeContext;
@@ -69,7 +79,7 @@ - (instancetype)initWithURL:(NSURL *)url
 @implementation FLTVideoPlayer
 - (instancetype)initWithAsset:(NSString *)asset
                  frameUpdater:(FLTFrameUpdater *)frameUpdater
-                playerFactory:(AVPlayerFactory *)playerFactory {
+                playerFactory:(id<AVPlayerFactoryProtocol> *)playerFactory {
   NSString *path = [[NSBundle mainBundle] pathForResource:asset ofType:nil];
   return [self initWithURL:[NSURL fileURLWithPath:path]
               frameUpdater:frameUpdater
@@ -211,7 +221,7 @@ - (void)createVideoOutputAndDisplayLink:(FLTFrameUpdater *)frameUpdater {
 - (instancetype)initWithURL:(NSURL *)url
                frameUpdater:(FLTFrameUpdater *)frameUpdater
                 httpHeaders:(nonnull NSDictionary<NSString *, NSString *> *)headers
-              playerFactory:(AVPlayerFactory *)playerFactory {
+              playerFactory:(id<AVPlayerFactoryProtocol> *)playerFactory {
   NSDictionary<NSString *, id> *options = nil;
   if ([headers count] != 0) {
     options = @{@"AVURLAssetHTTPHeaderFieldsKey" : headers};
@@ -223,7 +233,7 @@ - (instancetype)initWithURL:(NSURL *)url
 
 - (instancetype)initWithPlayerItem:(AVPlayerItem *)item
                       frameUpdater:(FLTFrameUpdater *)frameUpdater
-                     playerFactory:(AVPlayerFactory *)playerFactory {
+                     playerFactory:(id<AVPlayerFactoryProtocol> *)playerFactory {
   self = [super init];
   NSAssert(self, @"super init cannot be nil");
 
@@ -707,10 +717,3 @@ - (void)setMixWithOthers:(FLTMixWithOthersMessage *)input
 }
 
 @end
-
-@implementation AVPlayerFactory
-- (AVPlayer *)playerWithPlayerItem:(AVPlayerItem *)playerItem {
-  return [AVPlayer playerWithPlayerItem:playerItem];
-}
-
-@end

packages/video_player/video_player_avfoundation/ios/Classes/FLTVideoPlayerPlugin_test.h → packages/video_player/video_player_avfoundation/ios/Classes/FLTVideoPlayerPlugin_Test.h

@@ -10,11 +10,8 @@
 - (AVPlayer *)playerWithPlayerItem:(AVPlayerItem *)playerItem;
 @end
 
-@interface AVPlayerFactory : NSObject <AVPlayerFactoryProtocol>
-@end
-
 @interface FLTVideoPlayerPlugin ()
 
-- (instancetype)initWithAVPlayerFactory:(AVPlayerFactory *)playerFactory
+- (instancetype)initWithAVPlayerFactory:(id<AVPlayerFactoryProtocol>)playerFactory
                               registrar:(NSObject<FlutterPluginRegistrar> *)registrar;
 @end