From 8980d79446d3196bbd0c1366ab67ab2a5f39da9d Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:33:17 -0800
Subject: [PATCH] [image_picker] Do not copy a static field into another static
 field (#3353)

---
 packages/image_picker/image_picker/CHANGELOG.md  |  4 ++++
 .../image_picker/lib/image_picker.dart           |  2 +-
 packages/image_picker/image_picker/pubspec.yaml  |  4 +++-
 .../image_picker/test/image_picker_test.dart     | 16 ++++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md
index 4c1553a8ccaf5..32d61cc796076 100644
--- a/packages/image_picker/image_picker/CHANGELOG.md
+++ b/packages/image_picker/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.7+19
+
+* Do not copy static field to another static field.
+
 ## 0.6.7+18
 
 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
diff --git a/packages/image_picker/image_picker/lib/image_picker.dart b/packages/image_picker/image_picker/lib/image_picker.dart
index 82c199e007f42..5c0683c3f29fe 100755
--- a/packages/image_picker/image_picker/lib/image_picker.dart
+++ b/packages/image_picker/image_picker/lib/image_picker.dart
@@ -27,7 +27,7 @@ export 'package:image_picker_platform_interface/image_picker_platform_interface.
 class ImagePicker {
   /// The platform interface that drives this plugin
   @visibleForTesting
-  static ImagePickerPlatform platform = ImagePickerPlatform.instance;
+  static ImagePickerPlatform get platform => ImagePickerPlatform.instance;
 
   /// Returns a [File] object pointing to the image that was picked.
   ///
diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index 29baaa0de5d58..377c3840c2d13 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
-version: 0.6.7+18
+version: 0.6.7+19
 
 flutter:
   plugin:
@@ -25,7 +25,9 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     path: ../../integration_test
+  mockito: ^4.1.3
   pedantic: ^1.8.0
+  plugin_platform_interface: ^1.0.3
 
 environment:
   sdk: ">=2.1.0 <3.0.0"
diff --git a/packages/image_picker/image_picker/test/image_picker_test.dart b/packages/image_picker/image_picker/test/image_picker_test.dart
index 0ada1b261363e..7172975ded5dc 100644
--- a/packages/image_picker/image_picker/test/image_picker_test.dart
+++ b/packages/image_picker/image_picker/test/image_picker_test.dart
@@ -5,6 +5,9 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
+import 'package:mockito/mockito.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -26,6 +29,15 @@ void main() {
       log.clear();
     });
 
+    test('ImagePicker platform instance overrides the actual platform used',
+        () {
+      final ImagePickerPlatform savedPlatform = ImagePickerPlatform.instance;
+      final MockPlatform mockPlatform = MockPlatform();
+      ImagePickerPlatform.instance = mockPlatform;
+      expect(ImagePicker.platform, mockPlatform);
+      ImagePickerPlatform.instance = savedPlatform;
+    });
+
     group('#pickImage', () {
       test('passes the image source argument correctly', () async {
         await picker.getImage(source: ImageSource.camera);
@@ -336,3 +348,7 @@ void main() {
     });
   });
 }
+
+class MockPlatform extends Mock
+    with MockPlatformInterfaceMixin
+    implements ImagePickerPlatform {}