From 44606585be8094a152812716626e77abde3f4343 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 22 Aug 2019 14:52:01 -0700
Subject: [PATCH 1/3] Fix unit tests by calling
 TestWidgetsFlutterBinding.ensureInitialized()

---
 packages/cloud_firestore/test/cloud_firestore_test.dart        | 1 +
 packages/cloud_functions/test/cloud_functions_test.dart        | 1 +
 packages/firebase_admob/test/firebase_admob_test.dart          | 1 +
 packages/firebase_analytics/example/pubspec.yaml               | 3 ++-
 packages/firebase_analytics/test/firebase_analytics_test.dart  | 1 +
 packages/firebase_analytics/test/observer_test.dart            | 1 +
 packages/firebase_auth/test/firebase_auth_test.dart            | 1 +
 packages/firebase_core/test/firebase_core_test.dart            | 1 +
 .../firebase_crashlytics/test/firebase_crashlytics_test.dart   | 1 +
 packages/firebase_database/test/firebase_database_test.dart    | 1 +
 packages/firebase_database/test/firebase_list_test.dart        | 1 +
 .../test/firebase_dynamic_links_test.dart                      | 1 +
 packages/firebase_messaging/test/firebase_messaging_test.dart  | 1 +
 packages/firebase_ml_vision/test/firebase_ml_vision_test.dart  | 1 +
 packages/firebase_ml_vision/test/image_labeler_test.dart       | 1 +
 .../firebase_performance/test/firebase_performance_test.dart   | 1 +
 .../test/firebase_remote_config_test.dart                      | 1 +
 packages/firebase_storage/test/firebase_storage_test.dart      | 1 +
 18 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/cloud_firestore/test/cloud_firestore_test.dart b/packages/cloud_firestore/test/cloud_firestore_test.dart
index c68f04405009..a765c69de29e 100755
--- a/packages/cloud_firestore/test/cloud_firestore_test.dart
+++ b/packages/cloud_firestore/test/cloud_firestore_test.dart
@@ -11,6 +11,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$Firestore', () {
     int mockHandleId = 0;
     FirebaseApp app;
diff --git a/packages/cloud_functions/test/cloud_functions_test.dart b/packages/cloud_functions/test/cloud_functions_test.dart
index 6e58c422423f..d6685f3f2672 100644
--- a/packages/cloud_functions/test/cloud_functions_test.dart
+++ b/packages/cloud_functions/test/cloud_functions_test.dart
@@ -8,6 +8,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$CloudFunctions', () {
     final List<MethodCall> log = <MethodCall>[];
 
diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart
index 4d85664fa614..9258891a3086 100644
--- a/packages/firebase_admob/test/firebase_admob_test.dart
+++ b/packages/firebase_admob/test/firebase_admob_test.dart
@@ -9,6 +9,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('FirebaseAdMob', () {
     const MethodChannel channel =
         MethodChannel('plugins.flutter.io/firebase_admob');
diff --git a/packages/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/example/pubspec.yaml
index 2207a8ecb318..4fe3df3cfff7 100755
--- a/packages/firebase_analytics/example/pubspec.yaml
+++ b/packages/firebase_analytics/example/pubspec.yaml
@@ -6,7 +6,8 @@ dependencies:
     sdk: flutter
   firebase_analytics:
     path: ../
-  firebase_core: ^0.4.0
+  _firebase_api: 43.0.0
+  firebase_core: any
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/firebase_analytics/test/firebase_analytics_test.dart b/packages/firebase_analytics/test/firebase_analytics_test.dart
index c8af79710f0d..c88d9172e906 100755
--- a/packages/firebase_analytics/test/firebase_analytics_test.dart
+++ b/packages/firebase_analytics/test/firebase_analytics_test.dart
@@ -9,6 +9,7 @@ import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/services.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   final FirebaseAnalytics analytics = FirebaseAnalytics();
   const MethodChannel channel =
       MethodChannel('plugins.flutter.io/firebase_analytics');
diff --git a/packages/firebase_analytics/test/observer_test.dart b/packages/firebase_analytics/test/observer_test.dart
index bcbd31059272..f85c57f78846 100644
--- a/packages/firebase_analytics/test/observer_test.dart
+++ b/packages/firebase_analytics/test/observer_test.dart
@@ -14,6 +14,7 @@ import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_analytics/observer.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('FirebaseAnalyticsObserver', () {
     FirebaseAnalytics analytics;
     FirebaseAnalyticsObserver observer;
diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart
index 5573302c62b6..28af336c5372 100755
--- a/packages/firebase_auth/test/firebase_auth_test.dart
+++ b/packages/firebase_auth/test/firebase_auth_test.dart
@@ -67,6 +67,7 @@ const Map<String, dynamic> kMockAdditionalUserInfo = <String, dynamic>{
 };
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$FirebaseAuth', () {
     final String appName = 'testApp';
     final FirebaseApp app = FirebaseApp(name: appName);
diff --git a/packages/firebase_core/test/firebase_core_test.dart b/packages/firebase_core/test/firebase_core_test.dart
index d09a8c99629d..f162bf56562d 100755
--- a/packages/firebase_core/test/firebase_core_test.dart
+++ b/packages/firebase_core/test/firebase_core_test.dart
@@ -7,6 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$FirebaseApp', () {
     final List<MethodCall> log = <MethodCall>[];
     const FirebaseApp testApp = FirebaseApp(
diff --git a/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart b/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
index ed3bce48c5aa..bea0af02cbfb 100644
--- a/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
+++ b/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$Crashlytics', () {
     final List<MethodCall> log = <MethodCall>[];
 
diff --git a/packages/firebase_database/test/firebase_database_test.dart b/packages/firebase_database/test/firebase_database_test.dart
index 66974ddc8adf..48926dccf562 100755
--- a/packages/firebase_database/test/firebase_database_test.dart
+++ b/packages/firebase_database/test/firebase_database_test.dart
@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$FirebaseDatabase', () {
     const MethodChannel channel = MethodChannel(
       'plugins.flutter.io/firebase_database',
diff --git a/packages/firebase_database/test/firebase_list_test.dart b/packages/firebase_database/test/firebase_list_test.dart
index 559fe8138e31..24974aa97533 100644
--- a/packages/firebase_database/test/firebase_list_test.dart
+++ b/packages/firebase_database/test/firebase_list_test.dart
@@ -10,6 +10,7 @@ import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('FirebaseList', () {
     StreamController<Event> onChildAddedStreamController;
     StreamController<Event> onChildRemovedStreamController;
diff --git a/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart b/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
index e89dfef03df3..b1a93fad1e1a 100644
--- a/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
+++ b/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
@@ -8,6 +8,7 @@ import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$FirebaseDynamicLinks', () {
     final List<MethodCall> log = <MethodCall>[];
 
diff --git a/packages/firebase_messaging/test/firebase_messaging_test.dart b/packages/firebase_messaging/test/firebase_messaging_test.dart
index a4e6d7c04756..5590ecb5e340 100644
--- a/packages/firebase_messaging/test/firebase_messaging_test.dart
+++ b/packages/firebase_messaging/test/firebase_messaging_test.dart
@@ -11,6 +11,7 @@ import 'package:platform/platform.dart';
 import 'package:test/test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   MockMethodChannel mockChannel;
   FirebaseMessaging firebaseMessaging;
 
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index 59dea115f83f..9e7eec8c66e3 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$FirebaseVision', () {
     final List<MethodCall> log = <MethodCall>[];
     dynamic returnValue;
diff --git a/packages/firebase_ml_vision/test/image_labeler_test.dart b/packages/firebase_ml_vision/test/image_labeler_test.dart
index a95cca264235..b15a7d58026b 100644
--- a/packages/firebase_ml_vision/test/image_labeler_test.dart
+++ b/packages/firebase_ml_vision/test/image_labeler_test.dart
@@ -7,6 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$FirebaseVision', () {
     final List<MethodCall> log = <MethodCall>[];
     dynamic returnValue;
diff --git a/packages/firebase_performance/test/firebase_performance_test.dart b/packages/firebase_performance/test/firebase_performance_test.dart
index 70549a0501e4..fe6d48ced140 100644
--- a/packages/firebase_performance/test/firebase_performance_test.dart
+++ b/packages/firebase_performance/test/firebase_performance_test.dart
@@ -8,6 +8,7 @@ import 'package:firebase_performance/firebase_performance.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('$FirebasePerformance', () {
     final List<MethodCall> performanceLog = <MethodCall>[];
 
diff --git a/packages/firebase_remote_config/test/firebase_remote_config_test.dart b/packages/firebase_remote_config/test/firebase_remote_config_test.dart
index b86f067a6c1a..3403d84ccf7e 100644
--- a/packages/firebase_remote_config/test/firebase_remote_config_test.dart
+++ b/packages/firebase_remote_config/test/firebase_remote_config_test.dart
@@ -7,6 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   final int lastFetchTime = 1520618753782;
   Map<String, dynamic> getDefaultInstance() {
     return <String, dynamic>{
diff --git a/packages/firebase_storage/test/firebase_storage_test.dart b/packages/firebase_storage/test/firebase_storage_test.dart
index c03288dade34..45069845a0da 100644
--- a/packages/firebase_storage/test/firebase_storage_test.dart
+++ b/packages/firebase_storage/test/firebase_storage_test.dart
@@ -11,6 +11,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   group('FirebaseStorage', () {
     final FirebaseApp app = const FirebaseApp(
       name: 'testApp',

From 7f82168cf8529fd5fb5f4af2889a8d0f0e6cc2b5 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 23 Aug 2019 13:13:10 -0700
Subject: [PATCH 2/3] Code review feedback, add whitespace

---
 packages/cloud_firestore/test/cloud_firestore_test.dart         | 1 +
 packages/cloud_functions/test/cloud_functions_test.dart         | 1 +
 packages/firebase_admob/test/firebase_admob_test.dart           | 1 +
 packages/firebase_analytics/test/firebase_analytics_test.dart   | 1 +
 packages/firebase_analytics/test/observer_test.dart             | 1 +
 packages/firebase_auth/test/firebase_auth_test.dart             | 1 +
 packages/firebase_core/test/firebase_core_test.dart             | 1 +
 .../firebase_crashlytics/test/firebase_crashlytics_test.dart    | 1 +
 packages/firebase_database/test/firebase_database_test.dart     | 1 +
 packages/firebase_database/test/firebase_list_test.dart         | 2 ++
 .../test/firebase_dynamic_links_test.dart                       | 1 +
 packages/firebase_messaging/test/firebase_messaging_test.dart   | 2 ++
 packages/firebase_ml_vision/test/firebase_ml_vision_test.dart   | 1 +
 packages/firebase_ml_vision/test/image_labeler_test.dart        | 1 +
 .../firebase_performance/test/firebase_performance_test.dart    | 1 +
 .../test/firebase_remote_config_test.dart                       | 1 +
 packages/firebase_storage/test/firebase_storage_test.dart       | 1 +
 17 files changed, 19 insertions(+)

diff --git a/packages/cloud_firestore/test/cloud_firestore_test.dart b/packages/cloud_firestore/test/cloud_firestore_test.dart
index a765c69de29e..32729d6954d7 100755
--- a/packages/cloud_firestore/test/cloud_firestore_test.dart
+++ b/packages/cloud_firestore/test/cloud_firestore_test.dart
@@ -12,6 +12,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$Firestore', () {
     int mockHandleId = 0;
     FirebaseApp app;
diff --git a/packages/cloud_functions/test/cloud_functions_test.dart b/packages/cloud_functions/test/cloud_functions_test.dart
index d6685f3f2672..f4c0d3fb37d9 100644
--- a/packages/cloud_functions/test/cloud_functions_test.dart
+++ b/packages/cloud_functions/test/cloud_functions_test.dart
@@ -9,6 +9,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$CloudFunctions', () {
     final List<MethodCall> log = <MethodCall>[];
 
diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart
index 9258891a3086..e2a8bc5a6fba 100644
--- a/packages/firebase_admob/test/firebase_admob_test.dart
+++ b/packages/firebase_admob/test/firebase_admob_test.dart
@@ -10,6 +10,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('FirebaseAdMob', () {
     const MethodChannel channel =
         MethodChannel('plugins.flutter.io/firebase_admob');
diff --git a/packages/firebase_analytics/test/firebase_analytics_test.dart b/packages/firebase_analytics/test/firebase_analytics_test.dart
index c88d9172e906..890075c1a806 100755
--- a/packages/firebase_analytics/test/firebase_analytics_test.dart
+++ b/packages/firebase_analytics/test/firebase_analytics_test.dart
@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   final FirebaseAnalytics analytics = FirebaseAnalytics();
   const MethodChannel channel =
       MethodChannel('plugins.flutter.io/firebase_analytics');
diff --git a/packages/firebase_analytics/test/observer_test.dart b/packages/firebase_analytics/test/observer_test.dart
index f85c57f78846..1cd8ac705e2e 100644
--- a/packages/firebase_analytics/test/observer_test.dart
+++ b/packages/firebase_analytics/test/observer_test.dart
@@ -15,6 +15,7 @@ import 'package:firebase_analytics/observer.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('FirebaseAnalyticsObserver', () {
     FirebaseAnalytics analytics;
     FirebaseAnalyticsObserver observer;
diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart
index 28af336c5372..62045e6116df 100755
--- a/packages/firebase_auth/test/firebase_auth_test.dart
+++ b/packages/firebase_auth/test/firebase_auth_test.dart
@@ -68,6 +68,7 @@ const Map<String, dynamic> kMockAdditionalUserInfo = <String, dynamic>{
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$FirebaseAuth', () {
     final String appName = 'testApp';
     final FirebaseApp app = FirebaseApp(name: appName);
diff --git a/packages/firebase_core/test/firebase_core_test.dart b/packages/firebase_core/test/firebase_core_test.dart
index f162bf56562d..772b876fc37c 100755
--- a/packages/firebase_core/test/firebase_core_test.dart
+++ b/packages/firebase_core/test/firebase_core_test.dart
@@ -8,6 +8,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$FirebaseApp', () {
     final List<MethodCall> log = <MethodCall>[];
     const FirebaseApp testApp = FirebaseApp(
diff --git a/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart b/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
index bea0af02cbfb..aac0a29dcd82 100644
--- a/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
+++ b/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
@@ -11,6 +11,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$Crashlytics', () {
     final List<MethodCall> log = <MethodCall>[];
 
diff --git a/packages/firebase_database/test/firebase_database_test.dart b/packages/firebase_database/test/firebase_database_test.dart
index 48926dccf562..ae1c187cc17f 100755
--- a/packages/firebase_database/test/firebase_database_test.dart
+++ b/packages/firebase_database/test/firebase_database_test.dart
@@ -11,6 +11,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$FirebaseDatabase', () {
     const MethodChannel channel = MethodChannel(
       'plugins.flutter.io/firebase_database',
diff --git a/packages/firebase_database/test/firebase_list_test.dart b/packages/firebase_database/test/firebase_list_test.dart
index 24974aa97533..a6d6c24f0962 100644
--- a/packages/firebase_database/test/firebase_list_test.dart
+++ b/packages/firebase_database/test/firebase_list_test.dart
@@ -6,11 +6,13 @@ import 'dart:async';
 
 import 'package:firebase_database/firebase_database.dart';
 import 'package:firebase_database/ui/firebase_list.dart';
+import 'package:flutter_test/flutter_test.dart' show TestWidgetsFlutterBinding;
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('FirebaseList', () {
     StreamController<Event> onChildAddedStreamController;
     StreamController<Event> onChildRemovedStreamController;
diff --git a/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart b/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
index b1a93fad1e1a..ad558df4b635 100644
--- a/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
+++ b/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
@@ -9,6 +9,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$FirebaseDynamicLinks', () {
     final List<MethodCall> log = <MethodCall>[];
 
diff --git a/packages/firebase_messaging/test/firebase_messaging_test.dart b/packages/firebase_messaging/test/firebase_messaging_test.dart
index 5590ecb5e340..c0a47ba57366 100644
--- a/packages/firebase_messaging/test/firebase_messaging_test.dart
+++ b/packages/firebase_messaging/test/firebase_messaging_test.dart
@@ -6,12 +6,14 @@ import 'dart:async';
 
 import 'package:flutter/services.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter_test/flutter_test.dart' show TestWidgetsFlutterBinding;
 import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:test/test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   MockMethodChannel mockChannel;
   FirebaseMessaging firebaseMessaging;
 
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index 9e7eec8c66e3..35c29351b06b 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -11,6 +11,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$FirebaseVision', () {
     final List<MethodCall> log = <MethodCall>[];
     dynamic returnValue;
diff --git a/packages/firebase_ml_vision/test/image_labeler_test.dart b/packages/firebase_ml_vision/test/image_labeler_test.dart
index b15a7d58026b..c89c531fb9a8 100644
--- a/packages/firebase_ml_vision/test/image_labeler_test.dart
+++ b/packages/firebase_ml_vision/test/image_labeler_test.dart
@@ -8,6 +8,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$FirebaseVision', () {
     final List<MethodCall> log = <MethodCall>[];
     dynamic returnValue;
diff --git a/packages/firebase_performance/test/firebase_performance_test.dart b/packages/firebase_performance/test/firebase_performance_test.dart
index fe6d48ced140..d7899f7a012a 100644
--- a/packages/firebase_performance/test/firebase_performance_test.dart
+++ b/packages/firebase_performance/test/firebase_performance_test.dart
@@ -9,6 +9,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('$FirebasePerformance', () {
     final List<MethodCall> performanceLog = <MethodCall>[];
 
diff --git a/packages/firebase_remote_config/test/firebase_remote_config_test.dart b/packages/firebase_remote_config/test/firebase_remote_config_test.dart
index 3403d84ccf7e..937ac98a5d8d 100644
--- a/packages/firebase_remote_config/test/firebase_remote_config_test.dart
+++ b/packages/firebase_remote_config/test/firebase_remote_config_test.dart
@@ -8,6 +8,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   final int lastFetchTime = 1520618753782;
   Map<String, dynamic> getDefaultInstance() {
     return <String, dynamic>{
diff --git a/packages/firebase_storage/test/firebase_storage_test.dart b/packages/firebase_storage/test/firebase_storage_test.dart
index 45069845a0da..cf37d19d77cd 100644
--- a/packages/firebase_storage/test/firebase_storage_test.dart
+++ b/packages/firebase_storage/test/firebase_storage_test.dart
@@ -12,6 +12,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+
   group('FirebaseStorage', () {
     final FirebaseApp app = const FirebaseApp(
       name: 'testApp',

From 661485ddb00dfe479dd3a477e53e69f26c83cecc Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 23 Aug 2019 14:06:28 -0700
Subject: [PATCH 3/3] revert file that was not intended to be edited

---
 packages/firebase_analytics/example/pubspec.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/example/pubspec.yaml
index 4fe3df3cfff7..2207a8ecb318 100755
--- a/packages/firebase_analytics/example/pubspec.yaml
+++ b/packages/firebase_analytics/example/pubspec.yaml
@@ -6,8 +6,7 @@ dependencies:
     sdk: flutter
   firebase_analytics:
     path: ../
-  _firebase_api: 43.0.0
-  firebase_core: any
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test: