flutter · dnfield · Jul 24, 2020 · Jul 21, 2020 · Jul 21, 2020 · Jul 21, 2020
diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.5+12
+
+* Update package:e2e reference to use the local version in the flutter/plugins
+  repository.
+
 ## 0.4.5+11
 
 * Update lower bound of dart dependency to 2.1.0.

diff --git a/packages/android_alarm_manager/example/pubspec.yaml b/packages/android_alarm_manager/example/pubspec.yaml
@@ -7,7 +7,8 @@ dependencies:
   android_alarm_manager:
     path: ../
   shared_preferences: ^0.5.6
-  e2e: 0.3.0
+  e2e:
+    path: ../../e2e
   path_provider: ^1.3.1
 
 dev_dependencies:

diff --git a/packages/android_alarm_manager/example/test_driver/android_alarm_manager_e2e_test.dart b/packages/android_alarm_manager/example/test_driver/android_alarm_manager_e2e_test.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter_driver/flutter_driver.dart';
@@ -33,9 +34,12 @@ Future<void> main() async {
   // for this plugin will need to be resumed for the test to pass.
   final StreamSubscription<VMIsolateRef> subscription =
       await resumeIsolatesOnPause(driver);
-  final String result =
-      await driver.requestData(null, timeout: const Duration(minutes: 5));
+  final String data = await driver.requestData(
+    null,
+    timeout: const Duration(minutes: 1),
+  );
   await driver.close();
   await subscription.cancel();
-  exit(result == 'pass' ? 0 : 1);
+  final Map<String, dynamic> result = jsonDecode(data);
+  exit(result['result'] == 'true' ? 0 : 1);
 }
diff --git a/...ndroidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java b/...ndroidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java
@@ -1,11 +1,11 @@
 package io.flutter.plugins.androidintentexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =

diff --git a/...p/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java b/...p/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java
@@ -1,11 +1,11 @@
 package io.flutter.plugins.androidintentexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class MainActivityTest {
   @Rule public ActivityTestRule<MainActivity> rule = new ActivityTestRule<>(MainActivity.class);
 }
diff --git a/packages/android_intent/example/pubspec.yaml b/packages/android_intent/example/pubspec.yaml
@@ -8,7 +8,8 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  e2e: "^0.2.1"
+  e2e:
+    path: ../../e2e
   flutter_driver:
     sdk: flutter
   pedantic: ^1.8.0

diff --git a/packages/android_intent/example/test_driver/android_intent_e2e_test.dart b/packages/android_intent/example/test_driver/android_intent_e2e_test.dart
@@ -1,12 +1,16 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter_driver/flutter_driver.dart';
 
 Future<void> main() async {
   final FlutterDriver driver = await FlutterDriver.connect();
-  final String result =
-      await driver.requestData(null, timeout: const Duration(minutes: 1));
+  final String data = await driver.requestData(
+    null,
+    timeout: const Duration(minutes: 1),
+  );
   await driver.close();
-  exit(result == 'pass' ? 0 : 1);
+  final Map<String, dynamic> result = jsonDecode(data);
+  exit(result['result'] == 'true' ? 0 : 1);
 }
diff --git a/packages/battery/CHANGELOG.md b/packages/battery/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.2
+
+* Update package:e2e reference to use the local version in the flutter/plugins
+  repository.
+
 ## 1.0.1
 
 * Update lower bound of dart dependency to 2.1.0.

diff --git a/...e/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java b/...e/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java
@@ -5,11 +5,11 @@
 package io.flutter.plugins.batteryexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class EmbedderV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbedderV1Activity> rule =

diff --git a/...mple/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java b/...mple/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java
@@ -5,12 +5,12 @@
 package io.flutter.plugins.batteryexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class FlutterActivityTest {
   @Rule
   public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);

diff --git a/packages/battery/example/pubspec.yaml b/packages/battery/example/pubspec.yaml
@@ -10,7 +10,8 @@ dependencies:
 dev_dependencies:
   flutter_driver:
     sdk: flutter
-  e2e: ^0.2.1
+  e2e:
+    path: ../../e2e
   pedantic: ^1.8.0
 
 flutter:

diff --git a/packages/battery/pubspec.yaml b/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.1
+version: 1.0.2
 
 flutter:
   plugin:
@@ -24,7 +24,8 @@ dev_dependencies:
   mockito: 3.0.0
   flutter_test:
     sdk: flutter
-  e2e: ^0.2.1
+  e2e:
+    path: ../e2e
   pedantic: ^1.8.0
 
 environment:

diff --git a/...p/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java b/...p/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java
@@ -1,11 +1,11 @@
 package io.flutter.plugins.cameraexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =

diff --git a/...d/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java b/...d/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java
@@ -1,12 +1,12 @@
 package io.flutter.plugins.cameraexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class FlutterActivityTest {
   @Rule
   public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);

diff --git a/packages/camera/example/pubspec.yaml b/packages/camera/example/pubspec.yaml
@@ -8,7 +8,8 @@ dependencies:
   flutter:
     sdk: flutter
   video_player: ^0.10.0
-  e2e: "^0.2.0"
+  e2e:
+    path: ../../e2e
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/camera/example/test_driver/camera_e2e_test.dart b/packages/camera/example/test_driver/camera_e2e_test.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter_driver/flutter_driver.dart';
@@ -33,8 +34,10 @@ Future<void> main() async {
   ]);
   print('Starting test.');
   final FlutterDriver driver = await FlutterDriver.connect();
-  final String result =
-      await driver.requestData(null, timeout: const Duration(minutes: 1));
+  final String data = await driver.requestData(
+    null,
+    timeout: const Duration(minutes: 1),
+  );
   await driver.close();
   print('Test finished. Revoking camera permissions...');
   Process.runSync('adb', <String>[
@@ -51,5 +54,7 @@ Future<void> main() async {
     _examplePackage,
     'android.permission.RECORD_AUDIO'
   ]);
-  exit(result == 'pass' ? 0 : 1);
+
+  final Map<String, dynamic> result = jsonDecode(data);
+  exit(result['result'] == 'true' ? 0 : 1);
 }
diff --git a/packages/connectivity/connectivity/CHANGELOG.md b/packages/connectivity/connectivity/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.9+1
+
+* Update package:e2e reference to use the local version in the flutter/plugins
+  repository.
+
 ## 0.4.9
 
 * Add support for `web` (by endorsing `connectivity_for_web` 0.3.0)

diff --git a/...oid/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/...oid/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java
@@ -5,11 +5,11 @@
 package io.flutter.plugins.connectivityexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =

diff --git a/...android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java b/...android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java
@@ -5,12 +5,12 @@
 package io.flutter.plugins.connectivityexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class FlutterActivityTest {
   @Rule
   public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);

diff --git a/packages/connectivity/connectivity/example/pubspec.yaml b/packages/connectivity/connectivity/example/pubspec.yaml
@@ -11,7 +11,8 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   test: any
-  e2e: ^0.2.0
+  e2e:
+    path: ../../../e2e
   pedantic: ^1.8.0
 
 flutter:

diff --git a/packages/connectivity/connectivity/example/test_driver/test/connectivity_e2e_test.dart b/packages/connectivity/connectivity/example/test_driver/test/connectivity_e2e_test.dart
@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert';
 import 'dart:io';
 import 'package:flutter_driver/flutter_driver.dart';
 
 Future<void> main() async {
   final FlutterDriver driver = await FlutterDriver.connect();
-  final String result =
+  final String data =
       await driver.requestData(null, timeout: const Duration(minutes: 1));
   await driver.close();
-  exit(result == 'pass' ? 0 : 1);
+  final Map<String, dynamic> result = jsonDecode(data);
+  exit(result['result'] == 'true' ? 0 : 1);
 }
diff --git a/packages/connectivity/connectivity/pubspec.yaml b/packages/connectivity/connectivity/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/c
 # 0.4.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.4.9
+version: 0.4.9+1
 
 flutter:
   plugin:
@@ -34,7 +34,8 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   test: any
-  e2e: ^0.2.0
+  e2e:
+    path: ../../e2e
   mockito: ^4.1.1
   plugin_platform_interface: ^1.0.0
   pedantic: ^1.8.0

diff --git a/packages/connectivity/connectivity_for_web/CHANGELOG.md b/packages/connectivity/connectivity_for_web/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.1+1
+
+* Update package:e2e reference to use the local version in the flutter/plugins
+  repository.
+
 ## 0.3.1
 
 * Use NetworkInformation API from dart:html, instead of the JS-interop version.

diff --git a/packages/connectivity/connectivity_for_web/pubspec.yaml b/packages/connectivity/connectivity_for_web/pubspec.yaml
@@ -1,6 +1,6 @@
 name: connectivity_for_web
 description: An implementation for the web platform of the Flutter `connectivity` plugin. This uses the NetworkInformation Web API, with a fallback to Navigator.onLine.
-version: 0.3.1
+version: 0.3.1+1
 homepage: https://github.com/ditman/plugins/tree/connectivity-web/packages/connectivity/experimental_connectivity_web
 
 flutter:
@@ -23,7 +23,8 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  e2e: ^0.2.4+3
+  e2e:
+    path: ../../e2e
   mockito: ^4.1.1
 
 environment:

diff --git a/packages/connectivity/connectivity_for_web/test/pubspec.yaml b/packages/connectivity/connectivity_for_web/test/pubspec.yaml
@@ -1,6 +1,6 @@
 name: connectivity_web_example
-description: Example web app for the connectivity plugin 
-version: 0.1.1
+description: Example web app for the connectivity plugin
+version: 0.1.1+1
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/connectivity_web
 
 dependencies:
@@ -17,7 +17,8 @@ dev_dependencies:
     sdk: flutter
   flutter_driver:
     sdk: flutter
-  e2e: ^0.2.4+3
+  e2e:
+    path: ../../../e2e
   mockito: ^4.1.1
 
 environment:

diff --git a/packages/connectivity/connectivity_macos/CHANGELOG.md b/packages/connectivity/connectivity_macos/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.0+5
+
+* Update package:e2e reference to use the local version in the flutter/plugins
+  repository.
+
 ## 0.1.0+4
 
 * Remove Android folder from `connectivity_macos`.

diff --git a/...oid/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/...oid/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java
@@ -5,11 +5,11 @@
 package io.flutter.plugins.connectivityexample;
 
 import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.e2e.FlutterRunner;
+import dev.flutter.plugins.e2e.FlutterTestRunner;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-@RunWith(FlutterRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =