Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 116b37d

Browse files
dnfielddnfield
authored
Make package:e2e a relative reference (#2889)
* Make package:e2e a relative reference
1 parent 7434e41 commit 116b37d

File tree

139 files changed

+470
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+470
-220
lines changed

‎packages/android_alarm_manager/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.4.5+12
2+
3+
* Update package:e2e reference to use the local version in the flutter/plugins
4+
repository.
5+
16
## 0.4.5+11
27

38
* Update lower bound of dart dependency to 2.1.0.

‎packages/android_alarm_manager/example/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ dependencies:
77
android_alarm_manager:
88
path: ../
99
shared_preferences: ^0.5.6
10-
e2e: 0.3.0
10+
e2e:
11+
path: ../../e2e
1112
path_provider: ^1.3.1
1213

1314
dev_dependencies:

‎packages/android_alarm_manager/example/test_driver/android_alarm_manager_e2e_test.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'dart:async';
6+
import 'dart:convert';
67
import 'dart:io';
78

89
import 'package:flutter_driver/flutter_driver.dart';
@@ -33,9 +34,12 @@ Future<void> main() async {
3334
// for this plugin will need to be resumed for the test to pass.
3435
final StreamSubscription<VMIsolateRef> subscription =
3536
await resumeIsolatesOnPause(driver);
36-
final String result =
37-
await driver.requestData(null, timeout: const Duration(minutes: 5));
37+
final String data = await driver.requestData(
38+
null,
39+
timeout: const Duration(minutes: 1),
40+
);
3841
await driver.close();
3942
await subscription.cancel();
40-
exit(result == 'pass' ? 0 : 1);
43+
final Map<String, dynamic> result = jsonDecode(data);
44+
exit(result['result'] == 'true' ? 0 : 1);
4145
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.flutter.plugins.androidintentexample;
22

33
import androidx.test.rule.ActivityTestRule;
4-
import dev.flutter.plugins.e2e.FlutterRunner;
4+
import dev.flutter.plugins.e2e.FlutterTestRunner;
55
import org.junit.Rule;
66
import org.junit.runner.RunWith;
77

8-
@RunWith(FlutterRunner.class)
8+
@RunWith(FlutterTestRunner.class)
99
public class EmbeddingV1ActivityTest {
1010
@Rule
1111
public ActivityTestRule<EmbeddingV1Activity> rule =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.flutter.plugins.androidintentexample;
22

33
import androidx.test.rule.ActivityTestRule;
4-
import dev.flutter.plugins.e2e.FlutterRunner;
4+
import dev.flutter.plugins.e2e.FlutterTestRunner;
55
import org.junit.Rule;
66
import org.junit.runner.RunWith;
77

8-
@RunWith(FlutterRunner.class)
8+
@RunWith(FlutterTestRunner.class)
99
public class MainActivityTest {
1010
@Rule public ActivityTestRule<MainActivity> rule = new ActivityTestRule<>(MainActivity.class);
1111
}

‎packages/android_intent/example/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ dependencies:
88
path: ../
99

1010
dev_dependencies:
11-
e2e: "^0.2.1"
11+
e2e:
12+
path: ../../e2e
1213
flutter_driver:
1314
sdk: flutter
1415
pedantic: ^1.8.0

‎packages/android_intent/example/test_driver/android_intent_e2e_test.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import 'dart:async';
2+
import 'dart:convert';
23
import 'dart:io';
34

45
import 'package:flutter_driver/flutter_driver.dart';
56

67
Future<void> main() async {
78
final FlutterDriver driver = await FlutterDriver.connect();
8-
final String result =
9-
await driver.requestData(null, timeout: const Duration(minutes: 1));
9+
final String data = await driver.requestData(
10+
null,
11+
timeout: const Duration(minutes: 1),
12+
);
1013
await driver.close();
11-
exit(result == 'pass' ? 0 : 1);
14+
final Map<String, dynamic> result = jsonDecode(data);
15+
exit(result['result'] == 'true' ? 0 : 1);
1216
}

‎packages/battery/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.0.2
2+
3+
* Update package:e2e reference to use the local version in the flutter/plugins
4+
repository.
5+
16
## 1.0.1
27

38
* Update lower bound of dart dependency to 2.1.0.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
package io.flutter.plugins.batteryexample;
66

77
import androidx.test.rule.ActivityTestRule;
8-
import dev.flutter.plugins.e2e.FlutterRunner;
8+
import dev.flutter.plugins.e2e.FlutterTestRunner;
99
import org.junit.Rule;
1010
import org.junit.runner.RunWith;
1111

12-
@RunWith(FlutterRunner.class)
12+
@RunWith(FlutterTestRunner.class)
1313
public class EmbedderV1ActivityTest {
1414
@Rule
1515
public ActivityTestRule<EmbedderV1Activity> rule =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
package io.flutter.plugins.batteryexample;
66

77
import androidx.test.rule.ActivityTestRule;
8-
import dev.flutter.plugins.e2e.FlutterRunner;
8+
import dev.flutter.plugins.e2e.FlutterTestRunner;
99
import io.flutter.embedding.android.FlutterActivity;
1010
import org.junit.Rule;
1111
import org.junit.runner.RunWith;
1212

13-
@RunWith(FlutterRunner.class)
13+
@RunWith(FlutterTestRunner.class)
1414
public class FlutterActivityTest {
1515
@Rule
1616
public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);

‎packages/battery/example/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ dependencies:
1010
dev_dependencies:
1111
flutter_driver:
1212
sdk: flutter
13-
e2e: ^0.2.1
13+
e2e:
14+
path: ../../e2e
1415
pedantic: ^1.8.0
1516

1617
flutter:

‎packages/battery/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: battery
22
description: Flutter plugin for accessing information about the battery state
33
(full, charging, discharging) on Android and iOS.
44
homepage: https://github.com/flutter/plugins/tree/master/packages/battery
5-
version: 1.0.1
5+
version: 1.0.2
66

77
flutter:
88
plugin:
@@ -24,7 +24,8 @@ dev_dependencies:
2424
mockito: 3.0.0
2525
flutter_test:
2626
sdk: flutter
27-
e2e: ^0.2.1
27+
e2e:
28+
path: ../e2e
2829
pedantic: ^1.8.0
2930

3031
environment:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.flutter.plugins.cameraexample;
22

33
import androidx.test.rule.ActivityTestRule;
4-
import dev.flutter.plugins.e2e.FlutterRunner;
4+
import dev.flutter.plugins.e2e.FlutterTestRunner;
55
import org.junit.Rule;
66
import org.junit.runner.RunWith;
77

8-
@RunWith(FlutterRunner.class)
8+
@RunWith(FlutterTestRunner.class)
99
public class EmbeddingV1ActivityTest {
1010
@Rule
1111
public ActivityTestRule<EmbeddingV1Activity> rule =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.flutter.plugins.cameraexample;
22

33
import androidx.test.rule.ActivityTestRule;
4-
import dev.flutter.plugins.e2e.FlutterRunner;
4+
import dev.flutter.plugins.e2e.FlutterTestRunner;
55
import io.flutter.embedding.android.FlutterActivity;
66
import org.junit.Rule;
77
import org.junit.runner.RunWith;
88

9-
@RunWith(FlutterRunner.class)
9+
@RunWith(FlutterTestRunner.class)
1010
public class FlutterActivityTest {
1111
@Rule
1212
public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);

‎packages/camera/example/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ dependencies:
88
flutter:
99
sdk: flutter
1010
video_player: ^0.10.0
11-
e2e: "^0.2.0"
11+
e2e:
12+
path: ../../e2e
1213

1314
dev_dependencies:
1415
flutter_test:

‎packages/camera/example/test_driver/camera_e2e_test.dart

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'dart:async';
2+
import 'dart:convert';
23
import 'dart:io';
34

45
import 'package:flutter_driver/flutter_driver.dart';
@@ -33,8 +34,10 @@ Future<void> main() async {
3334
]);
3435
print('Starting test.');
3536
final FlutterDriver driver = await FlutterDriver.connect();
36-
final String result =
37-
await driver.requestData(null, timeout: const Duration(minutes: 1));
37+
final String data = await driver.requestData(
38+
null,
39+
timeout: const Duration(minutes: 1),
40+
);
3841
await driver.close();
3942
print('Test finished. Revoking camera permissions...');
4043
Process.runSync('adb', <String>[
@@ -51,5 +54,7 @@ Future<void> main() async {
5154
_examplePackage,
5255
'android.permission.RECORD_AUDIO'
5356
]);
54-
exit(result == 'pass' ? 0 : 1);
57+
58+
final Map<String, dynamic> result = jsonDecode(data);
59+
exit(result['result'] == 'true' ? 0 : 1);
5560
}

‎packages/connectivity/connectivity/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.4.9+1
2+
3+
* Update package:e2e reference to use the local version in the flutter/plugins
4+
repository.
5+
16
## 0.4.9
27

38
* Add support for `web` (by endorsing `connectivity_for_web` 0.3.0)

‎packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
package io.flutter.plugins.connectivityexample;
66

77
import androidx.test.rule.ActivityTestRule;
8-
import dev.flutter.plugins.e2e.FlutterRunner;
8+
import dev.flutter.plugins.e2e.FlutterTestRunner;
99
import org.junit.Rule;
1010
import org.junit.runner.RunWith;
1111

12-
@RunWith(FlutterRunner.class)
12+
@RunWith(FlutterTestRunner.class)
1313
public class EmbeddingV1ActivityTest {
1414
@Rule
1515
public ActivityTestRule<EmbeddingV1Activity> rule =

‎packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
package io.flutter.plugins.connectivityexample;
66

77
import androidx.test.rule.ActivityTestRule;
8-
import dev.flutter.plugins.e2e.FlutterRunner;
8+
import dev.flutter.plugins.e2e.FlutterTestRunner;
99
import io.flutter.embedding.android.FlutterActivity;
1010
import org.junit.Rule;
1111
import org.junit.runner.RunWith;
1212

13-
@RunWith(FlutterRunner.class)
13+
@RunWith(FlutterTestRunner.class)
1414
public class FlutterActivityTest {
1515
@Rule
1616
public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);

‎packages/connectivity/connectivity/example/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ dev_dependencies:
1111
flutter_driver:
1212
sdk: flutter
1313
test: any
14-
e2e: ^0.2.0
14+
e2e:
15+
path: ../../../e2e
1516
pedantic: ^1.8.0
1617

1718
flutter:

‎packages/connectivity/connectivity/example/test_driver/test/connectivity_e2e_test.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:convert';
56
import 'dart:io';
67
import 'package:flutter_driver/flutter_driver.dart';
78

89
Future<void> main() async {
910
final FlutterDriver driver = await FlutterDriver.connect();
10-
final String result =
11+
final String data =
1112
await driver.requestData(null, timeout: const Duration(minutes: 1));
1213
await driver.close();
13-
exit(result == 'pass' ? 0 : 1);
14+
final Map<String, dynamic> result = jsonDecode(data);
15+
exit(result['result'] == 'true' ? 0 : 1);
1416
}

‎packages/connectivity/connectivity/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/c
55
# 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
66
# the version to 2.0.0.
77
# See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
8-
version: 0.4.9
8+
version: 0.4.9+1
99

1010
flutter:
1111
plugin:
@@ -34,7 +34,8 @@ dev_dependencies:
3434
flutter_driver:
3535
sdk: flutter
3636
test: any
37-
e2e: ^0.2.0
37+
e2e:
38+
path: ../../e2e
3839
mockito: ^4.1.1
3940
plugin_platform_interface: ^1.0.0
4041
pedantic: ^1.8.0

‎packages/connectivity/connectivity_for_web/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.3.1+1
2+
3+
* Update package:e2e reference to use the local version in the flutter/plugins
4+
repository.
5+
16
## 0.3.1
27

38
* Use NetworkInformation API from dart:html, instead of the JS-interop version.

‎packages/connectivity/connectivity_for_web/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: connectivity_for_web
22
description: An implementation for the web platform of the Flutter `connectivity` plugin. This uses the NetworkInformation Web API, with a fallback to Navigator.onLine.
3-
version: 0.3.1
3+
version: 0.3.1+1
44
homepage: https://github.com/ditman/plugins/tree/connectivity-web/packages/connectivity/experimental_connectivity_web
55

66
flutter:
@@ -23,7 +23,8 @@ dev_dependencies:
2323
sdk: flutter
2424
flutter_test:
2525
sdk: flutter
26-
e2e: ^0.2.4+3
26+
e2e:
27+
path: ../../e2e
2728
mockito: ^4.1.1
2829

2930
environment:

‎packages/connectivity/connectivity_for_web/test/pubspec.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: connectivity_web_example
2-
description: Example web app for the connectivity plugin
3-
version: 0.1.1
2+
description: Example web app for the connectivity plugin
3+
version: 0.1.1+1
44
homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/connectivity_web
55

66
dependencies:
@@ -17,7 +17,8 @@ dev_dependencies:
1717
sdk: flutter
1818
flutter_driver:
1919
sdk: flutter
20-
e2e: ^0.2.4+3
20+
e2e:
21+
path: ../../../e2e
2122
mockito: ^4.1.1
2223

2324
environment:

‎packages/connectivity/connectivity_macos/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.1.0+5
2+
3+
* Update package:e2e reference to use the local version in the flutter/plugins
4+
repository.
5+
16
## 0.1.0+4
27

38
* Remove Android folder from `connectivity_macos`.

‎packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
package io.flutter.plugins.connectivityexample;
66

77
import androidx.test.rule.ActivityTestRule;
8-
import dev.flutter.plugins.e2e.FlutterRunner;
8+
import dev.flutter.plugins.e2e.FlutterTestRunner;
99
import org.junit.Rule;
1010
import org.junit.runner.RunWith;
1111

12-
@RunWith(FlutterRunner.class)
12+
@RunWith(FlutterTestRunner.class)
1313
public class EmbeddingV1ActivityTest {
1414
@Rule
1515
public ActivityTestRule<EmbeddingV1Activity> rule =

0 commit comments

Comments
 (0)