diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index 923907be81..92bab203e6 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/dev/benchmarks/complex_layout/pubspec.yaml @@ -35,7 +35,8 @@ dev_dependencies: flutter_test: sdk: flutter test: 1.16.0-nullsafety.17 - e2e: 0.7.0+1 + integration_test: + sdk: flutter _fe_analyzer_shared: 14.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" analyzer: 0.41.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -85,4 +86,4 @@ flutter: - packages/flutter_gallery_assets/people/square/ali.png - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png -# PUBSPEC CHECKSUM: 6854 +# PUBSPEC CHECKSUM: a6ac diff --git a/dev/benchmarks/complex_layout/test/measure_scroll_smoothness.dart b/dev/benchmarks/complex_layout/test/measure_scroll_smoothness.dart index 92048ab552..1bd141a77f 100644 --- a/dev/benchmarks/complex_layout/test/measure_scroll_smoothness.dart +++ b/dev/benchmarks/complex_layout/test/measure_scroll_smoothness.dart @@ -9,7 +9,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:complex_layout/main.dart' as app; @@ -62,7 +62,7 @@ enum TestScenario { class ResampleFlagVariant extends TestVariant { ResampleFlagVariant(this.binding); - final E2EWidgetsFlutterBinding binding; + final IntegrationTestWidgetsFlutterBinding binding; @override final Set values = Set.from(TestScenario.values); @@ -124,9 +124,9 @@ class ResampleFlagVariant extends TestVariant { } Future main() async { - final WidgetsBinding _binding = E2EWidgetsFlutterBinding.ensureInitialized(); - assert(_binding is E2EWidgetsFlutterBinding); - final E2EWidgetsFlutterBinding binding = _binding as E2EWidgetsFlutterBinding; + final WidgetsBinding _binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + assert(_binding is IntegrationTestWidgetsFlutterBinding); + final IntegrationTestWidgetsFlutterBinding binding = _binding as IntegrationTestWidgetsFlutterBinding; binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.benchmarkLive; binding.reportData ??= {}; final ResampleFlagVariant variant = ResampleFlagVariant(binding); diff --git a/dev/benchmarks/complex_layout/test_driver/measure_scroll_smoothness_test.dart b/dev/benchmarks/complex_layout/test_driver/measure_scroll_smoothness_test.dart index fd29ebe6a9..74abeb9525 100644 --- a/dev/benchmarks/complex_layout/test_driver/measure_scroll_smoothness_test.dart +++ b/dev/benchmarks/complex_layout/test_driver/measure_scroll_smoothness_test.dart @@ -4,9 +4,9 @@ import 'dart:async'; -import 'package:e2e/e2e_driver.dart' as driver; +import 'package:integration_test/integration_test_driver.dart' as driver; -Future main() => driver.e2eDriver( +Future main() => driver.integrationDriver( timeout: const Duration(minutes: 5), responseDataCallback: (Map data) async { await driver.writeResponseData( diff --git a/dev/integration_tests/release_smoke_test/pubspec.yaml b/dev/integration_tests/release_smoke_test/pubspec.yaml index 6540c0e160..d0b6ac75ee 100644 --- a/dev/integration_tests/release_smoke_test/pubspec.yaml +++ b/dev/integration_tests/release_smoke_test/pubspec.yaml @@ -16,27 +16,22 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter + integration_test: + sdk: flutter - e2e: 0.7.0+1 - - archive: 3.0.0-nullsafety.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.5.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 2.1.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.2.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" clock: 1.1.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - crypto: 3.0.0-nullsafety.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" fake_async: 1.2.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 6.0.0-nullsafety.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.10-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" path: 1.8.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.8.0-nullsafety.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.10.0-nullsafety.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.1.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" string_scanner: 1.1.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - sync_http: 0.3.0-nullsafety.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.2.0-nullsafety.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.19-nullsafety.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service: 6.0.1-nullsafety.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - webdriver: 3.0.0-nullsafety.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 6e2e +# PUBSPEC CHECKSUM: ad01 diff --git a/dev/integration_tests/release_smoke_test/test_adapter/hello_world_test.dart b/dev/integration_tests/release_smoke_test/test_adapter/hello_world_test.dart index 2b2a54be91..0abc120f93 100644 --- a/dev/integration_tests/release_smoke_test/test_adapter/hello_world_test.dart +++ b/dev/integration_tests/release_smoke_test/test_adapter/hello_world_test.dart @@ -4,10 +4,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:release_smoke_test/main.dart' as smoke; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('Hello world smoke test', (WidgetTester tester) async { smoke.main(); // builds the app and schedules a frame but doesn't trigger one