From 5e18219f1bcfebde4c160985cd93f5fe5f93b802 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Wed, 26 Aug 2020 09:23:16 -0700 Subject: [PATCH 1/2] fix test channel --- .../CHANGELOG.md | 4 ++++ .../lib/messages.dart | 13 +++++++++++++ .../pubspec.yaml | 2 +- .../test/method_channel_video_player_test.dart | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/packages/video_player/video_player_platform_interface/CHANGELOG.md b/packages/video_player/video_player_platform_interface/CHANGELOG.md index 0920582abad0..2af6f01ffe88 100644 --- a/packages/video_player/video_player_platform_interface/CHANGELOG.md +++ b/packages/video_player/video_player_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.1.1 + +* Fix mixWithOthers test channel. + ## 2.1.0 * Add VideoPlayerOptions with audo mix mode diff --git a/packages/video_player/video_player_platform_interface/lib/messages.dart b/packages/video_player/video_player_platform_interface/lib/messages.dart index a75ece0db850..c5e8cd413b70 100644 --- a/packages/video_player/video_player_platform_interface/lib/messages.dart +++ b/packages/video_player/video_player_platform_interface/lib/messages.dart @@ -134,6 +134,7 @@ abstract class VideoPlayerApiTest { PositionMessage position(TextureMessage arg); void seekTo(PositionMessage arg); void pause(TextureMessage arg); + void setMixWithOthers(MixWithOthersMessage arg); } void VideoPlayerApiTestSetup(VideoPlayerApiTest api) { @@ -225,6 +226,18 @@ void VideoPlayerApiTestSetup(VideoPlayerApiTest api) { return {}; }); } + { + const BasicMessageChannel channel = BasicMessageChannel( + 'dev.flutter.pigeon.VideoPlayerApi.setMixWithOthers', + StandardMessageCodec()); + channel.setMockMessageHandler((dynamic message) async { + final Map mapMessage = message as Map; + final MixWithOthersMessage input = + MixWithOthersMessage._fromMap(mapMessage); + api.setMixWithOthers(input); + return {}; + }); + } } class VideoPlayerApi { diff --git a/packages/video_player/video_player_platform_interface/pubspec.yaml b/packages/video_player/video_player_platform_interface/pubspec.yaml index 4740605d7669..38bc6851f376 100644 --- a/packages/video_player/video_player_platform_interface/pubspec.yaml +++ b/packages/video_player/video_player_platform_interface/pubspec.yaml @@ -3,7 +3,7 @@ description: A common platform interface for the video_player plugin. homepage: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player_platform_interface # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.1.0 +version: 2.1.1 dependencies: flutter: diff --git a/packages/video_player/video_player_platform_interface/test/method_channel_video_player_test.dart b/packages/video_player/video_player_platform_interface/test/method_channel_video_player_test.dart index e7bcf26e9d26..185953163350 100644 --- a/packages/video_player/video_player_platform_interface/test/method_channel_video_player_test.dart +++ b/packages/video_player/video_player_platform_interface/test/method_channel_video_player_test.dart @@ -19,6 +19,7 @@ class _ApiLogger implements VideoPlayerApiTest { PositionMessage positionMessage; LoopingMessage loopingMessage; VolumeMessage volumeMessage; + MixWithOthersMessage mixWithOthersMessage; @override TextureMessage create(CreateMessage arg) { @@ -50,6 +51,12 @@ class _ApiLogger implements VideoPlayerApiTest { textureMessage = arg; } + @override + void setMixWithOthers(MixWithOthersMessage arg) { + log.add('setMixWithOthers'); + mixWithOthersMessage = arg; + } + @override PositionMessage position(TextureMessage arg) { log.add('position'); @@ -179,6 +186,16 @@ void main() { expect(log.textureMessage.textureId, 1); }); + test('setMixWithOthers', () async { + await player.setMixWithOthers(true); + expect(log.log.last, 'setMixWithOthers'); + expect(log.mixWithOthersMessage.mixWithOthers, true); + + await player.setMixWithOthers(false); + expect(log.log.last, 'setMixWithOthers'); + expect(log.mixWithOthersMessage.mixWithOthers, false); + }); + test('setVolume', () async { await player.setVolume(1, 0.7); expect(log.log.last, 'setVolume'); From 056c297a3e1686c6f075cd223655d56c4a771c13 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Wed, 26 Aug 2020 13:15:02 -0700 Subject: [PATCH 2/2] fix setWithOthers test --- packages/video_player/video_player/CHANGELOG.md | 4 ++++ packages/video_player/video_player/pubspec.yaml | 2 +- .../video_player/test/video_player_test.dart | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/video_player/video_player/CHANGELOG.md b/packages/video_player/video_player/CHANGELOG.md index ccc5a6393db0..35f50419f823 100644 --- a/packages/video_player/video_player/CHANGELOG.md +++ b/packages/video_player/video_player/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.12+2 + +* Fix `setMixWithOthers` test. + ## 0.10.12+1 * Depend on the version of `video_player_platform_interface` that contains the new `VideoPlayerOptions` class. diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml index d1072641223c..04c7c6ba3ddb 100644 --- a/packages/video_player/video_player/pubspec.yaml +++ b/packages/video_player/video_player/pubspec.yaml @@ -4,7 +4,7 @@ description: Flutter plugin for displaying inline video with other Flutter # 0.10.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.10.12+1 +version: 0.10.12+2 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player flutter: diff --git a/packages/video_player/video_player/test/video_player_test.dart b/packages/video_player/video_player/test/video_player_test.dart index 67722594989c..f2d4c35a1ce8 100644 --- a/packages/video_player/video_player/test/video_player_test.dart +++ b/packages/video_player/video_player/test/video_player_test.dart @@ -579,11 +579,11 @@ void main() { expect(colors.backgroundColor, backgroundColor); }); - test('setMixWithOthers', () { + test('setMixWithOthers', () async { final VideoPlayerController controller = VideoPlayerController.file( File(''), videoPlayerOptions: VideoPlayerOptions(mixWithOthers: true)); - controller.initialize(); + await controller.initialize(); expect(controller.videoPlayerOptions.mixWithOthers, true); }); } @@ -656,6 +656,11 @@ class FakeVideoPlayerPlatform extends VideoPlayerApiTest { void setVolume(VolumeMessage arg) { calls.add('setVolume'); } + + @override + void setMixWithOthers(MixWithOthersMessage arg) { + calls.add('setMixWithOthers'); + } } class FakeVideoEventStream {