repo merge

.cirrus.yml

@@ -7,7 +7,7 @@ task:
     cpu: 8
     memory: 16G
   env:
-    E2E_PATH: "./packages/e2e"
+    INTEGRATION_TEST_PATH: "./packages/integration_test"
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
@@ -47,9 +47,9 @@ task:
         - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
         - flutter channel $CHANNEL
         - ./script/build_all_plugins_app.sh apk
-    - name: e2e_web_smoke_test
-      # Tests e2e example test in web.
-      only_if: "changesInclude('.cirrus.yml', 'packages/e2e/**') || $CIRRUS_PR == ''"
+    - name: integration_web_smoke_test
+      # Tests integration example test in web.
+      only_if: "changesInclude('.cirrus.yml', 'packages/integration_test/**') || $CIRRUS_PR == ''"
       install_script:
         - flutter config --enable-web
         - git clone https://github.com/flutter/web_installers.git
@@ -58,13 +58,15 @@ task:
         - dart lib/web_driver_installer.dart chromedriver --install-only
         - ./chromedriver/chromedriver --port=4444 &
       test_script:
-        - cd $E2E_PATH/example/
-        - flutter drive -v --target=test_driver/example_e2e.dart -d web-server --release --browser-name=chrome
+        - cd $INTEGRATION_TEST_PATH/example/
+        - flutter drive -v --target=test_driver/example_integration.dart -d web-server --release --browser-name=chrome
     - name: build-apks+java-test+firebase-test-lab
       env:
         matrix:
-          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
-          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
+          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
+          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
+          PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
+          PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
@@ -105,7 +107,7 @@ task:
     cpu: 8
     memory: 16G
   env:
-    E2E_PATH: "./packages/e2e"
+    INTEGRATION_TEST_PATH: "./packages/integration_test"
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
@@ -157,7 +159,7 @@ task:
         - find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
         # Skip the dummy podspecs used to placate the tool.
         - find . -name "*_web*.podspec" -o -name "*_mac*.podspec" | xargs rm
-        - ./script/incremental_build.sh podspecs --no-analyze camera --ignore-warnings camera
+        - ./script/incremental_build.sh podspecs
     - name: build-ipas+drive-examples
       env:
         PATH: $PATH:/usr/local/bin

CODEOWNERS

@@ -10,11 +10,11 @@ packages/battery/*                            @amirh @matthew-carroll
 packages/camera/*                             @bparrishMines
 packages/connectivity/*                       @cyanglaz @matthew-carroll
 packages/device_info/*                        @matthew-carroll
-packages/e2e/*                                @collinjackson @digiter
 packages/espresso/*                           @collinjackson @adazh
 packages/google_maps_flutter/*                @cyanglaz
 packages/google_sign_in/*                     @cyanglaz @mehmetf
 packages/image_picker/*                       @cyanglaz
+packages/integration_test/*                   @dnfield
 packages/in_app_purchase/*                    @mklim @cyanglaz @LHLL
 packages/ios_platform_images/*                @gaaclarke
 packages/package_info/*                       @cyanglaz @matthew-carroll

README.md

@@ -44,12 +44,13 @@ These are the available plugins in this repository.
 | [camera](./packages/camera/) | [![pub package](https://img.shields.io/pub/v/camera.svg)](https://pub.dev/packages/camera) |
 | [connectivity](./packages/connectivity/) | [![pub package](https://img.shields.io/pub/v/connectivity.svg)](https://pub.dev/packages/connectivity) |
 | [device_info](./packages/device_info/) | [![pub package](https://img.shields.io/pub/v/device_info.svg)](https://pub.dev/packages/device_info) |
-| [e2e](./packages/e2e/) | [![pub package](https://img.shields.io/pub/v/e2e.svg)](https://pub.dev/packages/e2e) |
+| [e2e (Discontinued, use integration_test)](./packages/e2e/) | [![pub package](https://img.shields.io/pub/v/e2e.svg)](https://pub.dev/packages/e2e) |
 | [espresso](./packages/espresso/) | [![pub package](https://img.shields.io/pub/v/espresso.svg)](https://pub.dev/packages/espresso) |
 | [flutter_plugin_android_lifecycle](./packages/flutter_plugin_android_lifecycle/) | [![pub package](https://img.shields.io/pub/v/flutter_plugin_android_lifecycle.svg)](https://pub.dev/packages/flutter_plugin_android_lifecycle) |
 | [google_maps_flutter](./packages/google_maps_flutter) | [![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dev/packages/google_maps_flutter) |
 | [google_sign_in](./packages/google_sign_in/) | [![pub package](https://img.shields.io/pub/v/google_sign_in.svg)](https://pub.dev/packages/google_sign_in) |
 | [image_picker](./packages/image_picker/) | [![pub package](https://img.shields.io/pub/v/image_picker.svg)](https://pub.dev/packages/image_picker) |
+| [integration_test](./packages/integration_test/) | [![pub package](https://img.shields.io/pub/v/integration_test.svg)](https://pub.dev/packages/integration_test) |
 | [in_app_purchase](./packages/in_app_purchase/) | [![pub package](https://img.shields.io/pub/v/in_app_purchase.svg)](https://pub.dev/packages/in_app_purchase) |
 | [ios_platform_images](./packages/ios_platform_images/) | [![pub package](https://img.shields.io/pub/v/ios_platform_images.svg)](https://pub.dev/packages/ios_platform_images) |
 | [local_auth](./packages/local_auth/) | [![pub package](https://img.shields.io/pub/v/local_auth.svg)](https://pub.dev/packages/local_auth) |

packages/android_alarm_manager/example/android/app/src/androidTest/java/io/plugins/androidalarmmanager/MainActivityTest.java

@@ -5,7 +5,7 @@
 package io.flutter.plugins.androidalarmmanagerexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterTestRunner;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
 import org.junit.Rule;
 import org.junit.runner.RunWith;

packages/android_alarm_manager/example/pubspec.yaml

@@ -7,8 +7,8 @@ dependencies:
   android_alarm_manager:
     path: ../
   shared_preferences: ^0.5.6
-  e2e:
-    path: ../../e2e
+  integration_test:
+    path: ../../integration_test
   path_provider: ^1.3.1
 
 dev_dependencies:

packages/android_alarm_manager/example/test_driver/android_alarm_manager_e2e.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:io';
 import 'package:android_alarm_manager_example/main.dart' as app;
 import 'package:android_alarm_manager/android_alarm_manager.dart';
-import 'package:e2e/e2e.dart';
+import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_driver/driver_extension.dart';
 import 'package:path_provider/path_provider.dart';
@@ -55,7 +55,7 @@ void appMain() {
 }
 
 void main() {
-  E2EWidgetsFlutterBinding.ensureInitialized();
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   setUp(() async {
     await AndroidAlarmManager.initialize();

packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java

@@ -1,7 +1,7 @@
 package io.flutter.plugins.androidintentexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterTestRunner;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 

packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java

@@ -1,7 +1,7 @@
 package io.flutter.plugins.androidintentexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterTestRunner;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 

packages/android_intent/example/pubspec.yaml

@@ -8,8 +8,8 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  e2e:
-    path: ../../e2e
+  integration_test:
+    path: ../../integration_test
   flutter_driver:
     sdk: flutter
   pedantic: ^1.8.0

packages/android_intent/example/test_driver/android_intent_e2e.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:android_intent/android_intent.dart';
 import 'package:android_intent_example/main.dart';
-import 'package:e2e/e2e.dart';
+import 'package:integration_test/integration_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -12,7 +12,7 @@ import 'package:flutter_test/flutter_test.dart';
 /// possible to meaningfully test it through its Dart interface currently. There
 /// are more useful unit tests for the platform logic under android/src/test/.
 void main() {
-  E2EWidgetsFlutterBinding.ensureInitialized();
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   testWidgets('Embedding example app loads', (WidgetTester tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(MyApp());

packages/battery/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.3
+
+* Update package:e2e to use package:integration_test
+
+
 ## 1.0.2
 
 * Update package:e2e reference to use the local version in the flutter/plugins

packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java

@@ -5,7 +5,7 @@
 package io.flutter.plugins.batteryexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterTestRunner;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 

packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java

@@ -5,7 +5,7 @@
 package io.flutter.plugins.batteryexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterTestRunner;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
 import org.junit.Rule;
 import org.junit.runner.RunWith;

packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java

@@ -5,7 +5,7 @@
 package io.flutter.plugins.batteryexample;
 
 import android.os.Bundle;
-import dev.flutter.plugins.e2e.E2EPlugin;
+import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
 import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.battery.BatteryPlugin;
 
@@ -14,6 +14,7 @@ public class EmbedderV1Activity extends FlutterActivity {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     BatteryPlugin.registerWith(registrarFor("io.flutter.plugins.battery.BatteryPlugin"));
-    E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin"));
+    IntegrationTestPlugin.registerWith(
+        registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin"));
   }
 }

packages/battery/example/pubspec.yaml

@@ -10,8 +10,8 @@ dependencies:
 dev_dependencies:
   flutter_driver:
     sdk: flutter
-  e2e:
-    path: ../../e2e
+  integration_test:
+    path: ../../integration_test
   pedantic: ^1.8.0
 
 flutter:

packages/battery/pubspec.yaml

@@ -2,7 +2,7 @@ name: battery
 description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/battery
-version: 1.0.2
+version: 1.0.3
 
 flutter:
   plugin:
@@ -24,8 +24,8 @@ dev_dependencies:
   mockito: 3.0.0
   flutter_test:
     sdk: flutter
-  e2e:
-    path: ../e2e
+  integration_test:
+    path: ../integration_test
   pedantic: ^1.8.0
 
 environment:

packages/battery/test/battery_e2e.dart

@@ -4,10 +4,10 @@
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:battery/battery.dart';
-import 'package:e2e/e2e.dart';
+import 'package:integration_test/integration_test.dart';
 
 void main() {
-  E2EWidgetsFlutterBinding.ensureInitialized();
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   testWidgets('Can get battery level', (WidgetTester tester) async {
     final Battery battery = Battery();

packages/camera/CHANGELOG.md

@@ -1,10 +1,14 @@
+## 0.5.8+5
+
+* Fix compilation/availability issues on iOS.
+
 ## 0.5.8+4
 
 * Fixed bug caused by casting a `CameraAccessException` on Android.
 
 ## 0.5.8+3
 
-* Fix bug in usage example in README.md 
+* Fix bug in usage example in README.md
 
 ## 0.5.8+2
 

packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java

@@ -1,7 +1,7 @@
 package io.flutter.plugins.cameraexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterTestRunner;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 

packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java

@@ -1,7 +1,7 @@
 package io.flutter.plugins.cameraexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterTestRunner;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
 import org.junit.Rule;
 import org.junit.runner.RunWith;

packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java

@@ -1,7 +1,7 @@
 package io.flutter.plugins.cameraexample;
 
 import android.os.Bundle;
-import dev.flutter.plugins.e2e.E2EPlugin;
+import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
 import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.camera.CameraPlugin;
 import io.flutter.plugins.pathprovider.PathProviderPlugin;
@@ -12,7 +12,8 @@ public class EmbeddingV1Activity extends FlutterActivity {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     CameraPlugin.registerWith(registrarFor("io.flutter.plugins.camera.CameraPlugin"));
-    E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin"));
+    IntegrationTestPlugin.registerWith(
+        registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin"));
     PathProviderPlugin.registerWith(
         registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin"));
     VideoPlayerPlugin.registerWith(

packages/camera/example/pubspec.yaml

@@ -8,8 +8,8 @@ dependencies:
   flutter:
     sdk: flutter
   video_player: ^0.10.0
-  e2e:
-    path: ../../e2e
+  integration_test:
+    path: ../../integration_test
 
 dev_dependencies:
   flutter_test:

packages/camera/example/test_driver/camera_e2e.dart

@@ -7,12 +7,12 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:camera/camera.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:video_player/video_player.dart';
-import 'package:e2e/e2e.dart';
+import 'package:integration_test/integration_test.dart';
 
 void main() {
   Directory testDir;
 
-  E2EWidgetsFlutterBinding.ensureInitialized();
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   setUpAll(() async {
     final Directory extDir = await getTemporaryDirectory();